diff --git a/admin/client/dist/font/LICENSE.txt b/admin/client/dist/font/LICENSE.txt index 04a1e42cd..32317d64c 100644 --- a/admin/client/dist/font/LICENSE.txt +++ b/admin/client/dist/font/LICENSE.txt @@ -1,11 +1,27 @@ Font license info - +The SilverStripe custom icon font set is a collection of hand crafted and sourced icons through http://app.fontastic.me/ +Fontastic allows us to package together icons from multiple sources for use as a single set. ## Entypo - Copyright (C) 2012 by Daniel Bruce + Author: Daniel Bruce + License: Creative Commons 3.0 + Homepage: http://www.entypo.com - Author: Daniel Bruce - License: SIL (http://scripts.sil.org/OFL) - Homepage: http://www.entypo.com +## Picol + Author: Melih Bilgil + License: Creative Commons 3.0 + Homepage: http://picol.org/ + +## Foundation icons + + Author: Zurb + License: Creative Commons 3.0 + Homepage: http://zurb.com/playground/foundation-icons + +## Font Awesome + + Author: Dave Gandy + License: MIT License (MIT) + Homepage: https://fortawesome.github.io/Font-Awesome/ diff --git a/admin/client/dist/font/silverstripe.eot b/admin/client/dist/font/fonts/silverstripe.eot similarity index 81% rename from admin/client/dist/font/silverstripe.eot rename to admin/client/dist/font/fonts/silverstripe.eot index b371e25eb..c6b337dfe 100644 Binary files a/admin/client/dist/font/silverstripe.eot and b/admin/client/dist/font/fonts/silverstripe.eot differ diff --git a/admin/client/dist/font/silverstripe.svg b/admin/client/dist/font/fonts/silverstripe.svg similarity index 97% rename from admin/client/dist/font/silverstripe.svg rename to admin/client/dist/font/fonts/silverstripe.svg index 1a9ac0d2d..05300cade 100644 --- a/admin/client/dist/font/silverstripe.svg +++ b/admin/client/dist/font/fonts/silverstripe.svg @@ -70,4 +70,6 @@ + + diff --git a/admin/client/dist/font/silverstripe.ttf b/admin/client/dist/font/fonts/silverstripe.ttf similarity index 81% rename from admin/client/dist/font/silverstripe.ttf rename to admin/client/dist/font/fonts/silverstripe.ttf index 8665f0b71..3717c3e2e 100644 Binary files a/admin/client/dist/font/silverstripe.ttf and b/admin/client/dist/font/fonts/silverstripe.ttf differ diff --git a/admin/client/dist/font/fonts/silverstripe.woff b/admin/client/dist/font/fonts/silverstripe.woff new file mode 100644 index 000000000..49e54c549 Binary files /dev/null and b/admin/client/dist/font/fonts/silverstripe.woff differ diff --git a/admin/client/dist/font/icon-reference.html b/admin/client/dist/font/icon-reference.html index 1cfe19460..5a507dfd0 100644 --- a/admin/client/dist/font/icon-reference.html +++ b/admin/client/dist/font/icon-reference.html @@ -6,249 +6,19 @@ Font Reference - SilverStripe - + +

SilverStripe

-

This font was created with Fontastic

+

This font was created withFontastic

CSS mapping

    • -
  • -
    - -
  • @@ -269,10 +39,6 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • -
  • -
    - -
  • @@ -286,8 +52,8 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
  • -
    - +
    +
  • @@ -325,10 +91,6 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • -
  • -
    - -
  • @@ -349,10 +111,6 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • -
  • -
    - -
  • @@ -369,10 +127,6 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • -
  • -
    - -
  • @@ -381,6 +135,10 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • +
  • +
    + +
  • @@ -417,6 +175,66 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
  • @@ -449,6 +267,14 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • +
  • +
    + +
    • +
  • +
    + +

