Commit graph

1491 commits

Author SHA1 Message Date
Andrew Nicols
583278f070 Merge branch 'MDL-56703-master' of git://github.com/damyon/moodle 2016-11-16 10:16:09 +08:00
Damyon Wiese
cee482ca4e MDL-56703 boost: Fix mustache html warnings
Don't put div in a span
2016-11-16 10:01:19 +08:00
Damyon Wiese
7a9309f32e MDL-56703 boost: Escaping bug in flat nav and navbar
The items in the flat navigation were double escaped. Also added
context to template.
2016-11-16 10:01:11 +08:00
Andrew Nicols
4642a8c593 Merge branch 'MDL-56193-master' of git://github.com/damyon/moodle 2016-11-16 09:52:55 +08:00
Damyon Wiese
4682f17c49 MDL-56967 boost: Fix for layout problem with IE11 2016-11-16 09:36:38 +08:00
Dan Poltawski
1efacd2b35 MDL-56767 block_login: add bootstrap markup
Remove existing overrides forcing the markup off
2016-11-15 15:44:09 +00:00
Dan Poltawski
e44bd69aaa MDL-56939 theme_boost: Link to MDL for future 2016-11-15 14:31:45 +00:00
Dan Poltawski
dad0b3bfeb Merge branch 'MDL-56939-master' of git://github.com/damyon/moodle 2016-11-15 14:29:35 +00:00
Jake Dallimore
5cfaecac47 MDL-56931 themes: restrict extra padding to edit mode only 2016-11-15 09:29:57 +00:00
David Monllao
396edc0a5e Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle 2016-11-15 09:07:42 +00:00
Damyon Wiese
998432c2c9 MDL-56724 mod_choice: Improve alignment and checkboxes on dates 2016-11-15 09:07:42 +00:00
David Monllao
04fbba050d Merge branch 'MDL-56690-master' of git://github.com/damyon/moodle 2016-11-15 09:07:40 +00:00
Andrew Nicols
ebba556af7 Merge branch 'MDL-56844-master' of git://github.com/damyon/moodle 2016-11-15 09:07:38 +00:00
Eloy Lafuente (stronk7)
7a677348e4 Merge branch 'MDL-56724-master' of git://github.com/damyon/moodle 2016-11-15 09:07:34 +00:00
Eloy Lafuente (stronk7)
2589802489 Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle 2016-11-15 09:07:33 +00:00
David Monllao
39e7d46d89 Merge branch 'MDL-56834-master-fix1' of http://github.com/damyon/moodle 2016-11-15 09:07:32 +00:00
Andrew Nicols
2fd423721f Merge branch 'MDL-56846-master' of git://github.com/damyon/moodle 2016-11-15 09:07:31 +00:00
Dan Poltawski
d82aa0a2d9 MDL-56910 filepicker: fix eranously removed styles
No idea what happened to my testing of this change, but it was wrong.
2016-11-15 08:27:03 +00:00
Damyon Wiese
fcd412470a MDL-56939 boost: Fix for bootstrap select reset
Bootstrap makes select form elements not using custom-select broken when
they have a size. The contents overflow the field.
2016-11-15 15:41:19 +08:00
Damyon Wiese
d9a1d6834c MDL-56193 theme_boost: Make the enrol users modal wider 2016-11-15 15:12:19 +08:00
Damyon Wiese
ae9bbd9847 MDL-56193 enrol_manual: Bootstrap styles for assign roles
Use a bootstrap popover for the assign roles form.
2016-11-15 11:29:49 +08:00
Damyon Wiese
f10ae4676d MDL-56193 enrol: Modernise the enrol users popup
This just injects bootstrap classes into the old yui2 thing. It needs
rewriting.
2016-11-15 11:29:18 +08:00
Damyon Wiese
f25185d7b0 MDL-56844 scorm: Review styles in boost theme
The main change is that in boost we get rid of the random centered text.
To compensate we use "container" which is fixed with with auto margins -
but the text is still left aligned.
2016-11-15 11:19:33 +08:00
Eloy Lafuente (stronk7)
de7e277e1f Merge branch 'MDL-56724-master' of git://github.com/damyon/moodle 2016-11-15 02:17:10 +01:00
Eloy Lafuente (stronk7)
852264ad23 Merge branch 'MDL-56910-master' of git://github.com/danpoltawski/moodle 2016-11-15 02:13:40 +01:00
David Monllao
4b96878ab6 Merge branch 'MDL-56834-master-fix1' of http://github.com/damyon/moodle 2016-11-15 08:52:34 +08:00
Andrew Nicols
181b5922ce Merge branch 'MDL-56846-master' of git://github.com/damyon/moodle 2016-11-15 08:05:54 +08:00
Dan Poltawski
f6dabb3194 MDL-56910 filepicker: give button BS styling 2016-11-14 15:46:49 +00:00
Dan Poltawski
0b96b9c5c2 Merge branch 'MDL-56618-master' of git://github.com/damyon/moodle 2016-11-14 12:38:32 +00:00
Eloy Lafuente (stronk7)
2dcb3746b0 Merge branch 'MDL-56794-master' of git://github.com/damyon/moodle 2016-11-14 12:28:29 +01:00
Dan Poltawski
e7bba8ce4d Merge branch 'MDL-56719-master' of git://github.com/damyon/moodle 2016-11-14 11:06:22 +00:00
Dan Poltawski
ed81eab309 Merge branch 'MDL-56935-master' of git://github.com/junpataleta/moodle 2016-11-14 10:49:23 +00:00
Dan Poltawski
51d9431e48 Merge branch 'MDL-56931-master' of https://github.com/snake/moodle 2016-11-14 10:03:48 +00:00
Damyon Wiese
cf199b4448 MDL-56834 boost: Be cautious about nodes in the navbar
Some pages (fresh install) don't have the navbar yet, so check for null.
2016-11-14 17:18:29 +08:00
David Monllao
337b723b07 Merge branch 'MDL-56803-master' of git://github.com/damyon/moodle 2016-11-14 16:25:43 +08:00
Damyon Wiese
f93bdccab7 MDL-56803 boost: hide region-main settings menu on 1 col layouts 2016-11-14 16:02:55 +08:00
Andrew Nicols
125bd58ff9 Merge branch 'MDL-56657-master' of git://github.com/damyon/moodle 2016-11-14 15:46:31 +08:00
Damyon Wiese
2f3f8e45da MDL-56657 admin: Style all admin/role pages for boost 2016-11-14 15:11:15 +08:00
Damyon Wiese
f619064b9b MDL-56719 boost: Style mod_chat for boost
I stayed away from big markup changes. This is a table layout so needs rewriting which is a big job.
2016-11-14 15:08:57 +08:00
Andrew Nicols
cfade93cb8 Merge branch 'MDL-56785-master' of git://github.com/lameze/moodle 2016-11-14 15:06:40 +08:00
Damyon Wiese
fe3db0ca08 MDL-56618 theme_boost: Fix backup / restore pages (again)
I removed most of the layout styles and started again.
2016-11-14 15:00:46 +08:00
Andrew Nicols
8f3a295c6e Merge branch 'MDL-56242-master' of git://github.com/damyon/moodle 2016-11-14 14:07:36 +08:00
David Monllao
9444636cb8 Merge branch 'MDL-56834-master' of git://github.com/damyon/moodle 2016-11-14 14:00:45 +08:00
Andrew Nicols
49ae3661d3 Merge branch 'MDL-56769-master' of git://github.com/damyon/moodle 2016-11-14 13:38:00 +08:00
Jun Pataleta
cf2bc26911 MDL-56935 theme_boost: Fix double escaping of navbar items 2016-11-14 13:35:26 +08:00
Damyon Wiese
c1ae9079db MDL-56187 theme_boost: Atto fields styling for validation errors 2016-11-14 13:13:46 +08:00
Jake Dallimore
7135bbb188 MDL-56931 themes: fix for module edit menu on course home
Increased bottom padding to allow space for the lower edit menus to be
displayed without a vertical scrollbar.
2016-11-14 11:52:00 +08:00
Damyon Wiese
eaf45bce09 MDL-56724 boost: Update mod_choice to use bootstrap classes for styles 2016-11-14 11:37:45 +08:00
Damyon Wiese
7d41ccf0fb MDL-56794 boost: Styling for forum module 2016-11-14 11:30:17 +08:00
Damyon Wiese
f2405a5f5c MDL-56242 theme_boost: Fix styling for confirm boxes (js and in page)
They should be left aligned with a header, content and footer (right aligned with the buttons).

There should be a primary continue button and a secondary cancel button.
2016-11-14 11:11:28 +08:00