Permalink
Browse files

Merge branch 'MDL-39278-master' of git://github.com/damyon/moodle

Conflicts:
	theme/bootstrap/style/generated.css
	theme/bootstrap/style/moodle.css
	theme/bootstrapbase/less/moodle/recess.txt
	theme/bootstrapbase/style/generated.css
  • Loading branch information...
2 parents 1c97061 + 36f33e3 commit a86103e09bb5f0439ab0f5cf468b829b246d05aa @stronk7 stronk7 committed Apr 26, 2013
@@ -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
@@ -33,7 +33,7 @@
$THEME->yuicssmodules = array();
$THEME->name = 'bootstrapbase';
$THEME->parents = array('');
-$THEME->sheets = array('generated');
+$THEME->sheets = array('moodle');
$THEME->supportscssoptimisation = false;
$THEME->editor_sheets = array('editor');
@@ -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 bootstrapbase/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.
@@ -1,5 +0,0 @@
-
-Analyzing the following files: style/generated.css
-
-Error reading file: style/generated.css
-
@@ -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
@@ -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.

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit a86103e

Please sign in to comment.