Merge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle

Conflicts: theme/bootstrapbase/style/moodle.css
2025-01-19 14:27:22 +01:00 · 2014-01-13 09:35:50 +08:00 · 2014-01-13 09:35:50 +08:00 · b5c8e7cbc3
commit b5c8e7cbc3
parent f6652bc750 f802fe7d7f
3 changed files with 14 additions and 6 deletions
--- a/blocks/private_files/styles.css
+++ b/blocks/private_files/styles.css
@ -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%;
+}
--- a/theme/bootstrapbase/less/moodle/blocks.less
+++ b/theme/bootstrapbase/less/moodle/blocks.less
@ -39,11 +39,14 @@
    width:auto;
 }

-.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 {
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css