support simple fonts again (cleanly this time)

2026-07-12 10:52:22 +02:00 · 2016-02-29 22:15:59 -07:00
parent 110318dfc9
commit 46efa25183
11 changed files with 137 additions and 107 deletions
--- a/themes/grav/css-compiled/fonts.css
+++ b/themes/grav/css-compiled/fonts.css
@@ -1,2 +1,50 @@
-@font-face{font-family:'Montserrat';font-weight:400;font-style:normal;src:url("../fonts/Montserrat-regular/Montserrat-regular.eot");src:url("../fonts/Montserrat-regular/Montserrat-regular.eot?#iefix") format("embedded-opentype"),local("Montserrat Regular"),local("Montserrat-Regular"),url("../fonts/Montserrat-regular/Montserrat-regular.woff2") format("woff2"),url("../fonts/Montserrat-regular/Montserrat-regular.woff") format("woff"),url("../fonts/Montserrat-regular/Montserrat-regular.ttf") format("truetype"),url("../fonts/Montserrat-regular/Montserrat-regular.svg#Montserrat") format("svg")}@font-face{font-family:'Lato';font-weight:300;font-style:normal;src:url("../fonts/Lato-300/Lato-300.eot");src:url("../fonts/Lato-300/Lato-300.eot?#iefix") format("embedded-opentype"),local("Lato Light"),local("Lato-300"),url("../fonts/Lato-300/Lato-300.woff2") format("woff2"),url("../fonts/Lato-300/Lato-300.woff") format("woff"),url("../fonts/Lato-300/Lato-300.ttf") format("truetype"),url("../fonts/Lato-300/Lato-300.svg#Lato") format("svg")}@font-face{font-family:'Lato';font-weight:400;font-style:normal;src:url("../fonts/Lato-regular/Lato-regular.eot");src:url("../fonts/Lato-regular/Lato-regular.eot?#iefix") format("embedded-opentype"),local("Lato Regular"),local("Lato-regular"),url("../fonts/Lato-regular/Lato-regular.woff2") format("woff2"),url("../fonts/Lato-regular/Lato-regular.woff") format("woff"),url("../fonts/Lato-regular/Lato-regular.ttf") format("truetype"),url("../fonts/Lato-regular/Lato-regular.svg#Lato") format("svg")}@font-face{font-family:'Lato';font-weight:700;font-style:normal;src:url("../fonts/Lato-700/Lato-700.eot");src:url("../fonts/Lato-700/Lato-700.eot?#iefix") format("embedded-opentype"),local("Lato Bold"),local("Lato-700"),url("../fonts/Lato-700/Lato-700.woff2") format("woff2"),url("../fonts/Lato-700/Lato-700.woff") format("woff"),url("../fonts/Lato-700/Lato-700.ttf") format("truetype"),url("../fonts/Lato-700/Lato-700.svg#Lato") format("svg")}@font-face{font-family:'Inconsolata';font-weight:400;font-style:normal;src:url("../fonts/Inconsolata-regular/Inconsolata-regular.eot");src:url("../fonts/Inconsolata-regular/Inconsolata-regular.eot?#iefix") format("embedded-opentype"),local("Inconsolata"),local("Inconsolata-regular"),url("../fonts/Inconsolata-regular/Inconsolata-regular.woff2") format("woff2"),url("../fonts/Inconsolata-regular/Inconsolata-regular.woff") format("woff"),url("../fonts/Inconsolata-regular/Inconsolata-regular.ttf") format("truetype"),url("../fonts/Inconsolata-regular/Inconsolata-regular.svg#Inconsolata") format("svg")}@font-face{font-family:'Inconsolata';font-weight:700;font-style:normal;src:url("../fonts/Inconsolata-700/Inconsolata-700.eot");src:url("../fonts/Inconsolata-700/Inconsolata-700.eot?#iefix") format("embedded-opentype"),local("Inconsolata Bold"),local("Inconsolata-700"),url("../fonts/Inconsolata-700/Inconsolata-700.woff2") format("woff2"),url("../fonts/Inconsolata-700/Inconsolata-700.woff") format("woff"),url("../fonts/Inconsolata-700/Inconsolata-700.ttf") format("truetype"),url("../fonts/Inconsolata-700/Inconsolata-700.svg#Inconsolata") format("svg")}body,h5,h6,.badge,.note,.grav-mdeditor-preview,input,select,textarea,button,.selectize-input{font-family:"Lato","Helvetica","Tahoma","Geneva","Arial",sans-serif}h1,h2,h3,h4,#admin-menu li,.form-tabs>label,.label{font-family:"Montserrat","Helvetica","Tahoma","Geneva","Arial",sans-serif}code,kbd,pre,samp,body .CodeMirror pre{font-family:"Inconsolata","Monaco","Consolas","Lucida Console",monospace}
+@font-face {
+  font-family: "Montserrat";
+  font-weight: 400;
+  font-style: normal;
+  src: url("../fonts/Montserrat-regular/Montserrat-regular.eot");
+  src: url("../fonts/Montserrat-regular/Montserrat-regular.eot?#iefix") format("embedded-opentype"), local("Montserrat-regular"), url("../fonts/Montserrat-regular/Montserrat-regular.woff2") format("woff2"), url("../fonts/Montserrat-regular/Montserrat-regular.woff") format("woff"), url("../fonts/Montserrat-regular/Montserrat-regular.ttf") format("truetype"), url("../fonts/Montserrat-regular/Montserrat-regular.svg#Montserrat") format("svg"); }
+@font-face {
+  font-family: "Lato";
+  font-weight: 300;
+  font-style: normal;
+  src: url("../fonts/Lato-300/Lato-300.eot");
+  src: url("../fonts/Lato-300/Lato-300.eot?#iefix") format("embedded-opentype"), local("Lato-300"), url("../fonts/Lato-300/Lato-300.woff2") format("woff2"), url("../fonts/Lato-300/Lato-300.woff") format("woff"), url("../fonts/Lato-300/Lato-300.ttf") format("truetype"), url("../fonts/Lato-300/Lato-300.svg#Lato") format("svg"); }
+@font-face {
+  font-family: "Lato";
+  font-weight: 400;
+  font-style: normal;
+  src: url("../fonts/Lato-regular/Lato-regular.eot");
+  src: url("../fonts/Lato-regular/Lato-regular.eot?#iefix") format("embedded-opentype"), local("Lato-regular"), url("../fonts/Lato-regular/Lato-regular.woff2") format("woff2"), url("../fonts/Lato-regular/Lato-regular.woff") format("woff"), url("../fonts/Lato-regular/Lato-regular.ttf") format("truetype"), url("../fonts/Lato-regular/Lato-regular.svg#Lato") format("svg"); }
+@font-face {
+  font-family: "Lato";
+  font-weight: 700;
+  font-style: normal;
+  src: url("../fonts/Lato-700/Lato-700.eot");
+  src: url("../fonts/Lato-700/Lato-700.eot?#iefix") format("embedded-opentype"), local("Lato-700"), url("../fonts/Lato-700/Lato-700.woff2") format("woff2"), url("../fonts/Lato-700/Lato-700.woff") format("woff"), url("../fonts/Lato-700/Lato-700.ttf") format("truetype"), url("../fonts/Lato-700/Lato-700.svg#Lato") format("svg"); }
+@font-face {
+  font-family: "Inconsolata";
+  font-weight: 400;
+  font-style: normal;
+  src: url("../fonts/Inconsolata-regular/Inconsolata-regular.eot");
+  src: url("../fonts/Inconsolata-regular/Inconsolata-regular.eot?#iefix") format("embedded-opentype"), local("Inconsolata-regular"), url("../fonts/Inconsolata-regular/Inconsolata-regular.woff2") format("woff2"), url("../fonts/Inconsolata-regular/Inconsolata-regular.woff") format("woff"), url("../fonts/Inconsolata-regular/Inconsolata-regular.ttf") format("truetype"), url("../fonts/Inconsolata-regular/Inconsolata-regular.svg#Inconsolata") format("svg"); }
+@font-face {
+  font-family: "Inconsolata";
+  font-weight: 700;
+  font-style: normal;
+  src: url("../fonts/Inconsolata-700/Inconsolata-700.eot");
+  src: url("../fonts/Inconsolata-700/Inconsolata-700.eot?#iefix") format("embedded-opentype"), local("Inconsolata-700"), url("../fonts/Inconsolata-700/Inconsolata-700.woff2") format("woff2"), url("../fonts/Inconsolata-700/Inconsolata-700.woff") format("woff"), url("../fonts/Inconsolata-700/Inconsolata-700.ttf") format("truetype"), url("../fonts/Inconsolata-700/Inconsolata-700.svg#Inconsolata") format("svg"); }
+body, h5, h6,
+.badge, .note, .grav-mdeditor-preview,
+input, select, textarea, button, .selectize-input {
+  font-family: "Lato", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif; }
+
+h1, h2, h3, h4,
+#admin-menu li, .form-tabs > label, .label {
+  font-family: "Montserrat", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif; }
+
+code, kbd, pre, samp,
+body .CodeMirror pre {
+  font-family: "Inconsolata", "Monaco", "Consolas", "Lucida Console", monospace; }
+
 /*# sourceMappingURL=fonts.css.map */
