Merge branch 'MDL-48243_master' of git://github.com/lazydaisy/moodle

Conflicts: theme/bootstrapbase/style/moodle.css
2025-01-18 05:58:34 +01:00 · 2014-12-17 11:48:42 +08:00 · 2014-12-17 11:48:42 +08:00 · ceb7769a29
commit ceb7769a29
parent a646812d1b d0508fdc09
2 changed files with 11 additions and 11 deletions
--- a/theme/bootstrapbase/less/moodle/blocks.less
+++ b/theme/bootstrapbase/less/moodle/blocks.less
@ -38,7 +38,7 @@
                height: 12px;
            }
            img.actionmenu {
-                width:auto;
+                width: auto;
            }
        }
    }
@ -233,19 +233,19 @@
    // RTL styles for blocks in general.
    .block {
        .header {
-            text-align:right;
+            text-align: right;
            h2 {
-                text-align:right;
-            }
-            .commands {
-                text-align: left;
-                > * {
-                    margin-left:0;
-                    margin-right:3px;
-                }
+                text-align: right;
            }
            .block_action {
                float: left;
+                > * {
+                    margin-left: 0;
+                    margin-right: 3px;
+                }
+            }
+            .commands {
+                text-align: left;
            }
        }
    }
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css