diff --git a/.fontcustom-manifest.json b/.fontcustom-manifest.json index 13b398a24b4d..c0303220f25b 100644 --- a/.fontcustom-manifest.json +++ b/.fontcustom-manifest.json @@ -1,7 +1,7 @@ { "checksum": { - "previous": "7b54209a1163cdf4c2ce19d9da268eeff3a5cc8224f537c9180a7a906de67b67", - "current": "7b54209a1163cdf4c2ce19d9da268eeff3a5cc8224f537c9180a7a906de67b67" + "previous": "45380a21ad4888c3e12ec343210f29574bc0fee646f29bdba901f509b70eff27", + "current": "45380a21ad4888c3e12ec343210f29574bc0fee646f29bdba901f509b70eff27" }, "fonts": [ "public/font/canvas/canvas-icons.ttf", @@ -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" @@ -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" diff --git a/app/stylesheets/components/_canvas-icons.scss b/app/stylesheets/components/_canvas-icons.scss index 2d2fe412086a..17e975f7c6c5 100644 --- a/app/stylesheets/components/_canvas-icons.scss +++ b/app/stylesheets/components/_canvas-icons.scss @@ -269,20 +269,22 @@ Either use `` with icon desired icon class added or insert `` inside ` icon-quiz-stats-high icon-quiz-stats-deviation icon-quiz-stats-time - -
icon-cloud-lock +
+
icon-eye icon-files-copyright -
-
icon-files-creative-commons icon-files-fair-use - icon-files-obtained-permission
+ icon-files-obtained-permission icon-files-public-domain icon-tour-info + icon-import +
+
+ icon-export
*/ @@ -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"; } @@ -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"; } diff --git a/public/font/canvas/canvas-icons.eot b/public/font/canvas/canvas-icons.eot index ad01ea7cd47b..e85f97ce7cd3 100644 Binary files a/public/font/canvas/canvas-icons.eot and b/public/font/canvas/canvas-icons.eot differ diff --git a/public/font/canvas/canvas-icons.svg b/public/font/canvas/canvas-icons.svg index 45c909e5f876..77225fb62105 100644 --- a/public/font/canvas/canvas-icons.svg +++ b/public/font/canvas/canvas-icons.svg @@ -1,11 +1,11 @@ -Created by FontForge 20120731 at Mon Dec 15 10:57:34 2014 +Created by FontForge 20120731 at Wed Feb 18 15:01:52 2015 By Colleen Palmer Created by Colleen Palmer with FontForge 2.0 (http://fontforge.sf.net) @@ -22,9 +22,11 @@ Created by Colleen Palmer with FontForge 2.0 (http://fontforge.sf.net) bbox="-32 -64.416 513.008 449.376" underline-thickness="25.6" underline-position="-51.2" - unicode-range="U+F100-F1B2" + unicode-range="U+0020-F1B4" /> + + - + + diff --git a/public/font/canvas/canvas-icons.ttf b/public/font/canvas/canvas-icons.ttf index 6a7a3695d9d5..cce16fca66b0 100644 Binary files a/public/font/canvas/canvas-icons.ttf and b/public/font/canvas/canvas-icons.ttf differ diff --git a/public/font/canvas/canvas-icons.woff b/public/font/canvas/canvas-icons.woff index 6af07e731257..c547381ab108 100644 Binary files a/public/font/canvas/canvas-icons.woff and b/public/font/canvas/canvas-icons.woff differ diff --git a/public/font/icons/_canvas-icons.scss b/public/font/icons/_canvas-icons.scss index b8c3a0fe29f2..1f69aae547b4 100644 --- a/public/font/icons/_canvas-icons.scss +++ b/public/font/icons/_canvas-icons.scss @@ -269,20 +269,22 @@ Either use `` with icon desired icon class added or insert `` inside ` icon-quiz-stats-high icon-quiz-stats-deviation icon-quiz-stats-time - -
icon-cloud-lock +
+
icon-eye icon-files-copyright -
-
icon-files-creative-commons icon-files-fair-use - icon-files-obtained-permission
+ icon-files-obtained-permission icon-files-public-domain icon-tour-info + icon-import +
+
+ icon-export
*/ diff --git a/public/font/icons/export.svg b/public/font/icons/export.svg new file mode 100644 index 000000000000..c589c86363c8 --- /dev/null +++ b/public/font/icons/export.svg @@ -0,0 +1,15 @@ + + + + icon-name + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/public/font/icons/import.svg b/public/font/icons/import.svg new file mode 100644 index 000000000000..80ecd87989c6 --- /dev/null +++ b/public/font/icons/import.svg @@ -0,0 +1,13 @@ + + + + icon-name + Created with Sketch. + + + + + + + + \ No newline at end of file