--- a/themes/grav/css-compiled/fonts.css.map
+++ b/themes/grav/css-compiled/fonts.css.map
@@ -1,7 +1,7 @@
 {
 "version": 3,
-"mappings": "AAAA,UAYC,CAXG,WAAW,CAAE,YAAY,CACzB,WAAW,CAAE,GAAG,CAChB,UAAU,CAAE,MAAM,CAClB,GAAG,CAAE,yDAAyD,CAC9D,GAAG,CAAE,0cAM6E,CAGtF,UAYC,CAXG,WAAW,CAAE,MAAM,CACnB,WAAW,CAAE,GAAG,CAChB,UAAU,CAAE,MAAM,CAClB,GAAG,CAAE,qCAAqC,CAC1C,GAAG,CAAE,8UAMmD,CAG5D,UAYC,CAXG,WAAW,CAAE,MAAM,CACnB,WAAW,CAAE,GAAG,CAChB,UAAU,CAAE,MAAM,CAClB,GAAG,CAAE,6CAA6C,CAClD,GAAG,CAAE,4XAM2D,CAGpE,UAYC,CAXG,WAAW,CAAE,MAAM,CACnB,WAAW,CAAE,GAAG,CAChB,UAAU,CAAE,MAAM,CAClB,GAAG,CAAE,qCAAqC,CAC1C,GAAG,CAAE,6UAMmD,CAG5D,UAYC,CAXG,WAAW,CAAE,aAAa,CAC1B,WAAW,CAAE,GAAG,CAChB,UAAU,CAAE,MAAM,CAClB,GAAG,CAAE,2DAA2D,CAChE,GAAG,CAAE,+cAMgF,CAGzF,UAYC,CAXG,WAAW,CAAE,aAAa,CAC1B,WAAW,CAAE,GAAG,CAChB,UAAU,CAAE,MAAM,CAClB,GAAG,CAAE,mDAAmD,CACxD,GAAG,CAAE,waAMwE,CChF7E,4FAEkD,CAC9C,WAAW,CAAE,uDAAgE,CAKjF,kDAC2C,CACvC,WAAW,CAAE,6DAAgE,CAKjF,sCACqB,CACjB,WAAW,CAAE,4DAA6D",
-"sources": ["../scss/configuration/fonts/_fonts.scss","../scss/configuration/fonts/_support.scss"],
+"mappings": "AAOoB,UAWC;EAVG,WAAW,EAAE,YAAc;EAC3B,WAAW,ECJI,GAAG;EDKlB,UAAU,EAAE,MAAM;EAClB,GAAG,EAAE,yDAA6C;EAClD,GAAG,EAAE,mbAKmE;AAV5E,UAWC;EAVG,WAAW,EAAE,MAAc;EAC3B,WAAW,ECHZ,GAAG;EDIF,UAAU,EAAE,MAAM;EAClB,GAAG,EAAE,qCAA6C;EAClD,GAAG,EAAE,+TAKmE;AAV5E,UAWC;EAVG,WAAW,EAAE,MAAc;EAC3B,WAAW,ECHU,GAAG;EDIxB,UAAU,EAAE,MAAM;EAClB,GAAG,EAAE,6CAA6C;EAClD,GAAG,EAAE,2WAKmE;AAV5E,UAWC;EAVG,WAAW,EAAE,MAAc;EAC3B,WAAW,ECH4B,GAAG;EDI1C,UAAU,EAAE,MAAM;EAClB,GAAG,EAAE,qCAA6C;EAClD,GAAG,EAAE,+TAKmE;AAV5E,UAWC;EAVG,WAAW,EAAE,aAAc;EAC3B,WAAW,ECFM,GAAG;EDGpB,UAAU,EAAE,MAAM;EAClB,GAAG,EAAE,2DAA6C;EAClD,GAAG,EAAE,+bAKmE;AAV5E,UAWC;EAVG,WAAW,EAAE,aAAc;EAC3B,WAAW,ECF+B,GAAG;EDG7C,UAAU,EAAE,MAAM;EAClB,GAAG,EAAE,mDAA6C;EAClD,GAAG,EAAE,mZAKmE;AAS5F;;iDAEkD;EAC9C,WAAW,EAAE,4DAAgE;;AAKjF;0CAC2C;EACvC,WAAW,EAAE,kEAAgE;;AAKjF;oBACqB;EACjB,WAAW,EAAE,gEAA6D",
+"sources": ["../scss/configuration/fonts/_support.scss","../scss/fonts.scss"],
 "names": [],
 "file": "fonts.css"
 }
