Skip to content

Commit

Permalink
Merge pull request #95 from primer/symbol-changes
Browse files Browse the repository at this point in the history
Symbol changes and refinements
  • Loading branch information
jonrohan authored Jun 7, 2016
2 parents f226a4a + d49cb2b commit 40a650f
Show file tree
Hide file tree
Showing 187 changed files with 261 additions and 191 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
### HEAD
### 4.1.0 (June 6, 2016)

Adds:

- Installation docs https://github.com/primer/octicons/pull/94
- `grabber`
- `plus-small`

Modifies:

- `smiley`

Refines:

- Renames `mail-reply` to `reply` and refines its shape.

Fixes:

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ The source files included are written in [Sass][sass] (`scss`) You can simply po

1. Open the [Sketch document][sketch-document] in `/lib/`. Each icon exists as an artboard within our master Sketch document. If you’re adding an icon, duplicate one of the artboards and add your shapes to it. Be sure to give your artboard a name that makes sense.
2. Once you’re happy with your icon set, choose File > Export…
3. Choose all the artboards you'd like to export and then press “Export”
3. Choose all the artboards youd like to export and then press “Export”
4. Export to `/lib/svg/`

You’ll next need to build your Octicons.
Expand Down
16 changes: 11 additions & 5 deletions build/font/_octicons.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

@font-face {
font-family:"Octicons";
src:url("octicons.eot?c3075d1c1638e14b47f314802bf8aee0");
src:url("octicons.eot?89624517212bc6232de6d7b6c801ca91");
src:url("octicons.eot?#iefix") format("embedded-opentype"),
url("octicons.woff2?c3075d1c1638e14b47f314802bf8aee0") format("woff2"),
url("octicons.woff?c3075d1c1638e14b47f314802bf8aee0") format("woff"),
url("octicons.ttf?c3075d1c1638e14b47f314802bf8aee0") format("truetype"),
url("octicons.svg?c3075d1c1638e14b47f314802bf8aee0#octicons") format("svg");
url("octicons.woff2?89624517212bc6232de6d7b6c801ca91") format("woff2"),
url("octicons.woff?89624517212bc6232de6d7b6c801ca91") format("woff"),
url("octicons.ttf?89624517212bc6232de6d7b6c801ca91") format("truetype"),
url("octicons.svg?89624517212bc6232de6d7b6c801ca91#octicons") format("svg");
font-weight:normal;
font-style:normal;
}
Expand Down Expand Up @@ -181,6 +181,8 @@

.octicon-globe:before { content:"\f0b6"; }

.octicon-grabber:before { content:"\f103"; }

.octicon-graph:before { content:"\f043"; }

.octicon-heart:before { content:"\2665"; }
Expand Down Expand Up @@ -271,6 +273,8 @@

.octicon-plug:before { content:"\f0d4"; }

.octicon-plus-small:before { content:"\f104"; }

.octicon-plus:before { content:"\f05d"; }

.octicon-primitive-dot:before { content:"\f052"; }
Expand All @@ -285,6 +289,8 @@

.octicon-radio-tower:before { content:"\f030"; }

.octicon-reply:before { content:"\f105"; }

.octicon-repo-clone:before { content:"\f04c"; }

.octicon-repo-force-push:before { content:"\f04a"; }
Expand Down
16 changes: 11 additions & 5 deletions build/font/octicons.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

@font-face {
font-family:"Octicons";
src:url("octicons.eot?1519d9e1d2f3b84f6f6b0556e87a255b");
src:url("octicons.eot?e8b041c217b3d809c380606d0320205a");
src:url("octicons.eot?#iefix") format("embedded-opentype"),
url("octicons.woff2?1519d9e1d2f3b84f6f6b0556e87a255b") format("woff2"),
url("octicons.woff?1519d9e1d2f3b84f6f6b0556e87a255b") format("woff"),
url("octicons.ttf?1519d9e1d2f3b84f6f6b0556e87a255b") format("truetype"),
url("octicons.svg?1519d9e1d2f3b84f6f6b0556e87a255b#octicons") format("svg");
url("octicons.woff2?e8b041c217b3d809c380606d0320205a") format("woff2"),
url("octicons.woff?e8b041c217b3d809c380606d0320205a") format("woff"),
url("octicons.ttf?e8b041c217b3d809c380606d0320205a") format("truetype"),
url("octicons.svg?e8b041c217b3d809c380606d0320205a#octicons") format("svg");
font-weight:normal;
font-style:normal;
}
Expand Down Expand Up @@ -181,6 +181,8 @@

.octicon-globe:before { content:"\f0b6"; }

.octicon-grabber:before { content:"\f103"; }

.octicon-graph:before { content:"\f043"; }

.octicon-heart:before { content:"\2665"; }
Expand Down Expand Up @@ -271,6 +273,8 @@

.octicon-plug:before { content:"\f0d4"; }

.octicon-plus-small:before { content:"\f104"; }

.octicon-plus:before { content:"\f05d"; }

.octicon-primitive-dot:before { content:"\f052"; }
Expand All @@ -285,6 +289,8 @@

.octicon-radio-tower:before { content:"\f030"; }

.octicon-reply:before { content:"\f105"; }

.octicon-repo-clone:before { content:"\f04c"; }

.octicon-repo-force-push:before { content:"\f04a"; }
Expand Down
Binary file modified build/font/octicons.eot
Binary file not shown.
4 changes: 2 additions & 2 deletions build/font/octicons.min.css

Large diffs are not rendered by default.

16 changes: 11 additions & 5 deletions build/font/octicons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build/font/octicons.ttf
Binary file not shown.
Binary file modified build/font/octicons.woff
Binary file not shown.
Binary file modified build/font/octicons.woff2
Binary file not shown.
2 changes: 1 addition & 1 deletion build/sprite.octicons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions build/svg/grabber.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion build/svg/plug.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions build/svg/plus-small.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions build/svg/reply.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion build/svg/smiley.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion lib/font/codepoints.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,5 +168,8 @@
"x": 61569,
"zap": 9889,
"ellipses": 61697,
"file": 61698
"file": 61698,
"grabber": 61699,
"plus-small": 61700,
"reply": 61701
}
Binary file modified lib/octicons-master.sketch
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/svg/alert.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/arrow-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/arrow-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/arrow-small-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/arrow-small-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/arrow-small-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/arrow-small-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/arrow-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/beaker.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/bell.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/bold.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/book.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/bookmark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/briefcase.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/broadcast.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/browser.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/bug.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/svg/calendar.svg
Loading

0 comments on commit 40a650f

Please sign in to comment.