22 Commits

Author SHA1 Message Date
Sam Hemelryk
49eef7d82d Merge branch 'wip-MDL-40204_master' of git://github.com/gjb2048/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-25 11:35:57 +12:00
Gareth J Barnard
2e3fb23ff7 MDL-40065 theme_bootstrapbase theme_clean: Simplify column lyts / fix blocks. 2013-06-24 17:06:12 +01:00
Eloy Lafuente (stronk7)
b515f8001d MDL-40137 Whitespace fix 2013-06-18 01:47:13 +02:00
Sam Hemelryk
d85f228f18 MDL-40137 theme_clean: corrected lib.php function names 2013-06-17 09:39:23 +12:00
Gareth J Barnard
a31445a854 MDL-40204 theme_bootstrapbase & theme_clean: Fix RTL 3 column lyt with 1 blk. 2013-06-16 19:14:43 +01:00
Mary Evans
034710e8ee MDL-39016 theme_bootstrapbase: Added login info and home link to footer in both boostrapbase & clean layout/general.php 2013-06-10 16:05:25 +12:00
Sam Hemelryk
7956a02fda MDL-40089 theme_clean: simplified layouts and converted to new OUTPUT API 2013-06-10 09:09:03 +12:00
Sam Hemelryk
7362d8160a MDL-40089 theme_clean: moved general to columns3.php as prep 2013-06-07 17:33:14 +12:00
Dan Poltawski
e807dadb55 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-05-31 15:55:47 +08: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
3a61956f66 MDL-39364 theme_clean: remove all references to the Simple theme from Clean theme. 2013-05-04 02:34:44 +01:00
Eloy Lafuente (stronk7)
cedb0aab5a MDL-39434 Bump all versions near 2.5 release 2013-05-01 18:03:29 +02:00
Damyon Wiese
b38218cfb0 Merge branch 'w17_MDL-39371_m25_cleandep' of git://github.com/skodak/moodle 2013-04-29 14:52:40 +08:00
Sam Hemelryk
0c5d8ccb9a Merge branch 'w17_MDL-39336_m25_install' of git://github.com/skodak/moodle 2013-04-29 11:15:05 +12:00
Petr Škoda
aa95e38a0d MDL-39371 add dependency of clean theme on bootstrapbase 2013-04-27 15:27:29 +02:00
Mary Evans
07403fdaf4 MDL-39364 theme_clean: Changed 'simple' to 'clean'. 2013-04-26 22:18:26 +01:00
Petr Škoda
45951bbe7c MDL-39336 fix incorrect use on join() in simple theme 2013-04-26 21:33:15 +02:00
Damyon Wiese
4f1008202d MDL-39341 Themes Rename bootstrap to bootstrapbase 2013-04-26 13:01:06 +08:00
Mary Evans
b0ba8d9843 MDL-39250 theme_clean: Removed 2 instances of id="region-pre" from aside tags in layout/general.php. 2013-04-25 03:13:53 +01:00
Eloy Lafuente (stronk7)
e9f9bb7532 MDL-39276 theme_clean: Move favicon from old simple 2013-04-25 00:28:30 +02:00
Eloy Lafuente (stronk7)
ac8b3d845e Merge branch 'MDL-39276_clean' of git://github.com/lazydaisy/moodle 2013-04-25 00:27:03 +02:00
Mary Evans
109cdf6bd8 MDL-39276 theme_clean: Renamed Simple theme to Clean theme. 2013-04-24 21:35:15 +01:00