MDL-43822 theme_bootstrapbase: blocks less tidied and reorganised

theme/base/style/blocks.css

@@ -14,7 +14,6 @@
 .block .content .list .c0 {display:inline;}
 .block .content .list .c1 {margin-left:5px;display:inline;}
 .block .footer {margin-bottom: 4px;}
-.block .blockannotation {font-size:0.75em;margin: -1em 0 1em;}
 .block_navigation .block_tree li {overflow:hidden;}
 .block_calendar_upcoming .footer { margin-top: .5em; }
 

theme/bootstrapbase/less/moodle/blocks.less

@@ -1,145 +1,161 @@
+// General block styles.
 .block {
     .well;
     padding: 8px 0;
-}
 
-.block .header .title h2,
+    .header {
-.block h3 {
+        h2 {
             .nav-header;
             font-size: 1.1em;
-}
+            word-wrap: break-word;
-
+            margin: 0;
-.block .header .title .commands,
+        }
-.block_adminblock .content,
+        .block_action {
-.block .footer {
+            padding: 3px 15px;
-    display: block;
-    padding: 3px 5px;
-}
-.block .header .block_action {
-    padding:4px;
             float: right;
-}
+            > * {
-.block .header .commands {
+                margin-left:3px;
+            }
+            .block-hider-show,
+            .block-hider-hide {
+                cursor: pointer;
+            }
+            .block-hider-show {
+                display: none;
+            }
+        }
+        .commands {
             clear: both;
             text-align: right;
-}
+            display: block;
-.block .header .commands > a {
+            padding: 3px 15px;
+
+            > a {
                 margin: 0 3px;
-}
+            }
-.block .header .commands .icon img {
+            .icon img {
                 width: 12px;
                 height: 12px;
-}
+            }
-
+            img.actionmenu {
-.block .header .commands img.actionmenu {
                 width:auto;
-}
+            }
-
+        }
-.block {
-    .header h2 {
-        word-wrap: break-word;
-        padding: .2em 0 0 .2em;
-        margin: 0;
     }
     .content {
         padding: 4px 14px;
         word-wrap: break-word;
+
+        h3 {
+            .nav-header;
+            font-size: 1.1em;
+        }
         hr {
             margin: 5px 0;
         }
+        .userpicture {
+            width: 16px;
+            height: 16px;
+            margin-right: 6px;
+        }
+        .list {
+            li.listentry {
+                clear: both;
+            }
+            .c0 {
+                display: inline;
+            }
+            .c1 {
+                margin-left: 5px;
+                display: inline;
+            }
+        }
+    }
+    .footer {
+        margin-bottom: 4px;
+        display: block;
+        padding: 3px 5px;
+    }
+    &.beingmoved {
+        border-width: 2px;
+        border-style: dashed;
+    }
+    &.invisible {
+        .opacity(50);
+    }
+
+    &.hidden .header .block_action {
+        .block-hider-hide {
+            display: none;
+        }
+        .block-hider-show {
+            display: inline;
+        }
+    }
+    &.list_block .unlist > li > .column {
+        display: inline-block;
+        .ie7-inline-block();
     }
 }
 
+// Hide the block content when the block has been minimised.
 .jsenabled .block.hidden .content {
     display: none;
 }
 
-.block .content .userpicture {
+// Style the div used as a move target for non-drag+drop block moves.
-    width: 16px;
+.blockmovetarget {
-    height: 16px;
-    margin-right: 6px;
-}
-.block .content .list li.listentry {
-    clear: both;
-}
-.block .content .list .c0 {
-    display: inline;
-}
-.block .content .list .c1 {
-    margin-left: 5px;
-    display: inline;
-}
-
-.block .footer {
-    margin-bottom: 4px;
-}
-
-.block .blockannotation {
-    font-size: 0.75em;
-    margin: -1em 0 1em;
-}
-
-.block.list_block .unlist > li > .column {
-    display: inline-block;
-    .ie7-inline-block();
-}
-
-.blockmovetarget,
-.block.beingmoved {
     border-width: 2px;
     border-style: dashed;
-}
-.blockmovetarget {
     display: block;
     height: 1em;
-    margin-bottom: 1em;
+    margin-bottom: 20px;
 }
 
-.block.invisible {
+// Style the div that contains the cancel link for moving a block with JS disabled.
-    .opacity(50);
+.blockannotation {
+    // Blocks have a bottom margin of 20px, to associate this link with the block being moved
+    // we move it up 10px, and then give it a bottom margin of 10px giving it a better visual association
+    position: relative;
+    top: -10px;
+    margin-bottom: 10px;
 }
 
-.block .block-hider-show,
+// Styles for the blog menu block.
-.block .block-hider-hide {
+.block_blog_menu #blogsearchquery {
-    cursor: pointer;
+    max-width: 92%;
-    padding-right: 5px;
-    padding-left: 5px;
-}
-.block .block-hider-show,
-.block.hidden .block-hider-hide {
-    display: none;
-}
-.block.hidden .block-hider-show {
-    display: inline;
 }
 
-.block_calendar_upcoming {
+// Styles for the admin block.
-    .footer {
+.block_settings {
-        margin-top: .5em;
+    #adminsearchquery {
+        max-width: 92%;
     }
+}
+
+// Styles for the search forums block.
+.block_search_forums {
+    #searchform_search {
+        width: auto;
+        max-width: 92%;
+    }
+}
+
+// Styles for the Calendar Upcoming block.
+.block_calendar_upcoming {
     .content {
         .date {
             padding-left: 22px;
         }
         .footer {
+            margin-top: .5em;
             padding-top: 10px;
             padding-left: 0px;
         }
     }
 }
 
-#adminsearchquery,
+// Styles for the RSS client block.
-#blogsearchquery,
-#searchform_search,
-.block_adminblock select {
-    max-width: 92%;
-}
-.block_adminblock .singleselect {
-    display: block;
-}
-#searchform_search {
-    width: auto;
-}
 .block_rss_client {
     .content li {
         margin-bottom: 10px;
@@ -155,6 +171,7 @@
     }
 }
 
+// Styles for the news items block.
 .block_news_items .content {
     .newlink {
         padding-bottom: 10px;
@@ -199,18 +216,41 @@
     }
 }
 
-// Overide for RTL layout.
+// Styles for the special "Add block" block shown while editing.
+.block_adminblock {
+    .content {
+        display: block;
+        padding: 3px 5px;
+    }
+    select {
+        max-width: 92%;
+    }
+}
+
+// RTL styles for blocks.
 .dir-rtl {
-    .block .header,
+
-    .block h2.header {
+    // RTL styles for blocks in general.
+    .block {
+        .header {
+            text-align:right;
+            h2 {
                 text-align:right;
             }
-    .block .header .commands {
+            .commands {
                 text-align: left;
+                > * {
+                    margin-left:0;
+                    margin-right:3px;
                 }
-    .block .header .block_action {
+            }
+            .block_action {
                 float: left;
             }
+        }
+    }
+
+    // LTR styles for the calendar upcoming block.
     .block_calendar_upcoming {
         .content {
             .date {
@@ -221,6 +261,8 @@
             }
         }
     }
+
+    // RTL styles for the news items block.
     .block_news_items .content {
         ul li {
             .name {