--- a/themes/grav/css-compiled/simple-fonts.css
+++ b/themes/grav/css-compiled/simple-fonts.css
@@ -0,0 +1,10 @@
+body, h5, h6,
+.badge, .note, .grav-mdeditor-preview,
+input, select, textarea, button, .selectize-input,
+h1, h2, h3, h4,
+#admin-menu li, .form-tabs > label, .label,
+code, kbd, pre, samp,
+body .CodeMirror pre {
+  font-family: "Helvetica Neue", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif; }
+
+/*# sourceMappingURL=simple-fonts.css.map */
--- a/themes/grav/css-compiled/simple-fonts.css.map
+++ b/themes/grav/css-compiled/simple-fonts.css.map
@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "AAAA;;;;;;oBAMqB;EACjB,WAAW,EAAE,sEAAsE",
+"sources": ["../scss/simple-fonts.scss"],
+"names": [],
+"file": "simple-fonts.css"
+}
--- a/themes/grav/scss/configuration/fonts/_base.scss
+++ b/themes/grav/scss/configuration/fonts/_base.scss
@@ -1,5 +0,0 @@
-// Fonts
-@import "fonts";
-
-// Support
-@import "support";
--- a/themes/grav/scss/configuration/fonts/_fonts.scss
+++ b/themes/grav/scss/configuration/fonts/_fonts.scss
@@ -1,83 +0,0 @@
-@font-face {
-    font-family: 'Montserrat';
-    font-weight: 400;
-    font-style: normal;
-    src: url('../fonts/Montserrat-regular/Montserrat-regular.eot');
-    src: url('../fonts/Montserrat-regular/Montserrat-regular.eot?#iefix') format('embedded-opentype'),
-    local('Montserrat Regular'),
-    local('Montserrat-Regular'),
-    url('../fonts/Montserrat-regular/Montserrat-regular.woff2') format('woff2'),
-    url('../fonts/Montserrat-regular/Montserrat-regular.woff') format('woff'),
-    url('../fonts/Montserrat-regular/Montserrat-regular.ttf') format('truetype'),
-    url('../fonts/Montserrat-regular/Montserrat-regular.svg#Montserrat') format('svg');
-}
-
-@font-face {
-    font-family: 'Lato';
-    font-weight: 300;
-    font-style: normal;
-    src: url('../fonts/Lato-300/Lato-300.eot');
-    src: url('../fonts/Lato-300/Lato-300.eot?#iefix') format('embedded-opentype'),
-    local('Lato Light'),
-    local('Lato-300'),
-    url('../fonts/Lato-300/Lato-300.woff2') format('woff2'),
-    url('../fonts/Lato-300/Lato-300.woff') format('woff'),
-    url('../fonts/Lato-300/Lato-300.ttf') format('truetype'),
-    url('../fonts/Lato-300/Lato-300.svg#Lato') format('svg');
-}
-
-@font-face {
-    font-family: 'Lato';
-    font-weight: 400;
-    font-style: normal;
-    src: url('../fonts/Lato-regular/Lato-regular.eot');
-    src: url('../fonts/Lato-regular/Lato-regular.eot?#iefix') format('embedded-opentype'),
-    local('Lato Regular'),
-    local('Lato-regular'),
-    url('../fonts/Lato-regular/Lato-regular.woff2') format('woff2'),
-    url('../fonts/Lato-regular/Lato-regular.woff') format('woff'),
-    url('../fonts/Lato-regular/Lato-regular.ttf') format('truetype'),
-    url('../fonts/Lato-regular/Lato-regular.svg#Lato') format('svg');
-}
-
-@font-face {
-    font-family: 'Lato';
-    font-weight: 700;
-    font-style: normal;
-    src: url('../fonts/Lato-700/Lato-700.eot');
-    src: url('../fonts/Lato-700/Lato-700.eot?#iefix') format('embedded-opentype'),
-    local('Lato Bold'),
-    local('Lato-700'),
-    url('../fonts/Lato-700/Lato-700.woff2') format('woff2'),
-    url('../fonts/Lato-700/Lato-700.woff') format('woff'),
-    url('../fonts/Lato-700/Lato-700.ttf') format('truetype'),
-    url('../fonts/Lato-700/Lato-700.svg#Lato') format('svg');
-}
-
-@font-face {
-    font-family: 'Inconsolata';
-    font-weight: 400;
-    font-style: normal;
-    src: url('../fonts/Inconsolata-regular/Inconsolata-regular.eot');
-    src: url('../fonts/Inconsolata-regular/Inconsolata-regular.eot?#iefix') format('embedded-opentype'),
-    local('Inconsolata'),
-    local('Inconsolata-regular'),
-    url('../fonts/Inconsolata-regular/Inconsolata-regular.woff2') format('woff2'),
-    url('../fonts/Inconsolata-regular/Inconsolata-regular.woff') format('woff'),
-    url('../fonts/Inconsolata-regular/Inconsolata-regular.ttf') format('truetype'),
-    url('../fonts/Inconsolata-regular/Inconsolata-regular.svg#Inconsolata') format('svg');
-}
-
-@font-face {
-    font-family: 'Inconsolata';
-    font-weight: 700;
-    font-style: normal;
-    src: url('../fonts/Inconsolata-700/Inconsolata-700.eot');
-    src: url('../fonts/Inconsolata-700/Inconsolata-700.eot?#iefix') format('embedded-opentype'),
-    local('Inconsolata Bold'),
-    local('Inconsolata-700'),
-    url('../fonts/Inconsolata-700/Inconsolata-700.woff2') format('woff2'),
-    url('../fonts/Inconsolata-700/Inconsolata-700.woff') format('woff'),
-    url('../fonts/Inconsolata-700/Inconsolata-700.ttf') format('truetype'),
-    url('../fonts/Inconsolata-700/Inconsolata-700.svg#Inconsolata') format('svg');
-}
--- a/themes/grav/scss/configuration/fonts/_support.scss
+++ b/themes/grav/scss/configuration/fonts/_support.scss
@@ -1,3 +1,28 @@
+@mixin admin-font-faces($fonts) {
+    @each $fontname, $weights in $fonts {
+        @if $fontname == $fonts-default or
+            $fontname == $fonts-header or
+            $fontname == $fonts-mono {
+            @each $fullname, $weight in $weights {
+                @if $fullname != null {
+                    @font-face {
+                        font-family: '#{$fontname}';
+                        font-weight: $weight;
+                        font-style: normal;
+                        src: url('../fonts/#{$fullname}/#{$fullname}.eot');
+                        src: url('../fonts/#{$fullname}/#{$fullname}.eot?#iefix') format('embedded-opentype'),
+                        local('#{$fullname}'),
+                        url('../fonts/#{$fullname}/#{$fullname}.woff2') format('woff2'),
+                        url('../fonts/#{$fullname}/#{$fullname}.woff') format('woff'),
+                        url('../fonts/#{$fullname}/#{$fullname}.ttf') format('truetype'),
+                        url('../fonts/#{$fullname}/#{$fullname}.svg##{$fontname}') format('svg');
+                    }
+                }
+            }
+        }
+    }
+}
+
@mixin body-fonts($font) {
    body, h5, h6,
    .badge, .note, .grav-mdeditor-preview,
@@ -20,3 +45,20 @@
    }
 }

