Commit graph

108 commits

Author SHA1 Message Date
Marina Glancy
128e9315d6 Merge branch 'MDL-37459-master-fix2' of git://github.com/damyon/moodle 2013-06-12 16:53:49 +10:00
Damyon Wiese
459e3c88ca MDL-37459 admin: Default styles for flags for admin settings 2013-06-12 10:06:06 +08:00
Dan Poltawski
1899145c50 Merge branch 'MDL-39773_b' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-12 09:33:23 +08:00
Sam Hemelryk
ec18f333bd Merge branch 'wip-MDL-39798_master' of git://github.com/gjb2048/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-12 08:51:59 +12:00
Sam Hemelryk
754fa10916 Merge branch 'wip-MDL-39820_master_2' of git://github.com/gjb2048/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-12 08:48:00 +12:00
Dan Poltawski
e2ac6a848b Merge branch 'wip-MDL-40087_master' of git://github.com/gjb2048/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-11 16:00:18 +08:00
Dan Poltawski
fd6f924c08 Merge branch 'wip-MDL-39746-master' of git://github.com/phalacee/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-11 11:24:31 +08:00
Dan Poltawski
c6898e629b Merge branch 'MDL-39338_master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-10 16:06:22 +08:00
Dan Poltawski
07bac478b6 Merge branch 'wip-MDL-39824-m26' of http://github.com/samhemelryk/moodle 2013-06-10 10:54:22 +08:00
Sam Hemelryk
111f5291f9 Merge branch 'wip-MDL-39608-master' of git://github.com/phalacee/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-10 14:26:04 +12:00
Gareth J Barnard
70d7e9141f MDL-39798 theme_bootstrapbase: Improve layout for course participation reports. 2013-06-08 13:59:15 +01:00
Gareth J Barnard
3355b72e3b MDL-40087 theme_bootstrapbase: Turn editing on button misaligned on nav bar. 2013-06-07 18:20:05 +01:00
Jason Fowler
41d6483066 MDL-39746 - Themes - Hiding the user picture on the forum page when the screensize is too small to allow for it 2013-06-07 14:35:08 +08:00
Sam Hemelryk
8bfd530bc1 MDL-39824 theme_bootstrapbase: converted $PAGE use to new $OUTPUT methods. 2013-06-07 17:32:44 +12:00
Mary Evans
f84ad1bb0a MDL-39338 core_question: Make history box a .well 2013-06-06 22:49:27 +01:00
Rossiani Wijaya
01a9646138 MDL-39773 bootstrapbase: add style for .centerpadded.
Relocate .centerpadded styling from standard to base themes
2013-06-05 12:43:56 +08:00
Dan Poltawski
c05660fc35 Merge branch 'MDL-39977' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-05 10:11:42 +08:00
Gareth J Barnard
321e7cb52d MDL-39820 theme_bootstrapbase: Fix form button alignment for badges. 2013-06-04 11:12:37 +01:00
Dan Poltawski
93ab081025 Merge branch 'wip-MDL-39819_master' of git://github.com/gjb2048/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-06-04 14:37:55 +08:00
Dan Poltawski
31e9ffe0ac MDL-39931 less: recompile with whitespace removed 2013-06-04 14:08:28 +08:00
Mary Evans
58183f9b01 MDL-39977 theme_bootstrapbase: Changes the way Clean theme's login takes its navbar styles from Bootstrapbase. 2013-06-01 18:42:09 +01:00
Gareth J Barnard
873dfb3608 MDL-39819 theme_bootstrapbase: Fix icon alignment in filepicker. 2013-05-31 22:30:26 +01:00
Mary Evans
947483327f MDL-39931 theme_bootstrapbase: ported invisiblefieldset css rules from theme/base/core.css to less/moodle/core.css 2013-05-30 15:26:13 +01:00
Eloy Lafuente (stronk7)
33b9fecd19 Merge branch 'wip-MDL-39836_master' of git://github.com/gjb2048/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-28 01:23:27 +02:00
Damyon Wiese
1833a3c449 Merge branch 'MDL-39680_master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-27 16:24:34 +08:00
Dan Poltawski
2226ac117b MDL-39806 theme_bootstrapbase: run less with --compress 2013-05-27 14:44:11 +08:00
Gareth J Barnard
af9c2dcf24 MDL-38856 theme_bootstrapbase: Inverse user name text unreadable on nav bar 2013-05-27 02:14:19 +01:00
Mary Evans
38c96b9545 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 14:07:36 +01:00
Mary Evans
7eff2edc96 MDL-39806 theme_bootstrapbase: Fix for coursesearchbox label alignment. 2013-05-25 16:47:52 +01:00
Jason Fowler
bfb1c6d4d2 MDL-39608 - Bootstrap - Chaning the thresholds and width values for the Form labels 2013-05-13 10:23:51 +08: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
Marina Glancy
8c288b261a MDL-38594 change course listing heading font size back to default 2013-05-08 15:14:56 +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
Marina Glancy
d891aaba73 MDL-39318 CSS bug on mouse hover of paging bar in some themes 2013-05-03 11:14:49 +10:00
David Scotson
9c2ec10b27 MDL-39388 bootstrapbase: Add bootstrap tab renderer
This adds a renderer that outputs standard bootstrap HTML for tabs,
deletes styles that were previously required to make Moodle tab HTML
superficially resemble Bootstrap, and tweak the responsive code that
makes tabs stack on phones to account for the change too.
2013-05-02 15:59:53 +01:00
Damyon Wiese
f85fba3eeb Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-02 13:54:59 +08:00
Andrew Nicols
323aa3248c MDL-39355: Correct the z-index for moodle-dialogue 2013-05-01 18:34:04 +01:00
Damyon Wiese
a6b274b232 Merge branch 'wip-MDL-39312-m25' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-01 10:04:50 +08:00
Sam Hemelryk
fdba83df89 Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle 2013-05-01 10:24:13 +12:00