Skip to content
Permalink
Browse files

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

…ODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information...
danpoltawski committed Jan 13, 2014
2 parents 60a188b + f69ee87 commit 0dc14c0b5685dd7a5cf64a0de4df780e96abc80c
@@ -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 {

Large diffs are not rendered by default.

0 comments on commit 0dc14c0

Please sign in to comment.
You can’t perform that action at this time.