+@include admin-font-faces($font-definitions);
+
+@each $font in $fonts-default {
+    @include body-fonts($font);
+}
+
+@each $font in $fonts-header {
+    @include header-fonts($font);
+}
+
+@each $font in $fonts-mono {
+    @include mono-fonts($font);
+}
+
+
+
+
--- a/themes/grav/scss/fonts.scss
+++ b/themes/grav/scss/fonts.scss
@@ -1,19 +1,15 @@
-// Import font definitions
-@import "configuration/fonts/base";
+$fonts-default: 'Lato' !default;
+$fonts-header: 'Montserrat' !default;
+$fonts-mono: 'Inconsolata' !default;

-$fonts-default: 'Lato';
-$fonts-header: 'Montserrat';
-$fonts-mono: 'Inconsolata';
+$font-definitions: (
+    Montserrat: ('Montserrat-regular', 400) (null),
+    Lato: ('Lato-300', 300) ('Lato-regular', 400) ('Lato-700', 700),
+    Inconsolata: ('Inconsolata-regular', 400) ('Inconsolata-700', 700)
+);
+
+@import "configuration/fonts/support";

-@each $font in $fonts-default {
-    @include body-fonts($font);
-}

-@each $font in $fonts-header {
-    @include header-fonts($font);
-}

