205577718b
Merge branch 'MDL-56691-master' of git://github.com/damyon/moodle
2016-11-03 08:22:25 +08:00
867dc76f64
MDL-56582 boost: add some misisng template context
2016-11-02 13:55:05 +00:00
c624351e97
Merge branch 'MDL-56582-master' of https://github.com/xow/moodle
2016-11-02 13:49:50 +00:00
ebdd54f476
MDL-56161 boost: fix confict resolution mistake
2016-11-02 10:20:34 +00:00
e5c726353f
MDL-56161 boost: add missing example context
2016-11-02 10:14:00 +00:00
540b01b60d
Merge branch 'MDL-56161-master' of git://github.com/damyon/moodle
2016-11-02 09:36:09 +00:00
25b0727e50
Merge branch 'MDL-56433-master' of git://github.com/damyon/moodle
2016-11-02 09:33:28 +00:00
a053229f0f
MDL-56690 theme_boost: Allow menus to scroll in the header
...
The header is fixed - so if menus in the header are longer than the page, you can't scroll
to the bottom of the menu. This sets max height on the menus to the viewport height - the navbar height and sets them to scroll
auto.
2016-11-02 15:48:49 +08:00
d8cfd61145
MDL-56582 theme_boost: Insert a proxy div for settings menu
...
This forces text in the page to wrap around the settings cog. Also
notifications background color goes underneath the div for the
settings cog - so we give it a background color.
2016-11-02 15:40:17 +08:00
a5d4b54890
MDL-56698 mod_feedback: Make it look ok in boost
2016-11-02 15:25:18 +08:00
cf0450185e
Merge branch 'wip_MDL-55913_master' of git://github.com/gjb2048/moodle
2016-11-02 12:41:48 +08:00
6055809311
Merge branch 'MDL-56469-M32' of git://github.com/lazydaisy/moodle
2016-11-02 11:31:32 +08:00
6ec7fb8dc1
MDL-56691 theme_boost: Fix height of nav drawer
...
It should not be more than the height of the page or you can't scroll to the
last item in the list.
2016-11-02 10:17:41 +08:00
2f8b51f4b7
Merge branch 'MDL-56296-master' of git://github.com/damyon/moodle
2016-11-02 09:57:45 +08:00
f5d9072e51
Merge branch 'MDL-56462-master' of git://github.com/damyon/moodle
2016-11-02 09:14:09 +08:00
9e2f13125a
MDL-56161 boost: alignment static form elements
...
Wrap the HTML from a static form element with "form-control-static" to apply correct padding.
Also use a span, not a label for unlabelable static form elements.
2016-11-02 09:06:12 +08:00
20fd5e538c
Merge branch 'MDL-56530-master' of git://github.com/andrewnicols/moodle
2016-11-01 21:21:22 +00:00
b9703b8e05
Merge branch 'MDL-56621-master' of git://github.com/damyon/moodle
2016-11-01 21:20:53 +00:00
9f02188575
Merge branch 'MDL-56587-master' of git://github.com/cameron1729/moodle
2016-11-01 11:35:36 +00:00
9bf205fb73
Merge branch 'MDL-55732-master' of git://github.com/damyon/moodle
2016-11-01 09:47:11 +00:00
e0d5d8caed
Merge branch 'MDL-56651-master' of git://github.com/lameze/moodle
2016-11-01 09:10:08 +00:00
757f42cb15
MDL-56587 theme_boost: Align header items
...
Remove chunks of conflicting CSS added in various places and add navbar-nav -> nav-link to header items.
2016-11-01 11:36:08 +08:00
839b391f74
MDL-56489 Lib: force_settings_menu added to pagelib.
...
This introduces a flag to force the settings menu
to be displayed on the page if the theme uses a settings
menu. This is for use by activities and resources.
2016-11-01 10:00:12 +08:00
0051b08560
MDL-56651 core_role: add styling to submit buttons
2016-11-01 09:40:53 +08:00
2fd11f3516
Merge branch 'MDL-56188-master' of git://github.com/damyon/moodle
2016-10-31 19:59:21 +01:00
de1af8a6ed
MDL-56588 theme_boost: Nice wrapping text in flat nav
...
When section titles were too long they did not wrap nicely.
2016-10-31 18:24:43 +00:00
c40a53775f
Merge branch 'MDL-55799-master' of git://github.com/lameze/moodle
2016-10-31 17:23:11 +01:00
358105b309
Merge branch 'MDL-56155-master' of git://github.com/lameze/moodle
2016-10-31 17:11:21 +01:00
9e972b3da4
Merge branch 'MDL-56627-master' of git://github.com/damyon/moodle
2016-10-31 15:54:22 +00:00
a9f119efd6
Merge branch 'wip-MDL-56633-master' of https://github.com/marinaglancy/moodle
2016-10-31 15:36:21 +00:00
6795b0a0c7
Merge branch 'MDL-56580-master' of git://github.com/junpataleta/moodle
2016-10-31 15:20:45 +00:00
f2263f7c06
Merge branch 'MDL-56542-master-enfix' of git://github.com/mudrd8mz/moodle
2016-10-31 15:15:09 +00:00
5ad34c43f6
Merge branch 'MDL-56597-master' of git://github.com/damyon/moodle
2016-10-31 15:10:02 +00:00
0e86392133
Merge branch 'MDL-56578-master' of git://github.com/damyon/moodle
2016-10-31 15:04:55 +00:00
155b0bc0b9
MDL-56578 theme_boost: Dismiss help popovers on next click
2016-10-31 22:01:19 +08:00
2259c0f078
MDL-56621 templates: Add missing example contexts
2016-10-31 21:27:52 +08:00
b0f7a97c42
Merge branch 'MDL-56610-master' of git://github.com/damyon/moodle
2016-10-31 10:20:08 +00:00
f7614c6007
Merge branch 'MDL-56523-master' of git://github.com/lazydaisy/moodle
2016-10-31 10:19:13 +00:00
703863ce82
Merge branch 'MDL-56599-master' of git://github.com/damyon/moodle
2016-10-31 09:57:03 +00:00
75de2e6199
Merge branch 'MDL-56631-master' of git://github.com/damyon/moodle
2016-10-31 09:10:06 +00:00
a2d9a89f5a
MDL-56149 permissions: Alignment of icons should not wrap
...
/admin/roles/permissions.php?contextid=2 the icons should not wrap.
2016-10-31 16:24:11 +08:00
6fb8a7ab7e
MDL-56621 forms: Hide format menu if only one
...
This was a regression in the new templates for editors.
2016-10-31 15:06:50 +08:00
ad785e699e
MDL-56631 passwordunmask: Admin setting for password unmask not working
...
Andrew refactored the way it rendered the element, but did not update all the
templates (there is mforms element AND admin settings element).
See 3778a9226f
2016-10-31 14:45:07 +08:00
de32120676
Merge branch 'MDL-56577-master' of git://github.com/junpataleta/moodle
2016-10-31 14:02:27 +08:00
6af2ccda91
MDL-56577 core_form: Let other option attrs to be set in select elements
2016-10-31 12:19:21 +08:00
43dadab50b
Merge branch 'MDL-56078-master' of git://github.com/damyon/moodle
2016-10-31 09:30:15 +08:00
c05be214aa
MDL-56633 theme_boost: activity label should not be centered
2016-10-28 15:20:47 +08:00
fd5797aa3b
MDL-55799 inplace_editable: add form-control class to fields
2016-10-28 15:04:54 +08:00
823ae9f062
MDL-56155 theme_boost: fix wrong padding on inline field help text
...
Thanks John Okely!
2016-10-28 14:45:28 +08:00
4821f45961
MDL-56188 theme_boost: Better alignment for form fields help
2016-10-28 14:40:00 +08:00
David Monllao