Merge branch 'MDL-40705-25' of git://github.com/FMCorz/moodle into MOODLE_25_STABLE

Conflicts: theme/bootstrapbase/style/moodle.css
2014-01-13 09:36:35 +08:00
parent 60a188b9f3 f69ee87411
commit 0dc14c0b56
3 changed files with 14 additions and 7 deletions
@@ -0,0 +1,5 @@
+/* Rule so that the table tree view works with word-wrap: break-word. */
+.block_private_files .content table {
+    table-layout: fixed;
+    width: 100%;
+}
@@ -33,12 +33,14 @@
    width: 12px;
    height: 12px;
 }
-
-.block .content {
-    padding: 4px 14px;
-}
-.block .content hr {
-    margin: 5px 0;
+.block {
+    .content {
+        padding: 4px 14px;
+        word-wrap: break-word;
+        hr {
+            margin: 5px 0;
+        }
+    }
 }

 .jsenabled .block.hidden .content {