MDL-40205 theme: fixed overflow of block headers

Conflicts: theme/bootstrapbase/style/moodle.css
moodle · Jan 13, 2014 · 53f2e7a · 53f2e7a
1 parent 0dc14c0
commit 53f2e7a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/theme/base/style/blocks.css b/theme/base/style/blocks.css
@@ -1,5 +1,5 @@
 .block {border:1px solid;margin-bottom:1em;}
-.block .header h2 { padding: .2em 0 0 .2em; margin: 0;}
+.block .header h2 { padding: .2em 0 0 .2em; margin: 0;word-wrap: break-word;}
 .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;}

diff --git a/theme/bootstrapbase/less/moodle/blocks.less b/theme/bootstrapbase/less/moodle/blocks.less
@@ -3,10 +3,6 @@
     padding: 8px 0;
 }
 
-.block .header h2 {
-    padding: .2em 0 0 .2em;
-    margin: 0;
-}
 .block .header .title h2,
 .block h3.main {
   .nav-header;
@@ -34,6 +30,11 @@
     height: 12px;
 }
 .block {
+    .header h2 {
+        word-wrap: break-word;
+        padding: .2em 0 0 .2em;
+        margin: 0;
+    }
     .content {
         padding: 4px 14px;
         word-wrap: break-word;

diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css