Merge pull request #76 from github/three-dot-two

3.2.0
primer · Nov 6, 2015 · 1096b44 · 1096b44
2 parents 6977eb6 + f62ff70
commit 1096b44
Show file tree

Hide file tree

Showing 24 changed files with 77 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,27 @@
+### 3.2.0 (November 6, 2015)
+
+Adds:
+
+- `bold`
+- `text-size`
+- `italic`
+- `tasklist`
+
+It also normalizes some styling in:
+
+- `list-unordered`
+- `list-ordered`
+- `quote`
+- `mention`
+- `bookmark`
+- `threebars`
+
+Removes
+
+- `screen-normal`
+- `screen-full`
+
+
 ### 3.1.0 (August 13, 2015)
 
 Adds

diff --git a/octicons/octicons-local.ttf b/octicons/octicons-local.ttf
diff --git a/octicons/octicons.css b/octicons/octicons.css
@@ -40,6 +40,7 @@
 .octicon-microscope:before,
 .octicon-beaker:before { content: '\f0dd'} /*  */
 .octicon-bell:before { content: '\f0de'} /*  */
+.octicon-bold:before { content: '\f0e2'} /*  */
 .octicon-book:before { content: '\f007'} /*  */
 .octicon-bookmark:before { content: '\f07b'} /*  */
 .octicon-briefcase:before { content: '\f0d3'} /*  */
@@ -120,6 +121,7 @@
 .octicon-issue-closed:before { content: '\f028'} /*  */
 .octicon-issue-opened:before { content: '\f026'} /*  */
 .octicon-issue-reopened:before { content: '\f027'} /*  */
+.octicon-italic:before { content: '\f0e4'} /*  */
 .octicon-jersey:before { content: '\f019'} /*  */
 .octicon-key:before { content: '\f049'} /*  */
 .octicon-keyboard:before { content: '\f00d'} /*  */
@@ -180,8 +182,6 @@
 .octicon-rocket:before { content: '\f033'} /*  */
 .octicon-rss:before { content: '\f034'} /*  */
 .octicon-ruby:before { content: '\f047'} /*  */
-.octicon-screen-full:before { content: '\f066'} /*  */
-.octicon-screen-normal:before { content: '\f067'} /*  */
 .octicon-search-save:before,
 .octicon-search:before { content: '\f02e'} /*  */
 .octicon-server:before { content: '\f097'} /*  */
@@ -201,8 +201,10 @@
 .octicon-tag-remove:before,
 .octicon-tag-add:before,
 .octicon-tag:before { content: '\f015'} /*  */
+.octicon-tasklist:before { content: '\f0e5'} /*  */
 .octicon-telescope:before { content: '\f088'} /*  */
 .octicon-terminal:before { content: '\f0c8'} /*  */
+.octicon-text-size:before { content: '\f0e3'} /*  */
 .octicon-three-bars:before { content: '\f05e'} /*  */
 .octicon-thumbsdown:before { content: '\f0db'} /*  */
 .octicon-thumbsup:before { content: '\f0da'} /*  */

diff --git a/octicons/octicons.eot b/octicons/octicons.eot
diff --git a/octicons/octicons.less b/octicons/octicons.less
@@ -1,5 +1,5 @@
 @octicons-font-path: ".";
