MDL-40205 theme: fixed overflow of block headers

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk
2014-01-13 09:41:40 +08:00
committed by Dan Poltawski
parent 0dc14c0b56
commit 53f2e7a5c8
3 changed files with 7 additions and 6 deletions
+1 -1
View File
@@ -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;}
+5 -4
View File
@@ -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;
File diff suppressed because one or more lines are too long