Merge pull request joomla#166 from richard67/development-no-font-sche…

…me-as-default Fix missing css variable values for font scheme "None" and make "None" the default scheme
hans2103 · Oct 3, 2020 · 2deab13 · 2deab13
2 parents 88cf2d0 + 6bec0d4
commit 2deab13
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/templates/cassiopeia/error.php b/templates/cassiopeia/error.php
@@ -41,7 +41,7 @@
 $this->getPreloadManager()->preload($wa->getAsset('style', $assetColorName)->getUri(), ['as' => 'style']);
 
 // Use a font scheme if not "None" is set in the template style options
-$paramsFontScheme = $params->get('useFontScheme', 'fonts-local_roboto');
+$paramsFontScheme = $params->get('useFontScheme', false);
 
 if ($paramsFontScheme)
 {

diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php
@@ -38,7 +38,7 @@
 $this->getPreloadManager()->preload($wa->getAsset('style', $assetColorName)->getUri(), ['as' => 'style']);
 
 // Use a font scheme if not "None" is set in the template style options
-$paramsFontScheme = $this->params->get('useFontScheme', 'fonts-local_roboto');
+$paramsFontScheme = $this->params->get('useFontScheme', false);
 
 if ($paramsFontScheme)
 {

diff --git a/templates/cassiopeia/offline.php b/templates/cassiopeia/offline.php
@@ -34,7 +34,7 @@
 $this->getPreloadManager()->preload($wa->getAsset('style', $assetColorName)->getUri(), ['as' => 'style']);
 
 // Use a font scheme if not "None" is set in the template style options
-$paramsFontScheme = $this->params->get('useFontScheme', 'fonts-local_roboto');
+$paramsFontScheme = $this->params->get('useFontScheme', false);
 
 if ($paramsFontScheme)
 {

diff --git a/templates/cassiopeia/scss/blocks/_global.scss b/templates/cassiopeia/scss/blocks/_global.scss
@@ -19,8 +19,8 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--cassiopeia-font-family-headings);
-  font-weight: var(--cassiopeia-font-weight-headings);
+  font-family: var(--cassiopeia-font-family-headings, $font-family-sans-serif);
+  font-weight: var(--cassiopeia-font-weight-headings, $font-weight-bold);
 }
 
 a {

diff --git a/templates/cassiopeia/scss/tools/variables/_variables.scss b/templates/cassiopeia/scss/tools/variables/_variables.scss
@@ -132,7 +132,8 @@ $metismenu:                           true !default;
 $cassiopeia-toolbar-line-height:      1.8rem;
 
 // Typography
-$font-family-base:                    var(--cassiopeia-font-family-body);
+$font-family-sans-serif:             -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
+$font-family-base:                    var(--cassiopeia-font-family-body, $font-family-sans-serif);
 
 $font-size-root:                      calc(1em + .16vw);
 $font-size-lg:                        1.25rem;

diff --git a/templates/cassiopeia/templateDetails.xml b/templates/cassiopeia/templateDetails.xml
@@ -73,7 +73,7 @@
 					name="useFontScheme"
 					type="groupedlist"
 					label="TPL_CASSIOPEIA_FONT_LABEL"
-					default="fonts-local_roboto"
+					default="0"
 					>
 					<option value="0">JNONE</option>
 					<group label="TPL_CASSIOPEIA_FONT_GROUP_LOCAL">