Skip to content

Commit

Permalink
Add Import/Export Icons
Browse files Browse the repository at this point in the history
fixes: CNVS-18571

This adds an import and export icon to our icon font set.

Test Plan:
- go to /styleguide Style > Icons
- there should now be an icon-import and an icon-export near the
end of the list (meaning they are now available in canvas)

Change-Id: I8f310136b7db11e7fd8acbe0c91a948d56a4506c
Reviewed-on: https://gerrit.instructure.com/49009
Reviewed-by: Josh Simpson <jsimpson@instructure.com>
Product-Review: Colleen Palmer <colleen@instructure.com>
Tested-by: Jenkins
Reviewed-by: Ryan Shaw <ryan@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
  • Loading branch information
Colleen Palmer authored and roor0 committed Feb 19, 2015
1 parent 1d6c634 commit dcc9e9f
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 22 deletions.
12 changes: 10 additions & 2 deletions .fontcustom-manifest.json
@@ -1,7 +1,7 @@
{
"checksum": {
"previous": "7b54209a1163cdf4c2ce19d9da268eeff3a5cc8224f537c9180a7a906de67b67",
"current": "7b54209a1163cdf4c2ce19d9da268eeff3a5cc8224f537c9180a7a906de67b67"
"previous": "45380a21ad4888c3e12ec343210f29574bc0fee646f29bdba901f509b70eff27",
"current": "45380a21ad4888c3e12ec343210f29574bc0fee646f29bdba901f509b70eff27"
},
"fonts": [
"public/font/canvas/canvas-icons.ttf",
Expand Down Expand Up @@ -206,6 +206,10 @@
"codepoint": 61744,
"source": "public/font/icons/expand-items.svg"
},
"export": {
"codepoint": 61875,
"source": "public/font/icons/export.svg"
},
"export-content": {
"codepoint": 61745,
"source": "public/font/icons/export-content.svg"
Expand Down Expand Up @@ -306,6 +310,10 @@
"codepoint": 61769,
"source": "public/font/icons/image.svg"
},
"import": {
"codepoint": 61876,
"source": "public/font/icons/import.svg"
},
"import-content": {
"codepoint": 61770,
"source": "public/font/icons/import-content.svg"
Expand Down
14 changes: 9 additions & 5 deletions app/stylesheets/components/_canvas-icons.scss
Expand Up @@ -269,20 +269,22 @@ Either use `<a>` with icon desired icon class added or insert `<i>` inside `<but
<span class="span3"><i class="icon-quiz-stats-high"></i> icon-quiz-stats-high</span>
<span class="span3"><i class="icon-quiz-stats-deviation"></i> icon-quiz-stats-deviation</span>
<span class="span3"><i class="icon-quiz-stats-time"></i> icon-quiz-stats-time</span>
</div>
<div class="row-fluid">
<span class="span3"><i class="icon-cloud-lock"></i> icon-cloud-lock</span>
</div>
<div class="row-fluid">
<span class="span3"><i class="icon-eye"></i> icon-eye</span>
<span class="span3"><i class="icon-files-copyright"></i> icon-files-copyright</span>
</div>
<div class="row-fluid">
<span class="span3"><i class="icon-files-creative-commons"></i> icon-files-creative-commons</span>
<span class="span3"><i class="icon-files-fair-use"></i> icon-files-fair-use</span>
<span class="span3"><i class="icon-files-obtained-permission"></i>icon-files-obtained-permission</span>
</div>
<div class="row-fluid">
<span class="span3"><i class="icon-files-obtained-permission"></i>icon-files-obtained-permission</span>
<span class="span3"><i class="icon-files-public-domain"></i> icon-files-public-domain</span>
<span class="span3"><i class="icon-tour-info"></i> icon-tour-info</span>
<span class="span3"><i class="icon-import"></i> icon-import</span>
</div>
<div class="row-fluid">
<span class="span3"><i class="icon-export"></i> icon-export</span>
</div>
*/

Expand Down Expand Up @@ -425,6 +427,7 @@ h1, h2, h3, h4, .h1, .h2, .h3, .h4, p {
.icon-end:before { content: "\f12e"; }
.icon-expand:before { content: "\f12f"; }
.icon-expand-items:before { content: "\f130"; }
.icon-export:before { content: "\f1b3"; }
.icon-export-content:before { content: "\f131"; }
.icon-eye:before { content: "\f132"; }
.icon-facebook:before { content: "\f133"; }
Expand All @@ -450,6 +453,7 @@ h1, h2, h3, h4, .h1, .h2, .h3, .h4, p {
.icon-home:before { content: "\f147"; }
.icon-hour-glass:before { content: "\f148"; }
.icon-image:before { content: "\f149"; }
.icon-import:before { content: "\f1b4"; }
.icon-import-content:before { content: "\f14a"; }
.icon-indent:before { content: "\f14b"; }
.icon-indent2:before { content: "\f14c"; }
Expand Down
Binary file modified public/font/canvas/canvas-icons.eot
Binary file not shown.
32 changes: 22 additions & 10 deletions public/font/canvas/canvas-icons.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/font/canvas/canvas-icons.ttf
Binary file not shown.
Binary file modified public/font/canvas/canvas-icons.woff
Binary file not shown.
12 changes: 7 additions & 5 deletions public/font/icons/_canvas-icons.scss
Expand Up @@ -269,20 +269,22 @@ Either use `<a>` with icon desired icon class added or insert `<i>` inside `<but
<span class="span3"><i class="icon-quiz-stats-high"></i> icon-quiz-stats-high</span>
<span class="span3"><i class="icon-quiz-stats-deviation"></i> icon-quiz-stats-deviation</span>
<span class="span3"><i class="icon-quiz-stats-time"></i> icon-quiz-stats-time</span>
</div>
<div class="row-fluid">
<span class="span3"><i class="icon-cloud-lock"></i> icon-cloud-lock</span>
</div>
<div class="row-fluid">
<span class="span3"><i class="icon-eye"></i> icon-eye</span>
<span class="span3"><i class="icon-files-copyright"></i> icon-files-copyright</span>
</div>
<div class="row-fluid">
<span class="span3"><i class="icon-files-creative-commons"></i> icon-files-creative-commons</span>
<span class="span3"><i class="icon-files-fair-use"></i> icon-files-fair-use</span>
<span class="span3"><i class="icon-files-obtained-permission"></i>icon-files-obtained-permission</span>
</div>
<div class="row-fluid">
<span class="span3"><i class="icon-files-obtained-permission"></i>icon-files-obtained-permission</span>
<span class="span3"><i class="icon-files-public-domain"></i> icon-files-public-domain</span>
<span class="span3"><i class="icon-tour-info"></i> icon-tour-info</span>
<span class="span3"><i class="icon-import"></i> icon-import</span>
</div>
<div class="row-fluid">
<span class="span3"><i class="icon-export"></i> icon-export</span>
</div>
*/

Expand Down
15 changes: 15 additions & 0 deletions public/font/icons/export.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/font/icons/import.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit dcc9e9f

Please sign in to comment.