Commit Graph

74 Commits

Author SHA1 Message Date
Jason Fowler 2daa9998ae MDL-39746 - Themes - Hiding the user picture on the forum page when the screensize is too small to allow for it
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-11 11:25:04 +08:00
Dan Poltawski ade2afc29f Merge branch 'MDL-39338_M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-10 16:07:28 +08:00
Mary Evans 7b9caeb92b MDL-39016 theme_bootstrapbase: Added login info and home link to footer in both boostrapbase & clean layout/general.php 2013-06-10 16:04:22 +12:00
Dan Poltawski 6f4232974e Merge branch 'wip-MDL-39824-m25' of http://github.com/samhemelryk/moodle into MOODLE_25_STABLE 2013-06-10 10:54:27 +08:00
Jason Fowler 57ecff6356 MDL-39608 - Bootstrap - Chaning the thresholds and width values for the Form labels
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-10 14:28:54 +12:00
Sam Hemelryk 6964e6a580 MDL-39824 theme_bootstrapbase: converted $PAGE use to new $OUTPUT methods. 2013-06-10 09:29:58 +12:00
Sam Hemelryk 5c8c94eabe MDL-40089 theme_bootstrapbase: moved general to columns3.php as prep 2013-06-10 09:29:57 +12:00
Mary Evans 82887b29e8 MDL-39338 core_question: Make history box a .well 2013-06-06 22:57:09 +01:00
Mary Evans 179fbc7f11 MDL-39977 theme_bootstrapbase: Changes the way Clean theme's login takes its navbar styles from Bootstrapbase.
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-05 10:13:39 +08:00
Dan Poltawski 9a0e9776c0 MDL-39968 bootstrapbase: uses non-standard browser sniffing
Also theme_clean does the same sniffing, but is not necessary as its
included by bootstrapbase
2013-06-05 02:34:13 +02:00
Dan Poltawski 2b7e18fded Merge branch 'wip-MDL-39819_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-04 14:38:36 +08:00
Dan Poltawski 836dab79c0 MDL-39931 less: recompile with whitespace removed 2013-06-04 14:09:28 +08:00
Dan Poltawski 2fdfdd49d4 Merge branch 'MDL-39931-M25' of github.com:lazydaisy/moodle into MOODLE_25_STABLE 2013-06-04 13:32:33 +08:00
Mary Evans f58fadfeba MDL-39987 theme_bootstrapbase: Fixed menunode text in renderers/core_renderer.php. 2013-06-02 23:17:14 +01:00
Gareth J Barnard dfb83eb132 MDL-39819 theme_bootstrapbase: Fix icon alignment in filepicker. 2013-05-31 22:32:03 +01:00
Mary Evans 91cf8cc82c MDL-39931 theme_bootstrapbase: ported invisiblefieldset css rules from theme/base/core.css to less/moodle/core.css 2013-05-30 15:51:16 +01:00
Eloy Lafuente (stronk7) e58af1dfcd Merge branch 'wip-MDL-39836_M25' of git://github.com/gjb2048/moodle into MOODLE_25_STABLE
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-28 01:24:58 +02:00
Damyon Wiese f32e55c8d7 Merge branch 'MDL-39680-M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-27 16:21:44 +08:00
Dan Poltawski ad97a56875 MDL-39806 theme_bootstrapbase: run less with --compress 2013-05-27 14:42:44 +08:00
Gareth J Barnard 69ecf8c0a9 MDL-38856 theme_bootstrapbase: Inverse user name text unreadable on nav bar 2013-05-27 02:09:01 +01:00
Mary Evans 039c78702d MDL-39680 theme_bootstrapbase: Fixed footer alignment in less/moodle/debug.less
Squashed commit of the following:

commit 58f5e063a8b333c184ca83ece7f61ec40d2a5080
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun May 26 13:45:11 2013 +0100

    MDL-39680 theme_bootstrapbase: Fixed footer alignment in less/moodle/debug.less

commit 575594257a9f4fab75977d2334d07659abea0b65
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun May 26 02:07:00 2013 +0100

    MDL-39680 theme_bootstrapbase: Centralised text in footer.