Character mapping

    @@ -456,10 +282,6 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    -
  • -
    - -
  • @@ -480,10 +302,6 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • -
  • -
    - -
  • @@ -536,10 +354,6 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • -
  • -
    - -
  • @@ -556,18 +370,10 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • -
  • -
    - -
    • -
  • -
    - -
  • @@ -584,10 +390,6 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • -
  • -
    - -
  • @@ -597,8 +399,8 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
  • -
    - +
    +
  • @@ -636,6 +438,62 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
    • +
  • +
    + +
  • @@ -672,14 +530,22 @@ h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercas
    • +
  • +
    + +
    • +
  • +
    + +
-
+ + diff --git a/admin/client/src/styles/legacy/_fonts.scss b/admin/client/dist/font/icon-styles.css similarity index 50% rename from admin/client/src/styles/legacy/_fonts.scss rename to admin/client/dist/font/icon-styles.css index c8a32591c..af75b2afc 100644 --- a/admin/client/src/styles/legacy/_fonts.scss +++ b/admin/client/dist/font/icon-styles.css @@ -2,18 +2,31 @@ @font-face { font-family: "silverstripe"; - src:url("../font/silverstripe.eot"); - src:url("../font/silverstripe.eot?#iefix") format("embedded-opentype"), - url("../font/silverstripe.woff") format("woff"), - url("../font/silverstripe.ttf") format("truetype"), - url("../font/silverstripe.svg#silverstripe") format("svg"); + src:url("fonts/silverstripe.eot"); + src:url("fonts/silverstripe.eot?#iefix") format("embedded-opentype"), + url("fonts/silverstripe.woff") format("woff"), + url("fonts/silverstripe.ttf") format("truetype"), + url("fonts/silverstripe.svg#silverstripe") format("svg"); font-weight: normal; font-style: normal; } +[data-icon]:before { + font-family: "silverstripe" !important; + content: attr(data-icon); + font-style: normal !important; + font-weight: normal !important; + font-variant: normal !important; + text-transform: none !important; + speak: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + [class^="font-icon-"]:before, -[class*="font-icon-"]:before { +[class*=" font-icon-"]:before { font-family: "silverstripe" !important; font-style: normal !important; font-weight: normal !important; @@ -26,160 +39,181 @@ } .font-icon-search:before { - content: "s"; -} -.font-icon-upload:before { - content: "b"; + content: "\73"; } .font-icon-sync:before { - content: "c"; + content: "\63"; } .font-icon-print:before { - content: "d"; + content: "\64"; } .font-icon-list:before { - content: "e"; + content: "\65"; } .font-icon-plus-circled:before { - content: "f"; + content: "\66"; } .font-icon-check-mark-2:before { - content: "k"; -} -.font-icon-pencil:before { - content: "m"; + content: "\6b"; } .font-icon-book:before { - content: "n"; + content: "\6e"; } .font-icon-book-open:before { - content: "o"; + content: "\6f"; } .font-icon-plus:before { - content: "j"; + content: "\6a"; } -.font-icon-icon-tree:before { - content: "p"; +.font-icon-tree:before { + content: "\70"; } .font-icon-flow-tree:before { - content: "q"; + content: "\71"; } .font-icon-info-circled:before { - content: "y"; + content: "\79"; } .font-icon-chart-line:before { - content: "B"; + content: "\42"; } .font-icon-graph-bar:before { - content: "E"; + content: "\45"; } .font-icon-torsos-all:before { - content: "F"; + content: "\46"; } .font-icon-torso:before { - content: "H"; + content: "\48"; } .font-icon-picture:before { - content: "v"; + content: "\76"; } .font-icon-chart-pie:before { - content: "A"; + content: "\41"; } .font-icon-sitemap:before { - content: "C"; -} -.font-icon-globe:before { - content: "P"; + content: "\43"; } .font-icon-globe-1:before { - content: "R"; + content: "\52"; } .font-icon-chat:before { - content: "t"; + content: "\74"; } .font-icon-comment:before { - content: "w"; + content: "\77"; } .font-icon-logout:before { - content: "z"; + content: "\7a"; } .font-icon-cancel-circled:before { - content: "Q"; -} -.font-icon-trash-bin:before { - content: "S"; + content: "\51"; } .font-icon-left-open:before { - content: "T"; + content: "\54"; } .font-icon-right-open:before { - content: "U"; + content: "\55"; } .font-icon-check-mark:before { - content: "G"; + content: "\47"; } .font-icon-check-mark-circle:before { - content: "I"; -} -.font-icon-level-up:before { - content: "V"; + content: "\49"; } .font-icon-back-in-time:before { - content: "X"; + content: "\58"; } .font-icon-cog:before { - content: "Y"; + content: "\59"; +} +.font-icon-fast-forward:before { + content: "\68"; } .font-icon-install:before { - content: "a"; + content: "\61"; } .font-icon-down-circled:before { - content: "i"; + content: "\69"; } .font-icon-eye:before { - content: "l"; + content: "\6c"; } .font-icon-columns:before { - content: "r"; + content: "\72"; } .font-icon-edit-write:before { - content: "u"; + content: "\75"; } .font-icon-monitor:before { - content: "x"; + content: "\78"; } .font-icon-mobile:before { - content: "J"; + content: "\4a"; } .font-icon-tablet:before { - content: "K"; + content: "\4b"; } .font-icon-resize:before { - content: "L"; -} -.font-icon-silverstripe:before { - content: "M"; + content: "\4c"; } .font-icon-pencil:before { - content: "m"; + content: "\6d"; } .font-icon-trash:before { - content: "g"; + content: "\67"; } .font-icon-edit:before { - content: "N"; + content: "\4e"; } .font-icon-tick:before { - content: "O"; + content: "\4f"; +} +.font-icon-upload:before { + content: "\62"; } .font-icon-folder-add:before { - content: "S"; + content: "\53"; +} +.font-icon-silverstripe:before { + content: "\4d"; } .font-icon-thumbnails:before { - content: "W"; + content: "\57"; +} +.font-icon-down-open:before { + content: "\30"; +} +.font-icon-up-open:before { + content: "\31"; } .font-icon-link:before { - content: "2"; + content: "\32"; +} +.font-icon-level-up:before { + content: "\56"; +} +.font-icon-image:before { + content: "\34"; +} +.font-icon-trash-bin:before { + content: "\50"; +} +.font-icon-code:before { + content: "\33"; +} +.font-icon-left-open-big:before { + content: "\35"; +} +.font-icon-down-open-big:before { + content: "\36"; +} +.font-icon-up-open-big:before { + content: "\37"; +} +.font-icon-right-open-big:before { + content: "\38"; } .font-icon-dot-3:before { content: "\39"; @@ -193,3 +227,9 @@ .font-icon-cancel:before { content: "\44"; } +.font-icon-happy:before { + content: "\22"; +} +.font-icon-sad:before { + content: "\23"; +} diff --git a/admin/client/dist/font/silverstripe.woff b/admin/client/dist/font/silverstripe.woff deleted file mode 100644 index e9a86b58e..000000000 Binary files a/admin/client/dist/font/silverstripe.woff and /dev/null differ diff --git a/admin/client/src/styles/bundle.scss b/admin/client/src/styles/bundle.scss index e2b3c94bf..71520a6e7 100644 --- a/admin/client/src/styles/bundle.scss +++ b/admin/client/src/styles/bundle.scss @@ -7,15 +7,13 @@ // Base @import "typography"; -@import "styles"; +@import "../../dist/font/icon-styles.css"; // Legacy @import "legacy/sprity"; @import "legacy/sprites"; @import "legacy/mixins"; @import "legacy/themes/default"; -@import "legacy/fonts"; -@import "legacy/typography"; @import "legacy/uitheme"; @import "legacy/forms"; @import "legacy/style";