Merge branch 'MDL-44951-master' of git://github.com/jethac/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Marina Glancy 2014-04-16 14:44:04 +08:00
commit 09e1805072
2 changed files with 39 additions and 5 deletions

View File

@ -54,15 +54,49 @@ select {
.header {
margin-bottom: 3px;
}
.maincontent {
.left {
padding: 0 10px 0 10px;
.picture img {
margin: 3px;
&.userpicture {
margin-left: 3px;
margin-right: 10px;
}
}
.content {
.posting.fullpost {
margin-top: 8px;
}
}
.row {
.topic,
.content-mask,
.options {
margin-left: 48px;
}
&.side {
clear: both;
}
}
}
.dir-rtl .forumpost {
.picture img {
&.userpicture {
margin-left: 10px;
margin-right: 3px;
}
}
.row {
.topic,
.content-mask,
.options {
margin-left: 0;
margin-right: 48px;
}
}
}
.forumpost .row .left {
width: auto;
width: 48px;
}
.forumpost .options .commands {

File diff suppressed because one or more lines are too long