mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-48199-master' of git://github.com/lazydaisy/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2014-11-17 16:42:34 +00:00
commit 34a0b00d4a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
theme/bootstrapbase/less/moodle/dock.less
View File

@ -20,6 +20,7 @@
body.has_dock {
#page {
padding-left: (@dockWidth + (@dockTitleMargin * 3));
padding-right: @gridGutterWidth;
}
div#dock {
display: inline;
@ -135,7 +136,7 @@ body.has_dock {
.dir-rtl {
&.has_dock #page {
padding-left: 0;
padding-left: @gridGutterWidth;
padding-right: (@dockWidth + (@dockTitleMargin * 3));
}
#dock {

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long