diff --git a/.fontcustom-manifest.json b/.fontcustom-manifest.json index 716760118..1c22171f1 100644 --- a/.fontcustom-manifest.json +++ b/.fontcustom-manifest.json @@ -1,7 +1,7 @@ { "checksum": { - "previous": "a76e98698a465d2e0331eecdf54e8a0cfc15e19b18f78430498ed433629ed40d", - "current": "a76e98698a465d2e0331eecdf54e8a0cfc15e19b18f78430498ed433629ed40d" + "previous": "e23ba103353f91b93bba24cc510a5c9b936eaa812e43a858f734d0363785ee70", + "current": "e23ba103353f91b93bba24cc510a5c9b936eaa812e43a858f734d0363785ee70" }, "fonts": [ "app/assets/fonts/spina/ics_spina.ttf", @@ -135,6 +135,10 @@ "codepoint": 61725, "source": "app/assets/icons/spina/inbox-outline.svg" }, + "indent": { + "codepoint": 61754, + "source": "app/assets/icons/spina/indent.svg" + }, "info": { "codepoint": 61726, "source": "app/assets/icons/spina/info.svg" @@ -151,6 +155,14 @@ "codepoint": 61729, "source": "app/assets/icons/spina/link.svg" }, + "list": { + "codepoint": 61755, + "source": "app/assets/icons/spina/list.svg" + }, + "list-ol": { + "codepoint": 61756, + "source": "app/assets/icons/spina/list-ol.svg" + }, "list-ul": { "codepoint": 61730, "source": "app/assets/icons/spina/list-ul.svg" @@ -179,6 +191,10 @@ "codepoint": 61735, "source": "app/assets/icons/spina/min.svg" }, + "outdent": { + "codepoint": 61761, + "source": "app/assets/icons/spina/outdent.svg" + }, "pages": { "codepoint": 61736, "source": "app/assets/icons/spina/pages.svg" @@ -211,10 +227,18 @@ "codepoint": 61743, "source": "app/assets/icons/spina/product-outline.svg" }, + "quote-right": { + "codepoint": 61757, + "source": "app/assets/icons/spina/quote-right.svg" + }, "random": { "codepoint": 61744, "source": "app/assets/icons/spina/random.svg" }, + "redo": { + "codepoint": 61758, + "source": "app/assets/icons/spina/redo.svg" + }, "refresh": { "codepoint": 61745, "source": "app/assets/icons/spina/refresh.svg" @@ -231,10 +255,18 @@ "codepoint": 61748, "source": "app/assets/icons/spina/social-outline.svg" }, + "strikethrough": { + "codepoint": 61759, + "source": "app/assets/icons/spina/strikethrough.svg" + }, "trash": { "codepoint": 61749, "source": "app/assets/icons/spina/trash.svg" }, + "undo": { + "codepoint": 61760, + "source": "app/assets/icons/spina/undo.svg" + }, "upload-outline": { "codepoint": 61750, "source": "app/assets/icons/spina/upload-outline.svg" @@ -250,7 +282,7 @@ "copyright": "", "css3": false, "css_selector": ".icon-{{glyph}}", - "debug": false, + "debug": true, "font_ascent": 448, "font_descent": 64, "font_design_size": 32, diff --git a/app/assets/fonts/spina/ics_spina.eot b/app/assets/fonts/spina/ics_spina.eot index 03fde844e..902827a3d 100644 Binary files a/app/assets/fonts/spina/ics_spina.eot and b/app/assets/fonts/spina/ics_spina.eot differ diff --git a/app/assets/fonts/spina/ics_spina.svg b/app/assets/fonts/spina/ics_spina.svg index 8f264c988..6ebe94fdd 100644 --- a/app/assets/fonts/spina/ics_spina.svg +++ b/app/assets/fonts/spina/ics_spina.svg @@ -1,11 +1,11 @@ -Created by FontForge 20170925 at Wed May 23 13:46:59 2018 +Created by FontForge 20190801 at Wed Dec 25 12:56:41 2019 By Bram Jetten @@ -19,199 +19,52 @@ Created by FontForge 20170925 at Wed May 23 13:46:59 2018 panose-1="2 0 5 3 0 0 0 0 0 0" ascent="448" descent="-64" - bbox="-18.2861 -64.0879 530.286 448" + bbox="-18.2861 -64.0879 640.025 448.001" underline-thickness="25.6" underline-position="-51.2" - unicode-range="U+0020-F139" + unicode-range="U+0020-F141" /> - - + - - - - - - + - - - - - - - - - - - - - - - - - + + - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + - - + + + + + + + + + + + + + - + + + + + + + + + + + + + diff --git a/app/assets/fonts/spina/ics_spina.ttf b/app/assets/fonts/spina/ics_spina.ttf index b11005d46..9221ff1da 100644 Binary files a/app/assets/fonts/spina/ics_spina.ttf and b/app/assets/fonts/spina/ics_spina.ttf differ diff --git a/app/assets/fonts/spina/ics_spina.woff b/app/assets/fonts/spina/ics_spina.woff index 3fbdf0f55..a6dc5dd6d 100644 Binary files a/app/assets/fonts/spina/ics_spina.woff and b/app/assets/fonts/spina/ics_spina.woff differ diff --git a/app/assets/fonts/spina/ics_spina.woff2 b/app/assets/fonts/spina/ics_spina.woff2 index a5de49609..9a7e0f57c 100644 Binary files a/app/assets/fonts/spina/ics_spina.woff2 and b/app/assets/fonts/spina/ics_spina.woff2 differ diff --git a/app/assets/icons/spina/bold.svg b/app/assets/icons/spina/bold.svg index 656d81d93..d21f0d032 100644 --- a/app/assets/icons/spina/bold.svg +++ b/app/assets/icons/spina/bold.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/icons/spina/code.svg b/app/assets/icons/spina/code.svg index 1bacd56f3..ea8da707c 100644 --- a/app/assets/icons/spina/code.svg +++ b/app/assets/icons/spina/code.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/icons/spina/image.svg b/app/assets/icons/spina/image.svg index a075248d3..dbf552dab 100644 --- a/app/assets/icons/spina/image.svg +++ b/app/assets/icons/spina/image.svg @@ -1,10 +1 @@ - - - - Untitled 2 - Created with Sketch. - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/icons/spina/indent.svg b/app/assets/icons/spina/indent.svg new file mode 100644 index 000000000..340843489 --- /dev/null +++ b/app/assets/icons/spina/indent.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/icons/spina/italic.svg b/app/assets/icons/spina/italic.svg index 8691a38d6..f48619e87 100644 --- a/app/assets/icons/spina/italic.svg +++ b/app/assets/icons/spina/italic.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/icons/spina/link.svg b/app/assets/icons/spina/link.svg index 6999b4722..57caa9ffd 100644 --- a/app/assets/icons/spina/link.svg +++ b/app/assets/icons/spina/link.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/assets/icons/spina/list-ol.svg b/app/assets/icons/spina/list-ol.svg new file mode 100644 index 000000000..739857047 --- /dev/null +++ b/app/assets/icons/spina/list-ol.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/icons/spina/list.svg b/app/assets/icons/spina/list.svg new file mode 100644 index 000000000..684186393 --- /dev/null +++ b/app/assets/icons/spina/list.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/icons/spina/outdent.svg b/app/assets/icons/spina/outdent.svg new file mode 100644 index 000000000..586b77d05 --- /dev/null +++ b/app/assets/icons/spina/outdent.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/icons/spina/preview/ics_spina-preview.html b/app/assets/icons/spina/preview/ics_spina-preview.html index 768901be0..2c346defc 100644 --- a/app/assets/icons/spina/preview/ics_spina-preview.html +++ b/app/assets/icons/spina/preview/ics_spina-preview.html @@ -192,10 +192,13 @@ .icon-home:before, .icon-image:before, .icon-inbox-outline:before, +.icon-indent:before, .icon-info:before, .icon-italic:before, .icon-large-check:before, .icon-link:before, +.icon-list:before, +.icon-list-ol:before, .icon-list-ul:before, .icon-lock:before, .icon-mail:before, @@ -203,6 +206,7 @@ .icon-media-library:before, .icon-megaphone:before, .icon-min:before, +.icon-outdent:before, .icon-pages:before, .icon-pencil:before, .icon-pencil-outline:before, @@ -211,12 +215,16 @@ .icon-power-off:before, .icon-preview:before, .icon-product-outline:before, +.icon-quote-right:before, .icon-random:before, +.icon-redo:before, .icon-refresh:before, .icon-search:before, .icon-shop:before, .icon-social-outline:before, +.icon-strikethrough:before, .icon-trash:before, +.icon-undo:before, .icon-upload-outline:before, .icon-users-outline:before { display: inline-block; @@ -264,10 +272,13 @@ .icon-home:before { content: "\f11b"; } .icon-image:before { content: "\f11c"; } .icon-inbox-outline:before { content: "\f11d"; } +.icon-indent:before { content: "\f13a"; } .icon-info:before { content: "\f11e"; } .icon-italic:before { content: "\f11f"; } .icon-large-check:before { content: "\f120"; } .icon-link:before { content: "\f121"; } +.icon-list:before { content: "\f13b"; } +.icon-list-ol:before { content: "\f13c"; } .icon-list-ul:before { content: "\f122"; } .icon-lock:before { content: "\f138"; } .icon-mail:before { content: "\f123"; } @@ -275,6 +286,7 @@ .icon-media-library:before { content: "\f125"; } .icon-megaphone:before { content: "\f126"; } .icon-min:before { content: "\f127"; } +.icon-outdent:before { content: "\f141"; } .icon-pages:before { content: "\f128"; } .icon-pencil:before { content: "\f129"; } .icon-pencil-outline:before { content: "\f12a"; } @@ -283,12 +295,16 @@ .icon-power-off:before { content: "\f12d"; } .icon-preview:before { content: "\f12e"; } .icon-product-outline:before { content: "\f12f"; } +.icon-quote-right:before { content: "\f13d"; } .icon-random:before { content: "\f130"; } +.icon-redo:before { content: "\f13e"; } .icon-refresh:before { content: "\f131"; } .icon-search:before { content: "\f132"; } .icon-shop:before { content: "\f133"; } .icon-social-outline:before { content: "\f134"; } +.icon-strikethrough:before { content: "\f13f"; } .icon-trash:before { content: "\f135"; } +.icon-undo:before { content: "\f140"; } .icon-upload-outline:before { content: "\f136"; } .icon-users-outline:before { content: "\f137"; } @@ -306,7 +322,7 @@
-

ics_spina contains 58 glyphs:

+

ics_spina contains 66 glyphs:

Toggle Preview Characters
@@ -714,6 +730,19 @@

ics_spina contains 58 glyphs:

+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp @@ -766,6 +795,32 @@

ics_spina contains 58 glyphs:

+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+ +
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp @@ -857,6 +912,19 @@

ics_spina contains 58 glyphs:

+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp @@ -961,6 +1029,19 @@

ics_spina contains 58 glyphs:

+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp @@ -974,6 +1055,19 @@

ics_spina contains 58 glyphs:

+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp @@ -1026,6 +1120,19 @@

ics_spina contains 58 glyphs:

+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp @@ -1039,6 +1146,19 @@

ics_spina contains 58 glyphs:

+
+
+ PpPpPpPpPpPpPpPpPpPp +
+
+ 12141618212436486072 +
+
+ + +
+
+
PpPpPpPpPpPpPpPpPpPp diff --git a/app/assets/icons/spina/quote-right.svg b/app/assets/icons/spina/quote-right.svg new file mode 100644 index 000000000..18537bfe4 --- /dev/null +++ b/app/assets/icons/spina/quote-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/icons/spina/redo.svg b/app/assets/icons/spina/redo.svg new file mode 100644 index 000000000..da6c6c145 --- /dev/null +++ b/app/assets/icons/spina/redo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/icons/spina/strikethrough.svg b/app/assets/icons/spina/strikethrough.svg new file mode 100644 index 000000000..b7c31c762 --- /dev/null +++ b/app/assets/icons/spina/strikethrough.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/icons/spina/undo.svg b/app/assets/icons/spina/undo.svg new file mode 100644 index 000000000..44b390412 --- /dev/null +++ b/app/assets/icons/spina/undo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/assets/stylesheets/spina/_configuration.sass.erb b/app/assets/stylesheets/spina/_configuration.sass.erb index ea1579cdd..18d610a09 100644 --- a/app/assets/stylesheets/spina/_configuration.sass.erb +++ b/app/assets/stylesheets/spina/_configuration.sass.erb @@ -12,7 +12,7 @@ $warning-color: orange $asset-pipeline: true $font-family: "Metropolis", sans-serif -$icon-font: $font-family +$icon-font: "ics_spina" $gutter: 5em $desktop: min-width 768px 8 diff --git a/app/assets/stylesheets/spina/_ics_spina.scss b/app/assets/stylesheets/spina/_ics_spina.scss index 1427828a2..d75f568b6 100644 --- a/app/assets/stylesheets/spina/_ics_spina.scss +++ b/app/assets/stylesheets/spina/_ics_spina.scss @@ -33,10 +33,13 @@ .icon-home:before { content: "\f11b"; } .icon-image:before { content: "\f11c"; } .icon-inbox-outline:before { content: "\f11d"; } +.icon-indent:before { content: "\f13a"; } .icon-info:before { content: "\f11e"; } .icon-italic:before { content: "\f11f"; } .icon-large-check:before { content: "\f120"; } .icon-link:before { content: "\f121"; } +.icon-list:before { content: "\f13b"; } +.icon-list-ol:before { content: "\f13c"; } .icon-list-ul:before { content: "\f122"; } .icon-lock:before { content: "\f138"; } .icon-mail:before { content: "\f123"; } @@ -44,6 +47,7 @@ .icon-media-library:before { content: "\f125"; } .icon-megaphone:before { content: "\f126"; } .icon-min:before { content: "\f127"; } +.icon-outdent:before { content: "\f141"; } .icon-pages:before { content: "\f128"; } .icon-pencil:before { content: "\f129"; } .icon-pencil-outline:before { content: "\f12a"; } @@ -52,11 +56,15 @@ .icon-power-off:before { content: "\f12d"; } .icon-preview:before { content: "\f12e"; } .icon-product-outline:before { content: "\f12f"; } +.icon-quote-right:before { content: "\f13d"; } .icon-random:before { content: "\f130"; } +.icon-redo:before { content: "\f13e"; } .icon-refresh:before { content: "\f131"; } .icon-search:before { content: "\f132"; } .icon-shop:before { content: "\f133"; } .icon-social-outline:before { content: "\f134"; } +.icon-strikethrough:before { content: "\f13f"; } .icon-trash:before { content: "\f135"; } +.icon-undo:before { content: "\f140"; } .icon-upload-outline:before { content: "\f136"; } .icon-users-outline:before { content: "\f137"; } \ No newline at end of file diff --git a/app/assets/stylesheets/spina/_trix_custom.sass b/app/assets/stylesheets/spina/_trix_custom.sass index 110dc9288..f69b31cfe 100644 --- a/app/assets/stylesheets/spina/_trix_custom.sass +++ b/app/assets/stylesheets/spina/_trix_custom.sass @@ -38,7 +38,7 @@ trix-toolbar &::before background: none - font-family: 'Font Awesome 5 Free' + font-family: $icon-font display: inline-block font-weight: 900 line-height: 36px @@ -47,55 +47,55 @@ trix-toolbar &.trix-button--icon-bold &::before - content: "\f032" + @extend .icon-bold:before &.trix-button--icon-italic &::before - content: "\f033" + @extend .icon-italic:before &.trix-button--icon-strike &::before - content: "\f0cc" + @extend .icon-strikethrough:before &.trix-button--icon-link &::before - content: "\f0c1" + @extend .icon-link:before &.trix-button--icon-image &::before - content: "\f03e" + @extend .icon-image:before &.trix-button--icon-quote &::before - content: "\f10e" + @extend .icon-quote-right:before &.trix-button--icon-code &::before - content: "\f121" + @extend .icon-code:before &.trix-button--icon-bullet-list &::before - content: "\f0ca" + @extend .icon-list:before &.trix-button--icon-number-list &::before - content: "\f0cb" + @extend .icon-list-ol:before &.trix-button--icon-decrease-nesting-level &::before - content: "\f03b" + @extend .icon-outdent:before &.trix-button--icon-increase-nesting-level &::before - content: "\f03c" + @extend .icon-indent:before &.trix-button--icon-undo &::before - content: "\f2ea" + @extend .icon-undo:before &.trix-button--icon-redo &::before - content: "\f2f9" + @extend .icon-redo:before .trix-dialog border-top-color: $primary-color