Andrew Nicols
8a668f75a8
Merge branch 'MDL-56989-master' of git://github.com/danpoltawski/moodle
2016-11-18 07:55:42 +08:00
Andrew Nicols
3e5a1d8029
Merge branch 'MDL-57004-master' of git://github.com/ankitagarwal/moodle
2016-11-18 07:27:15 +08:00
Dan Poltawski
099a2aee68
Merge branch 'MDL-56959-master' of git://github.com/FMCorz/moodle
2016-11-17 18:01:58 +00:00
Ankit Agarwal
40e24fda5b
MDL-57004: boost: Show action menu on section pages
2016-11-17 16:31:50 +05:30
David Monllao
820a43510f
Merge branch 'MDL-56763-master' of git://github.com/lameze/moodle
2016-11-17 16:10:01 +08:00
Frederic Massart
41b973bcbb
MDL-56959 theme: SCSS file is inherited from parent
...
Also added support for the SCSS property to be a Closure
and return content rather than simply being the name of a file.
2016-11-17 15:18:29 +08:00
David Monllao
98f43f1b08
Merge branch 'MDL-56826-master' of git://github.com/damyon/moodle
2016-11-17 14:24:59 +08:00
Damyon Wiese
12d6dfc1ce
MDL-56826 questions: Add styling for boost theme
...
Changes include:
* question: Add bootstrap classes to buttons and selects so they look consistent.
* mod_quiz: Add bootstrap styles to report form elements
* question: Add bootstrap classes to question form elements
* And remove the success/fail styles from boost because they conflict badly
with the quiz plugin styles (making unreadable text).
* quiz: nav block buttons had black background
* quiz: Add bootstrap styles to quiz navigation buttons
* qtype_ddmarker: Remove bullets from list
Edit form coordinates preview had list bullets for each coordinate.
* boost: Prevent menu scrolling on quiz edit
* mod_quiz: Add bootstrap styles to edit quiz fields
Pagination and max grades forms.
* quiz: Undo some custom styles on review options
These checkboxes were laid out in a fake grid with no responsiveness
that conflicts with the bootstrap form-inline templates. Reset the
custom style to bootstrap default.
* quiz: Fix unit tests for boost changes
* qtype_ddwtos: Accurate positioning of drop targets
* questions: Make the review page responsive
* question: bootstrap 4 compatibility
.alert in bs4 contains no colours by default, you need to mix it with
one of the context classes to get some change in colours, borders etc.
2016-11-17 14:20:52 +08:00
Simey Lameze
25ca6f1638
MDL-56763 theme_boost: ignore boostrap popover rtl scss
...
Because Bootstrap Javascript does is not expecting to be flipped, it breaks the popover on RTL languages.
We already swap the directions on the help icon template so popover scss rules can be ignored.
2016-11-17 14:19:49 +08:00
David Monllao
29dfbb422f
Merge branch 'MDL-56842-master' of git://github.com/danpoltawski/moodle
2016-11-17 12:28:34 +08:00
Andrew Nicols
50e16a67ab
Merge branch 'MDL-56767-master' of git://github.com/danpoltawski/moodle
2016-11-17 10:07:35 +08:00
David Monllao
a813b0c3dc
Merge branch 'MDL-56999-master' of git://github.com/damyon/moodle
2016-11-17 09:31:07 +08:00
Eloy Lafuente (stronk7)
7b0057b895
Merge branch 'MDL-56922-master' of git://github.com/danpoltawski/moodle
2016-11-17 01:38:24 +01:00
Dan Poltawski
310808b778
MDL-56989 boost: fix template lint issues
...
1) Add example context where missing
2) Don't use an uncessary function in JS
2016-11-16 14:56:29 +00:00
Dan Poltawski
6eb6c5fd6d
MDL-56989 boost: don't double-escape page titles
2016-11-16 14:41:03 +00:00
Dan Poltawski
6182ec8901
MDL-56842 boost: add example context to login template
2016-11-16 13:59:47 +00:00
Dan Poltawski
16732d0631
MDL-56842 boost: load required js on login page
2016-11-16 13:59:47 +00:00
Dan Poltawski
3b195bfb81
MDL-56922 theme_boost: grey out activity icon when hidden
...
This was present in bootstrapbase and is I think an important visual
distinction.
2016-11-16 11:58:42 +00:00
Frederic Massart
6321934c73
MDL-56205 theme_boost: Adjust margin between icon and caret in dropdowns
2016-11-16 10:20:53 +00:00
Dan Poltawski
c1e74a0937
Merge branch 'MDL-56965-master' of git://github.com/ankitagarwal/moodle
2016-11-16 10:08:10 +00:00
Dan Poltawski
f882aed3b3
Merge branch 'wip-MDL-56776-master' of git://github.com/marinaglancy/moodle
2016-11-16 09:46:10 +00:00
Dan Poltawski
1bf9d6ac92
Merge branch 'MDL-56889-master' of git://github.com/danpoltawski/moodle
2016-11-16 09:20:28 +00:00
Dan Poltawski
706e012fd6
MDL-56889 boostrapbase: remove excessive stylelint-disables
...
From bs4-compat.less, replace with file level disable instead.
2016-11-16 08:50:14 +00:00
Simey Lameze
660b51e013
MDL-56889 bootstrapbase: create static bs4 compatible mixins
2016-11-16 08:50:08 +00:00
Marina Glancy
4125ce046b
MDL-56776 calendar: display month above the dates
...
month is displayed in table caption which is by default in the bottom in BS4
2016-11-16 15:46:56 +08:00
Andrew Nicols
7da7c1e24a
Merge branch 'wip-MDL-56603-master-v2' of git://github.com/abgreeve/moodle
2016-11-16 15:36:37 +08:00
Damyon Wiese
3eb9cc2f6e
MDL-56999 boost: Maintenance layout needs padding
2016-11-16 15:18:27 +08:00
Adrian Greeve
d3d0248afc
MDL-56603 message: Added see all link to message popup.
2016-11-16 14:51:17 +08:00
Adrian Greeve
8151761378
MDL-56603 messaging: Add a new message link to popup.
...
Added a link to create a new message from the message
popup menu.
2016-11-16 14:51:17 +08:00
Andrew Nicols
0064cb1193
Merge branch 'MDL-56967-master' of git://github.com/damyon/moodle
2016-11-16 14:05:07 +08:00
David Monllao
70d2c9fcf8
Merge branch 'MDL-56784-master' of git://github.com/cameron1729/moodle
2016-11-16 13:49:51 +08:00
David Monllao
12ebaf1c6b
Merge branch 'MDL-56187-master' of git://github.com/damyon/moodle
2016-11-16 13:35:38 +08:00
Cameron Ball
8712a50ec2
MDL-56784 theme_boost: Fix escaped markup in filemanager_fileselect
...
The markup in the filemanager_fileselect template was being escaped,
causing a help icon not to display.
Additionally, the popover for the help icon was not display since
"loader.js" was not properly delegating the popover calls.
2016-11-16 13:10:51 +08:00
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
Ankit Agarwal
0d02bb964b
MDL-56965 themes: Fix logo CSS for RTL
2016-11-15 15:20:36 +05:30
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