Merge branch 'MDL-48246-M28' of git://github.com/lazydaisy/moodle into MOODLE_28_STABLE

Conflicts: theme/bootstrapbase/style/moodle.css
2014-11-25 10:52:59 +13:00
parent 5a9e656628 ec1a6a6996
commit 222f015381
3 changed files with 3 additions and 3 deletions
@@ -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;}
@@ -124,7 +124,7 @@ body.has_dock {
                vertical-align: middle;
                margin-right: 1px;
            }
-            .hidepanemicon img {
+            .hidepanelicon img {
                cursor: pointer;
            }
            img.actionmenu {