Skip to content

Commit

Permalink
MDL-69491 themes: No 'fontsize' setting in Boost causes unit conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
gjb2048 committed Aug 28, 2020
1 parent 4a6a263 commit cbecc14
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 6 deletions.
2 changes: 0 additions & 2 deletions theme/boost/lang/en/theme_boost.php
Expand Up @@ -34,8 +34,6 @@
$string['choosereadme'] = 'Boost is a modern highly-customisable theme. This theme is intended to be used directly, or as a parent theme when creating new themes utilising Bootstrap 4.';
$string['currentinparentheses'] = '(current)';
$string['configtitle'] = 'Boost';
$string['fontsize'] = 'Theme base fontsize';
$string['fontsize_desc'] = 'Enter a fontsize in %';
$string['generalsettings'] = 'General settings';
$string['nobootswatch'] = 'None';
$string['pluginname'] = 'Boost';
Expand Down
4 changes: 0 additions & 4 deletions theme/boost/lib.php
Expand Up @@ -150,9 +150,5 @@ function theme_boost_get_pre_scss($theme) {
$scss .= $theme->settings->scsspre;
}

if (!empty($theme->settings->fontsize)) {
$scss .= '$font-size-base: ' . (1 / 100 * $theme->settings->fontsize) . "rem !default;\n";
}

return $scss;
}

0 comments on commit cbecc14

Please sign in to comment.