-@each $font in $fonts-mono {
-    @include mono-fonts($font);
-}

--- a/themes/grav/scss/simple-fonts.scss
+++ b/themes/grav/scss/simple-fonts.scss
@@ -0,0 +1,9 @@
+body, h5, h6,
+.badge, .note, .grav-mdeditor-preview,
+input, select, textarea, button, .selectize-input,
+h1, h2, h3, h4,
+#admin-menu li, .form-tabs > label, .label,
+code, kbd, pre, samp,
+body .CodeMirror pre {
+    font-family: "Helvetica Neue", "Helvetica", "Tahoma", "Geneva", "Arial", sans-serif;
+}
--- a/themes/grav/templates/partials/base.html.twig
+++ b/themes/grav/templates/partials/base.html.twig
@@ -29,7 +29,7 @@
    {% endblock %}
 {% endblock %}
 </head>
-<body {% if not config.plugins.admin.google_fonts %}class="simple-fonts"{% endif %}>
+<body>
    {% block page %}
    <div class="remodal-bg">

--- a/themes/grav/templates/partials/stylesheets.html.twig
+++ b/themes/grav/templates/partials/stylesheets.html.twig
@@ -1,7 +1,11 @@
 {% do assets.addCss(theme_url~'/css-compiled/nucleus.css') %}
 {% do assets.addCss(theme_url~'/css-compiled/template.css') %}
 {% do assets.addCss(theme_url~'/css-compiled/preset.css') %}
-{% do assets.addCss(theme_url~'/css-compiled/fonts.css') %}
+{% if config.plugins.admin.google_fonts %}
+    {% do assets.addCss(theme_url~'/css-compiled/fonts.css') %}
+{% else %}
+    {% do assets.addCss(theme_url~'/css-compiled/simple-fonts.css') %}
+{% endif %}
 {% do assets.addCss(theme_url~'/css/font-awesome.min.css') %}
 {% do assets.addCss(theme_url~'/css/chartist.min.css') %}
 {% do assets.addCss(theme_url~'/css/selectize.min.css') %}
@@ -13,3 +17,5 @@
    {% do assets.addCss(theme_url~'/css/nucleus-ie9.css') %}
    {% do assets.addCss(theme_url~'/css/pure-0.5.0/grids-min.css') %}
 {% endif %}
+
+{{ dump(config.plugins.admin.google_fonts) }}