mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-48246-M29' of git://github.com/lazydaisy/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk 2014-11-25 10:52:42 +13:00
commit 406712e989
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
theme/base/style/dock.css
View File

@ -30,7 +30,7 @@ body.has_dock {margin-left:30px;}
#dockeditempanel .dockeditempanel_hd .commands > span { margin:0 3px; }
#dockeditempanel .dockeditempanel_hd .commands img,
#dockeditempanel .dockeditempanel_hd .commands input {vertical-align:middle; width: 12px; height: 12px;}
#dockeditempanel .dockeditempanel_hd .commands .hidepanemicon img { cursor:pointer; }
#dockeditempanel .dockeditempanel_hd .commands .hidepanelicon img { cursor:pointer; }
/** IE 6 doesn't support fixed pos elements **/
.ie6 #dockeditempanel {position:absolute;}

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

@ -124,7 +124,7 @@ body.has_dock {
vertical-align: middle;
margin-right: 1px;
}
.hidepanemicon img {
.hidepanelicon img {
cursor: pointer;
}
img.actionmenu {

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

File diff suppressed because one or more lines are too long