Merge branch 'MDL-77657-master-get_extra_scss_code-wrong-order' of https://github.com/danowar2k/moodle
This commit is contained in:
+2
-2
@@ -1598,7 +1598,7 @@ class theme_config {
|
||||
|
||||
// Getting all the candidate functions.
|
||||
$candidates = array();
|
||||
foreach ($this->parent_configs as $parent_config) {
|
||||
foreach (array_reverse($this->parent_configs) as $parent_config) {
|
||||
if (!isset($parent_config->extrascsscallback)) {
|
||||
continue;
|
||||
}
|
||||
@@ -1631,7 +1631,7 @@ class theme_config {
|
||||
|
||||
// Getting all the candidate functions.
|
||||
$candidates = array();
|
||||
foreach ($this->parent_configs as $parent_config) {
|
||||
foreach (array_reverse($this->parent_configs) as $parent_config) {
|
||||
if (!isset($parent_config->prescsscallback)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
+1
-1
@@ -157,7 +157,7 @@ function theme_boost_get_precompiled_css() {
|
||||
* Get SCSS to prepend.
|
||||
*
|
||||
* @param theme_config $theme The theme config object.
|
||||
* @return array
|
||||
* @return string
|
||||
*/
|
||||
function theme_boost_get_pre_scss($theme) {
|
||||
global $CFG;
|
||||
|
||||
Reference in New Issue
Block a user