Merge branch 'MDL-48202-M30' of git://github.com/lazydaisy/moodle

theme/base/style/blocks.css

@@ -3,10 +3,6 @@
 .block .header .block_action {float:right;margin:4px 0 3px 0;vertical-align:top;}
 .block .header .block_action img,
 .block .header .block_action input {margin:0 3px; width: 12px; height: 12px;}
-.block .header .commands { text-align: right; clear: both;}
-.block .header .commands > a { margin:0 3px; }
-.block .header .commands .icon img {width:12px;height:12px;}
-.block .header .commands img.actionmenu {width:auto;}
 .block .content {padding:4px;}
 .jsenabled .block.hidden .content {display: none;}
 .block .content .userpicture {width:16px;height:16px;margin-right:6px;}
@@ -39,9 +35,29 @@
     min-height: 400px;
     overflow: hidden;
 }
+/** Block commands when editing  **/
+
+.editing .block .header .commands {
+    text-align: right;
+    clear: both;
+}
+.editing .block .header .commands > a {
+    margin: 0 3px;
+}
+.editing .block .header .commands .icon img {
+    width: 12px;
+    height: 12px;
+}
+.editing .block .header .commands img.actionmenu {
+    width: auto;
+}
 
 /** Overide for RTL layout **/
 .dir-rtl .block .header,
 .dir-rtl .block h2.header {text-align:right;}
-.dir-rtl .block .header .commands { text-align: left;}
 .dir-rtl .block .header .block_action { float: left; margin-left: 4px; margin-left: 0;}
+
+.dir-rtl.editing .block .header .commands {
+    text-align: left;
+}
+

theme/bootstrapbase/less/moodle/blocks.less

@@ -24,23 +24,6 @@
                 display: none;
             }
         }
-        .commands {
-            clear: both;
-            text-align: right;
-            display: block;
-            padding: 3px 15px;
-
-            > a {
-                margin: 0 3px;
-            }
-            .icon img {
-                width: 12px;
-                height: 12px;
-            }
-            img.actionmenu {
-                width: auto;
-            }
-        }
     }
     .content {
         padding: 4px 14px;
@@ -97,6 +80,40 @@
         .ie7-inline-block();
     }
 }
+.editing {
+    .block {
+        .header {
+            .commands {
+                clear: both;
+                text-align: right;
+                display: block;
+                padding: 3px 15px;
+
+                > a {
+                    margin: 0 3px;
+                }
+                .icon img {
+                    width: 12px;
+                    height: 12px;
+                }
+                img.actionmenu {
+                    width: auto;
+                }
+            }
+        }
+    }
+}
+.dir-rtl {
+    &.editing {
+        .block {
+            .header {
+                .commands {
+                    text-align: left;
+                }
+            }
+        }
+    }
+}
 
 // Hide the block content when the block has been minimised.
 .jsenabled .block.hidden .content {
@@ -244,9 +261,6 @@
                     margin-right: 3px;
                 }
             }
-            .commands {
-                text-align: left;
-            }
         }
     }