diff --git a/theme/bootstrap/README.txt b/theme/bootstrap/README.txt index cec1b21e5ee..c20c74c10c3 100644 --- a/theme/bootstrap/README.txt +++ b/theme/bootstrap/README.txt @@ -23,8 +23,8 @@ accessibility and Search Engine Optimization (SEO). *less CSS Less CSS is a Object Oriented way of writing CSS code. All Less CSS files -for this theme are stored in the /less folder. A developer can run a command -line script to generate the single CSS file called /style/generated.css. For more +for this theme are stored in the /less folder. A developer can use recess +to generate the CSS files in the /style folder. For more information read /less/README JavaScript Libraries diff --git a/theme/bootstrap/config.php b/theme/bootstrap/config.php index 38c167068e9..8cf9956e449 100644 --- a/theme/bootstrap/config.php +++ b/theme/bootstrap/config.php @@ -33,7 +33,7 @@ $THEME->doctype = 'html5'; $THEME->yuicssmodules = array(); $THEME->name = 'bootstrap'; $THEME->parents = array(''); -$THEME->sheets = array('generated'); +$THEME->sheets = array('moodle'); $THEME->supportscssoptimisation = false; $THEME->editor_sheets = array('editor'); diff --git a/theme/bootstrap/less/README b/theme/bootstrap/less/README index ccc6048b0ec..de4b898b510 100644 --- a/theme/bootstrap/less/README +++ b/theme/bootstrap/less/README @@ -2,7 +2,7 @@ If you want to make changes to the .css generated from these .less files then yo need to install recess (https://github.com/twitter/recess) to compile the .less files, then run these commands in the bootstrap/less/ folder: -recess --compile --compress moodle.less > ../style/generated.css +recess --compile --compress moodle.less > ../style/moodle.css You can add --watch to make sure it updates every time you make a change. diff --git a/theme/bootstrap/less/moodle/recess.txt b/theme/bootstrap/less/moodle/recess.txt deleted file mode 100644 index cc08db8f909..00000000000 --- a/theme/bootstrap/less/moodle/recess.txt +++ /dev/null @@ -1,5 +0,0 @@ - -Analyzing the following files: style/generated.css - -Error reading file: style/generated.css - diff --git a/theme/bootstrap/readme_moodle.txt b/theme/bootstrap/readme_moodle.txt index 96d5f75237d..b1addfa7263 100644 --- a/theme/bootstrap/readme_moodle.txt +++ b/theme/bootstrap/readme_moodle.txt @@ -10,7 +10,8 @@ https://github.com/twitter/bootstrap.git To update to the latest release of twitter bootstrap: * remove all files from less/bootstrap, * download the new less files and store them in less/bootstrap -* regenerate files using recess: recess --compile --compress moodle.less > ../style/generated.css ** +* regenerate files using recess: recess --compile --compress moodle.less > ../style/moodle.css ** +* regenerate files using recess: recess --compile --compress editor.less > ../style/editor.css ** * update lib/thirdpartylibs.xml ** If you want to make changes to the .css generated from these .less files then you diff --git a/theme/bootstrap/style/README b/theme/bootstrap/style/README index 8f378b59d54..f80ce0da877 100644 --- a/theme/bootstrap/style/README +++ b/theme/bootstrap/style/README @@ -1,3 +1,3 @@ -The generated.css file is created from .less files via the method described in the readme -in the /less/ folder. It's unwise to directly the edit the generated.css as your changes +These css files are created from .less files via the method described in the readme +in the /theme/bootstrap/less/ folder. It's unwise to directly the edit the css files as your changes may be overwritten. diff --git a/theme/bootstrap/style/generated.css b/theme/bootstrap/style/moodle.css similarity index 100% rename from theme/bootstrap/style/generated.css rename to theme/bootstrap/style/moodle.css