Damyon Wiese
dcd02d8b0e
Merge branch 'MDL-40975-master-fixes' of git://github.com/andrewnicols/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-11-06 16:42:11 +08:00
Andrew Nicols
13a73a16f2
MDL-40975 Theme: Remove activity padding properly when editor displayed for RTL
2013-11-06 16:20:00 +08:00
Andrew Nicols
5609c6321d
MDL-40975 Course: Make the edit title instructinos position with mod-indent
2013-11-06 16:20:00 +08:00
Damyon Wiese
30e736cfba
Merge branch '42740-26' of git://github.com/samhemelryk/moodle
2013-11-06 16:07:44 +08:00
Andrew Nicols
685addbd1f
MDL-40975 Theme: Increase section settings cog back to 16px
2013-11-06 16:06:59 +08:00
Andrew Nicols
868575ec2c
MDL-40975 Course: Make spinner consistent across themes
2013-11-06 16:06:48 +08:00
Damyon Wiese
2c366f45ca
Merge branch 'MDL-42624-master' of git://github.com/mouneyrac/moodle
2013-11-06 16:00:33 +08:00
Sam Hemelryk
02ee8997b5
MDL-42740 theme_anomaly: fixed block editing actions.
2013-11-06 15:50:16 +08:00
Damyon Wiese
496422e34c
Merge branch '40975-26-r1' of git://github.com/samhemelryk/moodle
2013-11-06 15:37:29 +08:00
Sam Hemelryk
61ac7f01b2
MDL-40975 theme_afterburner: fixed up actionmenu CSS
2013-11-06 15:30:38 +08:00
Andrew Nicols
052dd0490f
MDL-40975 Theme: Fix white line over links in Bootstrap with FF
2013-11-06 14:45:08 +08:00
Andrew Nicols
29afe143c1
MDL-40975 Theme: Set the colour for actionmenu carets appropriately
2013-11-06 14:37:05 +08:00
rwijaya
b890be680d
MDL-42628: fix RTL for course management
2013-11-06 14:12:24 +08:00
Damyon Wiese
951b414b65
Merge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-11-06 13:06:01 +08:00
Andrew Nicols
1e5620a62b
MDL-40975 Theme: Rebuild of bootstrap css
2013-11-06 11:41:01 +08:00
Andrew Nicols
f5b33487fc
MDL-40975 ActionMenu: Adjust how actionmenu is displayed for course management
2013-11-06 11:41:00 +08:00
Andrew Nicols
7f4f7081f0
MDL-40975 Theme: Change the actionmenu icons back to 12px
2013-11-06 11:40:59 +08:00
Andrew Nicols
21231f4d76
MDL-40975 ActionMenu: Convert text-based icon to the caret style
2013-11-06 11:40:59 +08:00
Barbara Ramiro
13273e51a8
MDL-42564 ActionMenu: Replace actionmenu icon with new style
2013-11-06 11:40:58 +08:00
Andrew Nicols
d28aeeddc0
MDL-40975 Theme: Dim the modicon when an activity is disabled
2013-11-06 11:40:57 +08:00
Andrew Nicols
8d90aec2aa
MDL-40975 Course: Make the completion tracking look the same as other icons when editing
2013-11-06 11:40:57 +08:00
Andrew Nicols
26dd99d292
MDL-40975 Course: Move all editing icons to the end of the line
2013-11-06 11:40:56 +08:00
Andrew Nicols
9ac099a1c1
MDL-40975 ActionMenu: Add support for fillers in primary menus
...
This is required to maintain horizontal alignment of primary menus in rows.
2013-11-06 11:40:56 +08:00
Andrew Nicols
405266165a
MDL-40975 Course: Tidy up icon spacings
2013-11-06 11:40:55 +08:00
Andrew Nicols
fc4e9e13bc
MDL-40975 ActionMenu: Adjust icon placement for text menus
2013-11-06 11:40:54 +08:00
Andrew Nicols
8ecabb95cd
MDL-40975 Course: Adjust vertical alignment for text menu
2013-11-06 11:40:53 +08:00
Andrew Nicols
bc80ea017c
MDL-40975 Course: Add back JavaScript drag/drop for bootstrap on mobile
2013-11-06 11:40:52 +08:00
Andrew Nicols
81dc079654
MDL-40975 Course: Hide commands when editing titles
2013-11-06 11:40:51 +08:00
Andrew Nicols
3072040cff
MDL-40975 JavaScript: Standardise the location of the activity spinner
2013-11-06 11:40:51 +08:00
Andrew Nicols
9797becd71
MDL-40975 ActionMenu: Remove background color when menu is active
2013-11-06 11:40:50 +08:00
Andrew Nicols
4657ba81d2
MDL-40975 Course: Move drag/drop to start of the line
2013-11-06 11:40:50 +08:00
Andrew Nicols
a83d83e42b
MDL-40975 Course: Change which actions are in the menu and which are outside it
2013-11-06 11:40:49 +08:00
Andrew Nicols
8ef1aa40d1
MDL-40975 Theme: Standardise size of icons in headings
2013-11-06 10:59:26 +08:00
Andrew Nicols
69a3457fe9
MDL-40975 Theme: Tidy up block icons to line up in columns
2013-11-06 10:59:26 +08:00
Sam Hemelryk
05bce411cb
MDL-42719 course: management view mode wrap fixed
2013-11-05 21:52:45 +08:00
Damyon Wiese
9e16402727
Merge branch '42629-26' of git://github.com/samhemelryk/moodle
...
Conflicts:
course/classes/management_renderer.php
2013-11-05 14:04:08 +08:00
Sam Hemelryk
38a15200b9
MDL-42629 course: management peer-review alterations
...
* Added confirmation when bulk moving courses.
* Increased min-width of category course count to allow for 3 digits.
* Fixed sub-category => subcategory
* Renamed console JS vars to managementconsole
* Added typeof operator
* Renamed oldcatcourses and newcatcourses as suggested
* Added a span around course count and interacted with that.
* Fixed icon sizing
* Fixed management behat tests
* Fixed wrapping of strings in menus
2013-11-05 13:57:01 +08:00
Sam Hemelryk
c7a2291f8b
MDL-42629 course: management resorting improvements
2013-11-05 09:49:20 +08:00
Sam Hemelryk
f8ddf782dd
MDL-42629 course: tweaks CSS for management interface
...
* Removed grey background from checkboxes and bulk actions.
* Removed blue colouring on subheadings.
* Changed greys to the clean theme greys
2013-11-05 09:49:13 +08:00
Eloy Lafuente (stronk7)
f39c82ebed
MDL-42701 Bump all versions near 2.6 release
2013-11-05 02:36:00 +01:00
Dan Poltawski
2c7b23a239
Merge branch 'MDL-42453_master' of git://github.com/lazydaisy/moodle
2013-11-04 22:17:19 +08:00
rwijaya
4bbacb8607
MDL-42147 filepicker: fixed dialog box css issue on IE9.
...
This patch fix the following issue repository icon size, dialog title bar background color and rounded corner for dialog box.
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-11-04 16:06:21 +08:00
Jerome Mouneyrac
6e2bf857c6
MDL-42624 Clean theme: dialog should be displayed above the header for user experience purpose
2013-11-04 15:49:48 +08:00
Dan Poltawski
32bf2cfc64
MDL-42111 fix trailing whitespace
2013-11-04 15:35:19 +08:00
Dan Poltawski
466fa368b5
Merge branch 'MDL-42111' of git://github.com/rwijaya/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-11-04 15:32:34 +08:00
Damyon Wiese
6178bb2091
Merge branch 'MDL-40722-master' of git://github.com/andrewnicols/moodle
2013-11-04 11:33:04 +08:00
Jerome Mouneyrac
7c2efc115c
MDL-40874 Retire MyMobile as a standard theme
2013-11-04 14:18:41 +11:00
Sam Hemelryk
ae3fd8eb76
MDL-42452 block: action menu is now constrained to the block container
2013-11-03 16:42:40 +08:00
Dan Poltawski
e9b7148ba7
Merge branch 'MDL-42589-master' of git://github.com/damyon/moodle
2013-11-01 08:55:32 +08:00
Damyon Wiese
4562fdc240
MDL-42589: Fix file picker display in ie9/ie10
...
CSS change to fix blank file picker bug in IE.
2013-11-01 08:55:32 +08:00