2013-05-26 13:55:45 +01:00
Mary Evans 6ceb6eb672 MDL-39806 theme_bootstrapbase: Fix for coursesearchbox label alignment. 2013-05-25 17:16:39 +01:00
Damyon Wiese d74f740722 Merge branch 'MDL-39697-M25' of git://github.com/lazydaisy/moodle into MOODLE_25_STABLE 2013-05-22 09:03:31 +08:00
Mary Evans b6d07f25a1 MDL-39758 theme_bootatrapbase: Added missing layout/embedded.php. 2013-05-20 13:04:44 +01:00
Mary Evans 9141e05262 MDL-39697 theme_bootstrapbase: Updated $THEME->layouts in config.php to match those in Base theme. 2013-05-16 00:57:40 +01:00
Damyon Wiese 6693089b90 MDL-39573 theme: bootstrap - always show pre and post regions when editing 2013-05-13 14:55:29 +08:00
Mary Evans 0d57b4cbf2 MDL-39595 theme_bootstrapbase: Renamed renderers/core.php to renderers/core_renderer.php 2013-05-13 14:51:26 +08:00
Eloy Lafuente (stronk7) ab0cb7cde6 Merge branch 'MDL-39003-master' of git://github.com/damyon/moodle 2013-05-10 02:36:30 +02:00
Eloy Lafuente (stronk7) b87572e860 Merge branch 'wip-MDL-39424-master' of git://github.com/ds125v/moodle 2013-05-09 22:18:58 +02:00
Damyon Wiese c8f7f2b5f3 Merge branch 'wip-MDL-39436-master' of git://github.com/marinaglancy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-09 11:29:33 +08:00
Marina Glancy d58f998eb4 MDL-39436 fixing RTL in filemanager - contextmenu icon 2013-05-09 12:40:51 +10:00
Damyon Wiese 38398bebc3 MDL-39003 README for bootstrap less - more clarification and details 2013-05-09 09:15:07 +08:00
Jason Fowler e473358ef1 MDL-39003 - Bootstrap Theme - Changing less README to point to the dev docs for LESS 2013-05-09 09:13:06 +08:00
Dan Poltawski 036aab5daa MDL-38979 bootstrap: fix previous TODO bugnumber..
grrr! Sorry for that.
2013-05-08 13:34:49 +01:00
Dan Poltawski 69b9a894a1 MDL-38979 bootstrap: add note about duplicated logic 2013-05-08 13:32:48 +01:00
Dan Poltawski 0249631131 Merge branch 'MDL-38979-master' of git://github.com/ds125v/moodle 2013-05-08 13:27:42 +01:00
David Scotson 906b5731aa MDL-39424 bootstrapbase: add basic text styles to editor.css 2013-05-08 11:54:39 +01:00
Marina Glancy 8c288b261a MDL-38594 change course listing heading font size back to default 2013-05-08 15:14:56 +08:00
Marina Glancy bb7368a29b MDL-39388 corrected tabs renderer to deal with old code 2013-05-08 14:58:17 +08:00
Damyon Wiese 9a2cc7b6c8 Merge branch 'MDL-39388-master' of git://github.com/ds125v/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-08 14:57:49 +08:00
Dan Poltawski 38a6ec6a3a Merge branch 'wip-MDL-39436-master' of git://github.com/marinaglancy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-07 15:12:58 +01:00
Sam Hemelryk e4e8d577cd Merge branch 'wip-MDL-39499-master' of git://github.com/ds125v/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-07 17:11:28 +12:00
Damyon Wiese a135128390 Merge branch 'wip-MDL-39130-master' of git://github.com/ds125v/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-07 11:25:35 +08:00
Damyon Wiese e0fc61f993 Merge branch 'MDL-39162' of git://github.com/totara/openbadges
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-07 10:41:44 +08:00
Yuliya Bozhko f8ba185ac5 MDL-39162: Add badges CSS to bootstrap theme 2013-05-06 16:20:02 +12:00
Damyon Wiese 4c2a46e507 Merge branch 'MDL-39399-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-06 12:13:27 +08:00
David Scotson c57a883080 MDL-39499 bootstrapbase: Make two .singlebuttons line up 2013-05-03 16:28:07 +01:00
David Scotson ed88a6f32a MDL-30130 bootstrapbase: Bring back Quiz answer feedback 2013-05-03 15:47:15 +01:00
Marina Glancy dde6bdf973 MDL-39436 fixing RTL in filemanager 2013-05-03 11:30:33 +10:00
Marina Glancy 69bbd2a7cd MDL-38594 Core themes changed for the new course listings styles 2013-05-03 11:16:16 +10:00