mirror of
https://github.com/moodle/moodle.git
synced 2025-04-14 04:52:36 +02:00
Merge branch 'MDL-56172-master' of git://github.com/danpoltawski/moodle
This commit is contained in:
Eloy Lafuente (stronk7)
commit
b8c241b1fd
@ -13,10 +13,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
|
||||
$temp->add(new admin_setting_configcheckbox('enablesafebrowserintegration', new lang_string('enablesafebrowserintegration', 'admin'), new lang_string('configenablesafebrowserintegration', 'admin'), 0));
|
||||
|
||||
$temp->add(new admin_setting_configcheckbox('dndallowtextandlinks', new lang_string('dndallowtextandlinks', 'admin'), new lang_string('configdndallowtextandlinks', 'admin'), 0));
|
||||
// The CSS optimiser setting. When changed we need to reset the theme caches in order to ensure they are regenerated through the optimiser.
|
||||
$enablecssoptimiser = new admin_setting_configcheckbox('enablecssoptimiser', new lang_string('enablecssoptimiser','admin'), new lang_string('enablecssoptimiser_desc','admin'), 0);
|
||||
$enablecssoptimiser->set_updatedcallback('theme_reset_all_caches');
|
||||
$temp->add($enablecssoptimiser);
|
||||
|
||||
$ADMIN->add('experimental', $temp);
|
||||
|
||||
|
||||
@ -434,32 +434,6 @@ $CFG->admin = 'admin';
|
||||
//
|
||||
// $CFG->altcacheconfigpath = '/var/www/shared/moodle.cache.config.php
|
||||
//
|
||||
// The CSS files the Moodle produces can be extremely large and complex, especially
|
||||
// if you are using a custom theme that builds upon several other themes.
|
||||
// In Moodle 2.3 a CSS optimiser was added as an experimental feature for advanced
|
||||
// users. The CSS optimiser organises the CSS in order to reduce the overall number
|
||||
// of rules and styles being sent to the client. It does this by collating the
|
||||
// CSS before it is cached removing excess styles and rules and stripping out any
|
||||
// extraneous content such as comments and empty rules.
|
||||
// The following settings are used to enable and control the optimisation.
|
||||
//
|
||||
// Enable the CSS optimiser. This will only optimise the CSS if themedesignermode
|
||||
// is not enabled. This can be set through the UI however it is noted here as well
|
||||
// because the other CSS optimiser settings can not be set through the UI.
|
||||
//
|
||||
// $CFG->enablecssoptimiser = true;
|
||||
//
|
||||
// If set the CSS optimiser will add stats about the optimisation to the top of
|
||||
// the optimised CSS file. You can then inspect the CSS to see the affect the CSS
|
||||
// optimiser is having.
|
||||
//
|
||||
// $CFG->cssoptimiserstats = true;
|
||||
//
|
||||
// If set the CSS that is optimised will still retain a minimalistic formatting
|
||||
// so that anyone wanting to can still clearly read it.
|
||||
//
|
||||
// $CFG->cssoptimiserpretty = true;
|
||||
//
|
||||
// Use the following flag to completely disable the Available update notifications
|
||||
// feature and hide it from the server administration UI.
|
||||
//
|
||||
|
||||
@ -462,8 +462,6 @@ $string['enableblogs'] = 'Enable blogs';
|
||||
$string['enablecalendarexport'] = 'Enable calendar export';
|
||||
$string['enablecomments'] = 'Enable comments';
|
||||
$string['enablecourserequests'] = 'Enable course requests';
|
||||
$string['enablecssoptimiser'] = 'Enable CSS optimiser';
|
||||
$string['enablecssoptimiser_desc'] = 'When enabled CSS will be run through an optimisation process before being cached. The optimiser processes the CSS removing duplicate rules and styles, as well as white space removable and reformatting. Please note turning this on at the same time as theme designer mode is awful for performance but will help theme designers create optimised CSS.';
|
||||
$string['enabled'] = 'Enabled';
|
||||
$string['enabledevicedetection'] = 'Enable device detection';
|
||||
$string['enableglobalsearch'] = 'Enable global search';
|
||||
|
||||
4617
lib/csslib.php
4617
lib/csslib.php
File diff suppressed because it is too large
Load Diff
@ -2207,5 +2207,11 @@ function xmldb_main_upgrade($oldversion) {
|
||||
upgrade_main_savepoint(true, 2016091900.02);
|
||||
}
|
||||
|
||||
if ($oldversion < 2016100300.00) {
|
||||
unset_config('enablecssoptimiser');
|
||||
|
||||
upgrade_main_savepoint(true, 2016100300.00);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -4629,3 +4629,284 @@ function put_records_csv($file, $records, $table = NULL) {
|
||||
@chmod($CFG->tempdir.'/'.$file, $CFG->filepermissions);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determines if the given value is a valid CSS colour.
|
||||
*
|
||||
* A CSS colour can be one of the following:
|
||||
* - Hex colour: #AA66BB
|
||||
* - RGB colour: rgb(0-255, 0-255, 0-255)
|
||||
* - RGBA colour: rgba(0-255, 0-255, 0-255, 0-1)
|
||||
* - HSL colour: hsl(0-360, 0-100%, 0-100%)
|
||||
* - HSLA colour: hsla(0-360, 0-100%, 0-100%, 0-1)
|
||||
*
|
||||
* Or a recognised browser colour mapping {@link css_optimiser::$htmlcolours}
|
||||
*
|
||||
* @deprecated since Moodle 3.2
|
||||
* @todo MDL-56173 for final deprecation in Moodle 3.6
|
||||
* @param string $value The colour value to check
|
||||
* @return bool
|
||||
*/
|
||||
function css_is_colour($value) {
|
||||
debugging('css_is_colour() is deprecated without a replacement. Please copy the implementation '.
|
||||
'into your plugin if you need this functionality.', DEBUG_DEVELOPER);
|
||||
|
||||
$value = trim($value);
|
||||
|
||||
$hex = '/^#([a-fA-F0-9]{1,3}|[a-fA-F0-9]{6})$/';
|
||||
$rgb = '#^rgb\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)$#i';
|
||||
$rgba = '#^rgba\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1}(\.\d+)?)\s*\)$#i';
|
||||
$hsl = '#^hsl\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\%\s*,\s*(\d{1,3})\%\s*\)$#i';
|
||||
$hsla = '#^hsla\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\%\s*,\s*(\d{1,3})\%\s*,\s*(\d{1}(\.\d+)?)\s*\)$#i';
|
||||
|
||||
if (in_array(strtolower($value), array('inherit'))) {
|
||||
return true;
|
||||
} else if (preg_match($hex, $value)) {
|
||||
return true;
|
||||
} else if (in_array(strtolower($value), array_keys(css_optimiser::$htmlcolours))) {
|
||||
return true;
|
||||
} else if (preg_match($rgb, $value, $m) && $m[1] < 256 && $m[2] < 256 && $m[3] < 256) {
|
||||
// It is an RGB colour.
|
||||
return true;
|
||||
} else if (preg_match($rgba, $value, $m) && $m[1] < 256 && $m[2] < 256 && $m[3] < 256) {
|
||||
// It is an RGBA colour.
|
||||
return true;
|
||||
} else if (preg_match($hsl, $value, $m) && $m[1] <= 360 && $m[2] <= 100 && $m[3] <= 100) {
|
||||
// It is an HSL colour.
|
||||
return true;
|
||||
} else if (preg_match($hsla, $value, $m) && $m[1] <= 360 && $m[2] <= 100 && $m[3] <= 100) {
|
||||
// It is an HSLA colour.
|
||||
return true;
|
||||
}
|
||||
// Doesn't look like a colour.
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true is the passed value looks like a CSS width.
|
||||
* In order to pass this test the value must be purely numerical or end with a
|
||||
* valid CSS unit term.
|
||||
*
|
||||
* @param string|int $value
|
||||
* @return boolean
|
||||
* @deprecated since Moodle 3.2
|
||||
* @todo MDL-56173 for final deprecation in Moodle 3.6
|
||||
*/
|
||||
function css_is_width($value) {
|
||||
debugging('css_is_width() is deprecated without a replacement. Please copy the implementation '.
|
||||
'into your plugin if you need this functionality.', DEBUG_DEVELOPER);
|
||||
|
||||
$value = trim($value);
|
||||
if (in_array(strtolower($value), array('auto', 'inherit'))) {
|
||||
return true;
|
||||
}
|
||||
if ((string)$value === '0' || preg_match('#^(\-\s*)?(\d*\.)?(\d+)\s*(em|px|pt|\%|in|cm|mm|ex|pc)$#i', $value)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* A simple sorting function to sort two array values on the number of items they contain
|
||||
*
|
||||
* @param array $a
|
||||
* @param array $b
|
||||
* @return int
|
||||
* @deprecated since Moodle 3.2
|
||||
* @todo MDL-56173 for final deprecation in Moodle 3.6
|
||||
*/
|
||||
function css_sort_by_count(array $a, array $b) {
|
||||
debugging('css_sort_by_count() is deprecated without a replacement. Please copy the implementation '.
|
||||
'into your plugin if you need this functionality.', DEBUG_DEVELOPER);
|
||||
|
||||
$a = count($a);
|
||||
$b = count($b);
|
||||
if ($a == $b) {
|
||||
return 0;
|
||||
}
|
||||
return ($a > $b) ? -1 : 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* A basic CSS optimiser that strips out unwanted things and then processes CSS organising and cleaning styles.
|
||||
* @deprecated since Moodle 3.2
|
||||
* @todo MDL-56173 for final deprecation in Moodle 3.6
|
||||
*/
|
||||
class css_optimiser {
|
||||
/**
|
||||
* An array of the common HTML colours that are supported by most browsers.
|
||||
*
|
||||
* This reference table is used to allow us to unify colours, and will aid
|
||||
* us in identifying buggy CSS using unsupported colours.
|
||||
*
|
||||
* @var string[]
|
||||
* @deprecated since Moodle 3.2
|
||||
* @todo MDL-56173 for final deprecation in Moodle 3.6
|
||||
*/
|
||||
public static $htmlcolours = array(
|
||||
'aliceblue' => '#F0F8FF',
|
||||
'antiquewhite' => '#FAEBD7',
|
||||
'aqua' => '#00FFFF',
|
||||
'aquamarine' => '#7FFFD4',
|
||||
'azure' => '#F0FFFF',
|
||||
'beige' => '#F5F5DC',
|
||||
'bisque' => '#FFE4C4',
|
||||
'black' => '#000000',
|
||||
'blanchedalmond' => '#FFEBCD',
|
||||
'blue' => '#0000FF',
|
||||
'blueviolet' => '#8A2BE2',
|
||||
'brown' => '#A52A2A',
|
||||
'burlywood' => '#DEB887',
|
||||
'cadetblue' => '#5F9EA0',
|
||||
'chartreuse' => '#7FFF00',
|
||||
'chocolate' => '#D2691E',
|
||||
'coral' => '#FF7F50',
|
||||
'cornflowerblue' => '#6495ED',
|
||||
'cornsilk' => '#FFF8DC',
|
||||
'crimson' => '#DC143C',
|
||||
'cyan' => '#00FFFF',
|
||||
'darkblue' => '#00008B',
|
||||
'darkcyan' => '#008B8B',
|
||||
'darkgoldenrod' => '#B8860B',
|
||||
'darkgray' => '#A9A9A9',
|
||||
'darkgrey' => '#A9A9A9',
|
||||
'darkgreen' => '#006400',
|
||||
'darkKhaki' => '#BDB76B',
|
||||
'darkmagenta' => '#8B008B',
|
||||
'darkolivegreen' => '#556B2F',
|
||||
'arkorange' => '#FF8C00',
|
||||
'darkorchid' => '#9932CC',
|
||||
'darkred' => '#8B0000',
|
||||
'darksalmon' => '#E9967A',
|
||||
'darkseagreen' => '#8FBC8F',
|
||||
'darkslateblue' => '#483D8B',
|
||||
'darkslategray' => '#2F4F4F',
|
||||
'darkslategrey' => '#2F4F4F',
|
||||
'darkturquoise' => '#00CED1',
|
||||
'darkviolet' => '#9400D3',
|
||||
'deeppink' => '#FF1493',
|
||||
'deepskyblue' => '#00BFFF',
|
||||
'dimgray' => '#696969',
|
||||
'dimgrey' => '#696969',
|
||||
'dodgerblue' => '#1E90FF',
|
||||
'firebrick' => '#B22222',
|
||||
'floralwhite' => '#FFFAF0',
|
||||
'forestgreen' => '#228B22',
|
||||
'fuchsia' => '#FF00FF',
|
||||
'gainsboro' => '#DCDCDC',
|
||||
'ghostwhite' => '#F8F8FF',
|
||||
'gold' => '#FFD700',
|
||||
'goldenrod' => '#DAA520',
|
||||
'gray' => '#808080',
|
||||
'grey' => '#808080',
|
||||
'green' => '#008000',
|
||||
'greenyellow' => '#ADFF2F',
|
||||
'honeydew' => '#F0FFF0',
|
||||
'hotpink' => '#FF69B4',
|
||||
'indianred ' => '#CD5C5C',
|
||||
'indigo ' => '#4B0082',
|
||||
'ivory' => '#FFFFF0',
|
||||
'khaki' => '#F0E68C',
|
||||
'lavender' => '#E6E6FA',
|
||||
'lavenderblush' => '#FFF0F5',
|
||||
'lawngreen' => '#7CFC00',
|
||||
'lemonchiffon' => '#FFFACD',
|
||||
'lightblue' => '#ADD8E6',
|
||||
'lightcoral' => '#F08080',
|
||||
'lightcyan' => '#E0FFFF',
|
||||
'lightgoldenrodyellow' => '#FAFAD2',
|
||||
'lightgray' => '#D3D3D3',
|
||||
'lightgrey' => '#D3D3D3',
|
||||
'lightgreen' => '#90EE90',
|
||||
'lightpink' => '#FFB6C1',
|
||||
'lightsalmon' => '#FFA07A',
|
||||
'lightseagreen' => '#20B2AA',
|
||||
'lightskyblue' => '#87CEFA',
|
||||
'lightslategray' => '#778899',
|
||||
'lightslategrey' => '#778899',
|
||||
'lightsteelblue' => '#B0C4DE',
|
||||
'lightyellow' => '#FFFFE0',
|
||||
'lime' => '#00FF00',
|
||||
'limegreen' => '#32CD32',
|
||||
'linen' => '#FAF0E6',
|
||||
'magenta' => '#FF00FF',
|
||||
'maroon' => '#800000',
|
||||
'mediumaquamarine' => '#66CDAA',
|
||||
'mediumblue' => '#0000CD',
|
||||
'mediumorchid' => '#BA55D3',
|
||||
'mediumpurple' => '#9370D8',
|
||||
'mediumseagreen' => '#3CB371',
|
||||
'mediumslateblue' => '#7B68EE',
|
||||
'mediumspringgreen' => '#00FA9A',
|
||||
'mediumturquoise' => '#48D1CC',
|
||||
'mediumvioletred' => '#C71585',
|
||||
'midnightblue' => '#191970',
|
||||
'mintcream' => '#F5FFFA',
|
||||
'mistyrose' => '#FFE4E1',
|
||||
'moccasin' => '#FFE4B5',
|
||||
'navajowhite' => '#FFDEAD',
|
||||
'navy' => '#000080',
|
||||
'oldlace' => '#FDF5E6',
|
||||
'olive' => '#808000',
|
||||
'olivedrab' => '#6B8E23',
|
||||
'orange' => '#FFA500',
|
||||
'orangered' => '#FF4500',
|
||||
'orchid' => '#DA70D6',
|
||||
'palegoldenrod' => '#EEE8AA',
|
||||
'palegreen' => '#98FB98',
|
||||
'paleturquoise' => '#AFEEEE',
|
||||
'palevioletred' => '#D87093',
|
||||
'papayawhip' => '#FFEFD5',
|
||||
'peachpuff' => '#FFDAB9',
|
||||
'peru' => '#CD853F',
|
||||
'pink' => '#FFC0CB',
|
||||
'plum' => '#DDA0DD',
|
||||
'powderblue' => '#B0E0E6',
|
||||
'purple' => '#800080',
|
||||
'red' => '#FF0000',
|
||||
'rosybrown' => '#BC8F8F',
|
||||
'royalblue' => '#4169E1',
|
||||
'saddlebrown' => '#8B4513',
|
||||
'salmon' => '#FA8072',
|
||||
'sandybrown' => '#F4A460',
|
||||
'seagreen' => '#2E8B57',
|
||||
'seashell' => '#FFF5EE',
|
||||
'sienna' => '#A0522D',
|
||||
'silver' => '#C0C0C0',
|
||||
'skyblue' => '#87CEEB',
|
||||
'slateblue' => '#6A5ACD',
|
||||
'slategray' => '#708090',
|
||||
'slategrey' => '#708090',
|
||||
'snow' => '#FFFAFA',
|
||||
'springgreen' => '#00FF7F',
|
||||
'steelblue' => '#4682B4',
|
||||
'tan' => '#D2B48C',
|
||||
'teal' => '#008080',
|
||||
'thistle' => '#D8BFD8',
|
||||
'tomato' => '#FF6347',
|
||||
'transparent' => 'transparent',
|
||||
'turquoise' => '#40E0D0',
|
||||
'violet' => '#EE82EE',
|
||||
'wheat' => '#F5DEB3',
|
||||
'white' => '#FFFFFF',
|
||||
'whitesmoke' => '#F5F5F5',
|
||||
'yellow' => '#FFFF00',
|
||||
'yellowgreen' => '#9ACD32'
|
||||
);
|
||||
|
||||
/**
|
||||
* Used to orocesses incoming CSS optimising it and then returning it. Now just returns
|
||||
* what is sent to it. Do not use.
|
||||
*
|
||||
* @param string $css The raw CSS to optimise
|
||||
* @return string The optimised CSS
|
||||
* @deprecated since Moodle 3.2
|
||||
* @todo MDL-56173 for final deprecation in Moodle 3.6
|
||||
*/
|
||||
public function process($css) {
|
||||
debugging('class css_optimiser is deprecated and no longer does anything, '.
|
||||
'please consider using stylelint to optimise your css.', DEBUG_DEVELOPER);
|
||||
|
||||
return $css;
|
||||
}
|
||||
}
|
||||
|
||||
@ -401,14 +401,6 @@ class theme_config {
|
||||
**/
|
||||
protected $parent_configs = array();
|
||||
|
||||
/**
|
||||
* @var bool If set to true then the theme is safe to run through the optimiser (if it is enabled)
|
||||
* If set to false then we know either the theme has already been optimised and the CSS optimiser is not needed
|
||||
* or the theme is not compatible with the CSS optimiser. In both cases even if enabled the CSS optimiser will not
|
||||
* be used with this theme if set to false.
|
||||
*/
|
||||
public $supportscssoptimisation = true;
|
||||
|
||||
/**
|
||||
* Used to determine whether we can serve SVG images or not.
|
||||
* @var bool
|
||||
@ -532,7 +524,7 @@ class theme_config {
|
||||
$configurable = array(
|
||||
'parents', 'sheets', 'parents_exclude_sheets', 'plugins_exclude_sheets',
|
||||
'javascripts', 'javascripts_footer', 'parents_exclude_javascripts',
|
||||
'layouts', 'enable_dock', 'enablecourseajax', 'supportscssoptimisation',
|
||||
'layouts', 'enable_dock', 'enablecourseajax',
|
||||
'rendererfactory', 'csspostprocess', 'editor_sheets', 'rarrow', 'larrow', 'uarrow', 'darrow',
|
||||
'hidefromselector', 'doctype', 'yuicssmodules', 'blockrtlmanipulations',
|
||||
'lessfile', 'extralesscallback', 'lessvariablescallback', 'blockrendermethod',
|
||||
@ -857,11 +849,9 @@ class theme_config {
|
||||
*
|
||||
* NOTE: this method is not expected to be used from any addons.
|
||||
*
|
||||
* @return string CSS markup, already optimised and compressed
|
||||
* @return string CSS markup compressed
|
||||
*/
|
||||
public function get_css_content() {
|
||||
global $CFG;
|
||||
require_once($CFG->dirroot.'/lib/csslib.php');
|
||||
|
||||
$csscontent = '';
|
||||
foreach ($this->get_css_files(false) as $type => $value) {
|
||||
@ -884,19 +874,7 @@ class theme_config {
|
||||
}
|
||||
}
|
||||
$csscontent = $this->post_process($csscontent);
|
||||
|
||||
if (!empty($CFG->enablecssoptimiser) && $this->supportscssoptimisation) {
|
||||
// This is an experimental feature introduced in Moodle 2.3
|
||||
// The CSS optimiser organises the CSS in order to reduce the overall number
|
||||
// of rules and styles being sent to the client. It does this by collating
|
||||
// the CSS before it is cached removing excess styles and rules and stripping
|
||||
// out any extraneous content such as comments and empty rules.
|
||||
$optimiser = new css_optimiser();
|
||||
$csscontent = $optimiser->process($csscontent);
|
||||
|
||||
} else {
|
||||
$csscontent = core_minify::css($csscontent);
|
||||
}
|
||||
$csscontent = core_minify::css($csscontent);
|
||||
|
||||
return $csscontent;
|
||||
}
|
||||
@ -913,8 +891,6 @@ class theme_config {
|
||||
* @return string CSS markup
|
||||
*/
|
||||
public function get_css_content_debug($type, $subtype, $sheet) {
|
||||
global $CFG;
|
||||
require_once($CFG->dirroot.'/lib/csslib.php');
|
||||
|
||||
if ($type === 'scss') {
|
||||
// The SCSS file of the theme is requested.
|
||||
@ -932,16 +908,6 @@ class theme_config {
|
||||
return '';
|
||||
}
|
||||
|
||||
$optimiser = null;
|
||||
if (!empty($CFG->enablecssoptimiser) && $this->supportscssoptimisation) {
|
||||
// This is an experimental feature introduced in Moodle 2.3
|
||||
// The CSS optimiser organises the CSS in order to reduce the overall number
|
||||
// of rules and styles being sent to the client. It does this by collating
|
||||
// the CSS before it is cached removing excess styles and rules and stripping
|
||||
// out any extraneous content such as comments and empty rules.
|
||||
$optimiser = new css_optimiser();
|
||||
}
|
||||
|
||||
$cssfiles = array();
|
||||
$css = $this->get_css_files(true);
|
||||
|
||||
@ -992,12 +958,6 @@ class theme_config {
|
||||
$contents = $this->post_process($contents);
|
||||
$comment = "/** Path: $type $subtype $sheet.' **/\n";
|
||||
$stats = '';
|
||||
if ($optimiser) {
|
||||
$contents = $optimiser->process($contents);
|
||||
if (!empty($CFG->cssoptimiserstats)) {
|
||||
$stats = $optimiser->output_stats_css();
|
||||
}
|
||||
}
|
||||
$csscontent .= $comment.$stats.$contents."\n\n";
|
||||
}
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -147,6 +147,5 @@ $THEME->enable_dock = false;
|
||||
$THEME->csstreepostprocessor = 'theme_boost_css_tree_post_processor';
|
||||
$THEME->extrascsscallback = 'theme_boost_get_extra_scss';
|
||||
$THEME->scssvariablescallback = 'theme_boost_get_scss_variables';
|
||||
$THEME->supportscssoptimisation = false;
|
||||
$THEME->yuicssmodules = array();
|
||||
$THEME->rendererfactory = 'theme_overridden_renderer_factory';
|
||||
|
||||
@ -35,7 +35,6 @@ $THEME->yuicssmodules = array();
|
||||
$THEME->name = 'bootstrapbase';
|
||||
$THEME->parents = array();
|
||||
$THEME->sheets = array('moodle');
|
||||
$THEME->supportscssoptimisation = false;
|
||||
$THEME->enable_dock = false;
|
||||
$THEME->editor_sheets = array('editor');
|
||||
|
||||
|
||||
@ -39,7 +39,6 @@ $THEME->name = 'clean';
|
||||
$THEME->doctype = 'html5';
|
||||
$THEME->parents = array('bootstrapbase');
|
||||
$THEME->sheets = array('custom');
|
||||
$THEME->supportscssoptimisation = false;
|
||||
$THEME->yuicssmodules = array();
|
||||
$THEME->enable_dock = true;
|
||||
$THEME->editor_sheets = array();
|
||||
|
||||
@ -31,7 +31,6 @@ $THEME->lessfile = 'moodle';
|
||||
$THEME->parents_exclude_sheets = array('bootstrapbase' => array('moodle'), 'clean' => array('custom'));
|
||||
$THEME->lessvariablescallback = 'theme_more_less_variables';
|
||||
$THEME->extralesscallback = 'theme_more_extra_less';
|
||||
$THEME->supportscssoptimisation = false;
|
||||
$THEME->yuicssmodules = array();
|
||||
$THEME->enable_dock = true;
|
||||
$THEME->editor_sheets = array();
|
||||
|
||||
@ -41,6 +41,13 @@ Removed themes:
|
||||
- qbank_chooser_types
|
||||
- qbank_chooser_qtype
|
||||
- qbank_chooser_title
|
||||
* The 'css optimiser' has been removed. Developers are encouraged to use tools such as stylelint
|
||||
to help optimise their css. Some functions and classes in lib/csslib.php (which was not for public use)
|
||||
have been deprecated:
|
||||
- css_is_colour
|
||||
- css_is_width
|
||||
- css_sort_by_count
|
||||
- class css_optimiser no longer does anything.
|
||||
|
||||
=== 3.1 ===
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
|
||||
defined('MOODLE_INTERNAL') || die();
|
||||
|
||||
$version = 2016092900.01; // YYYYMMDD = weekly release date of this DEV branch.
|
||||
$version = 2016100300.00; // YYYYMMDD = weekly release date of this DEV branch.
|
||||
// RR = release increments - 00 in DEV branches.
|
||||
// .XX = incremental changes.
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user