MDL-64506 theme: Update BSB references and upgrade texts

nilo72 · Apr 3, 2019 · a5a6df5 · a5a6df5
1 parent cf89ac3
commit a5a6df5
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/lib/outputlib.php b/lib/outputlib.php
@@ -2554,8 +2554,8 @@ protected function get_region_name($region, $theme) {
             }
         }
 
-        // Last resort, try the bootstrapbase theme for names
-        return get_string('region-' . $region, 'theme_bootstrapbase');
+        // Last resort, try the boost theme for names
+        return get_string('region-' . $region, 'theme_boost');
     }
 
     /**

diff --git a/lib/templates/copy_box.mustache b/lib/templates/copy_box.mustache
@@ -33,7 +33,7 @@
 }}
 <input type="text" class="copy_box" value="{{{ text }}}" readonly="readonly" size="48" {{#id}}id={{#quote}}{{{id}}}-{{{uniqid}}}{{/quote}}{{/id}}/>
 {{# js }}
-require(['jquery', 'theme_bootstrapbase/bootstrap'], function($) {
+require(['jquery'], function($) {
     $('.copy_box').on('click', function() {
         $(this).select();
     });

diff --git a/mod/book/tool/print/index.php b/mod/book/tool/print/index.php
@@ -54,9 +54,6 @@
 
 $PAGE->set_url('/mod/book/print.php', array('id' => $id, 'chapterid' => $chapterid));
 
-// Use "embedded" instead of "print" because Bootstrapbase shows top
-// header bar and navbar even on print style - which is inconsistent
-// with extant behaviour.
 $PAGE->set_pagelayout("embedded");
 
 unset($id);

diff --git a/theme/boost/scss/fontawesome/readme_moodle.txt b/theme/boost/scss/fontawesome/readme_moodle.txt
@@ -4,4 +4,3 @@ Font awesome comes in 3 parts relating to Moodle.
 
 1. The font. Put the woff font in lib/fonts_core/fontawesome-webfont.woff. Update lib/thirdpartylibs.xml.
 2. SCSS. Replace the SCSS in this folder (/theme/boost/scss/fontawesome). Update theme/boost/thirdpartylibs.xml.
-2. Less. Replace the Less in this folder (/theme/bootstrapbase/less/fontawesome). Update theme/bootstrapbase/thirdpartylibs.xml.
diff --git a/theme/boost/scss/moodle/undo.scss b/theme/boost/scss/moodle/undo.scss
@@ -117,8 +117,7 @@ body:not(.jsenabled) .dropdown:hover > .dropdown-menu {
     margin-top: -6px; // We need to move it up to counter the arrows as they introduce hover bugs.
 }
 
-// Extends bootstrapbase/less/bootstrap/navbar.less
-// to enable scroll in the language menu.
+// Enable scroll in the language menu.
 body:not(.jsenabled) .langmenu:hover > .dropdown-menu,
 .langmenu.open > .dropdown-menu {
     display: block;

diff --git a/theme/upgrade.txt b/theme/upgrade.txt
@@ -7,6 +7,7 @@ information provided here is intended especially for theme designer.
 * Renderers that were overridden by Boost are now in Bootstrapbase
 * Core templates in Boost have now moved into core
 * Templates that were overridden by boost are now located in Bootstrapbase
+* Themes bootstrapbase, clean & more have now been removed.
 
 === 3.6 ===
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@ Font awesome comes in 3 parts relating to Moodle.

		1. The font. Put the woff font in lib/fonts_core/fontawesome-webfont.woff. Update lib/thirdpartylibs.xml.
		2. SCSS. Replace the SCSS in this folder (/theme/boost/scss/fontawesome). Update theme/boost/thirdpartylibs.xml.
		2. Less. Replace the Less in this folder (/theme/bootstrapbase/less/fontawesome). Update theme/bootstrapbase/thirdpartylibs.xml.