-@octicons-version:   "396334ee3da78f4302d25c758ae3e3ce5dc3c97d";
+@octicons-version:   "a40af4f4f6ddb83d4891bb8d97350fbdb18ea78c";
 
 @font-face {
   font-family: 'octicons';
@@ -39,6 +39,7 @@
 .octicon-microscope:before,
 .octicon-beaker:before { content: '\f0dd'} /*  */
 .octicon-bell:before { content: '\f0de'} /*  */
+.octicon-bold:before { content: '\f0e2'} /*  */
 .octicon-book:before { content: '\f007'} /*  */
 .octicon-bookmark:before { content: '\f07b'} /*  */
 .octicon-briefcase:before { content: '\f0d3'} /*  */
@@ -119,6 +120,7 @@
 .octicon-issue-closed:before { content: '\f028'} /*  */
 .octicon-issue-opened:before { content: '\f026'} /*  */
 .octicon-issue-reopened:before { content: '\f027'} /*  */
+.octicon-italic:before { content: '\f0e4'} /*  */
 .octicon-jersey:before { content: '\f019'} /*  */
 .octicon-key:before { content: '\f049'} /*  */
 .octicon-keyboard:before { content: '\f00d'} /*  */
@@ -179,8 +181,6 @@
 .octicon-rocket:before { content: '\f033'} /*  */
 .octicon-rss:before { content: '\f034'} /*  */
 .octicon-ruby:before { content: '\f047'} /*  */
-.octicon-screen-full:before { content: '\f066'} /*  */
-.octicon-screen-normal:before { content: '\f067'} /*  */
 .octicon-search-save:before,
 .octicon-search:before { content: '\f02e'} /*  */
 .octicon-server:before { content: '\f097'} /*  */
@@ -200,8 +200,10 @@
 .octicon-tag-remove:before,
 .octicon-tag-add:before,
 .octicon-tag:before { content: '\f015'} /*  */
+.octicon-tasklist:before { content: '\f0e5'} /*  */
 .octicon-telescope:before { content: '\f088'} /*  */
 .octicon-terminal:before { content: '\f0c8'} /*  */
+.octicon-text-size:before { content: '\f0e3'} /*  */
 .octicon-three-bars:before { content: '\f05e'} /*  */
 .octicon-thumbsdown:before { content: '\f0db'} /*  */
 .octicon-thumbsup:before { content: '\f0da'} /*  */

diff --git a/octicons/octicons.scss b/octicons/octicons.scss
@@ -1,5 +1,5 @@
 $octicons-font-path: "." !default;
-$octicons-version:   "396334ee3da78f4302d25c758ae3e3ce5dc3c97d";
+$octicons-version:   "a40af4f4f6ddb83d4891bb8d97350fbdb18ea78c";
 
 @font-face {
   font-family: 'octicons';
@@ -39,6 +39,7 @@ $octicons-version:   "396334ee3da78f4302d25c758ae3e3ce5dc3c97d";
 .octicon-microscope:before,
 .octicon-beaker:before { content: '\f0dd'} /*  */
 .octicon-bell:before { content: '\f0de'} /*  */
+.octicon-bold:before { content: '\f0e2'} /*  */
 .octicon-book:before { content: '\f007'} /*  */
 .octicon-bookmark:before { content: '\f07b'} /*  */
 .octicon-briefcase:before { content: '\f0d3'} /*  */
@@ -119,6 +120,7 @@ $octicons-version:   "396334ee3da78f4302d25c758ae3e3ce5dc3c97d";
 .octicon-issue-closed:before { content: '\f028'} /*  */
 .octicon-issue-opened:before { content: '\f026'} /*  */
 .octicon-issue-reopened:before { content: '\f027'} /*  */
+.octicon-italic:before { content: '\f0e4'} /*  */
 .octicon-jersey:before { content: '\f019'} /*  */
 .octicon-key:before { content: '\f049'} /*  */
 .octicon-keyboard:before { content: '\f00d'} /*  */
@@ -179,8 +181,6 @@ $octicons-version:   "396334ee3da78f4302d25c758ae3e3ce5dc3c97d";
 .octicon-rocket:before { content: '\f033'} /*  */
 .octicon-rss:before { content: '\f034'} /*  */
 .octicon-ruby:before { content: '\f047'} /*  */
-.octicon-screen-full:before { content: '\f066'} /*  */
-.octicon-screen-normal:before { content: '\f067'} /*  */
 .octicon-search-save:before,
 .octicon-search:before { content: '\f02e'} /*  */
 .octicon-server:before { content: '\f097'} /*  */
@@ -200,8 +200,10 @@ $octicons-version:   "396334ee3da78f4302d25c758ae3e3ce5dc3c97d";
 .octicon-tag-remove:before,
 .octicon-tag-add:before,
 .octicon-tag:before { content: '\f015'} /*  */
+.octicon-tasklist:before { content: '\f0e5'} /*  */
 .octicon-telescope:before { content: '\f088'} /*  */
 .octicon-terminal:before { content: '\f0c8'} /*  */
+.octicon-text-size:before { content: '\f0e3'} /*  */
 .octicon-three-bars:before { content: '\f05e'} /*  */
 .octicon-thumbsdown:before { content: '\f0db'} /*  */
 .octicon-thumbsup:before { content: '\f0da'} /*  */

diff --git a/octicons/octicons.svg b/octicons/octicons.svg
diff --git a/octicons/octicons.ttf b/octicons/octicons.ttf
diff --git a/octicons/octicons.woff b/octicons/octicons.woff
diff --git a/octicons/sprockets-octicons.scss b/octicons/sprockets-octicons.scss
@@ -36,6 +36,7 @@
 .octicon-microscope:before,
 .octicon-beaker:before { content: '\f0dd'} /*  */
 .octicon-bell:before { content: '\f0de'} /*  */
+.octicon-bold:before { content: '\f0e2'} /*  */
 .octicon-book:before { content: '\f007'} /*  */
 .octicon-bookmark:before { content: '\f07b'} /*  */
 .octicon-briefcase:before { content: '\f0d3'} /*  */
@@ -116,6 +117,7 @@
 .octicon-issue-closed:before { content: '\f028'} /*  */
 .octicon-issue-opened:before { content: '\f026'} /*  */
 .octicon-issue-reopened:before { content: '\f027'} /*  */
+.octicon-italic:before { content: '\f0e4'} /*  */
 .octicon-jersey:before { content: '\f019'} /*  */
 .octicon-key:before { content: '\f049'} /*  */
 .octicon-keyboard:before { content: '\f00d'} /*  */
@@ -176,8 +178,6 @@
 .octicon-rocket:before { content: '\f033'} /*  */
 .octicon-rss:before { content: '\f034'} /*  */
 .octicon-ruby:before { content: '\f047'} /*  */
-.octicon-screen-full:before { content: '\f066'} /*  */
-.octicon-screen-normal:before { content: '\f067'} /*  */
 .octicon-search-save:before,
 .octicon-search:before { content: '\f02e'} /*  */
 .octicon-server:before { content: '\f097'} /*  */
@@ -197,8 +197,10 @@
 .octicon-tag-remove:before,
 .octicon-tag-add:before,
 .octicon-tag:before { content: '\f015'} /*  */
+.octicon-tasklist:before { content: '\f0e5'} /*  */
 .octicon-telescope:before { content: '\f088'} /*  */
 .octicon-terminal:before { content: '\f0c8'} /*  */
+.octicon-text-size:before { content: '\f0e3'} /*  */
 .octicon-three-bars:before { content: '\f05e'} /*  */
 .octicon-thumbsdown:before { content: '\f0db'} /*  */
 .octicon-thumbsup:before { content: '\f0da'} /*  */

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "octicons",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "GitHub's icon font",
   "main": "README.md",
   "repository": {

diff --git a/svg/bold.svg b/svg/bold.svg
diff --git a/svg/bookmark.svg b/svg/bookmark.svg
diff --git a/svg/checklist.svg b/svg/checklist.svg
diff --git a/svg/italic.svg b/svg/italic.svg
diff --git a/svg/list-ordered.svg b/svg/list-ordered.svg
diff --git a/svg/list-unordered.svg b/svg/list-unordered.svg
diff --git a/svg/mention.svg b/svg/mention.svg
diff --git a/svg/quote.svg b/svg/quote.svg
diff --git a/svg/screen-full.svg b/svg/screen-full.svg
diff --git a/svg/screen-normal.svg b/svg/screen-normal.svg
diff --git a/svg/tasklist.svg b/svg/tasklist.svg
diff --git a/svg/text-size.svg b/svg/text-size.svg
diff --git a/svg/three-bars.svg b/svg/three-bars.svg