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

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Damyon Wiese 2014-01-20 11:27:07 +08:00
commit 6d7d401711
3 changed files with 10 additions and 1 deletions

View File

@ -41,7 +41,10 @@ table.message .searchresults td {padding:5px;}
.message .messagearea .messagehistory .heading {width:100%;clear:both;}
.message .messagearea .messagehistory .left {padding-bottom:10px;width:50%;float:left;clear:both;}
.dir-rtl .message .messagearea .messagehistory .left { float: right; }
.message .messagearea .messagehistory .right {padding-bottom:10px;width:50%;float:right;clear:both;}
.dir-rtl .message .messagearea .messagehistory .right { float:left; }
.message .messagearea .messagehistory .notification {padding:10px;background-color:#EEEEEE;margin-top:5px;}
.message .messagearea .messagesend {padding-top:20px;clear:both;}
.message .messagearea .messagesend .messagesendbox {width:100%}

View File

@ -99,12 +99,18 @@ table.message .searchresults td {
float: left;
clear: both;
}
.dir-rtl .message .messagearea .messagehistory .left {
float:right;
}
.message .messagearea .messagehistory .right {
padding-bottom: 10px;
width: 50%;
float: right;
clear: both;
}
.dir-rtl .message .messagearea .messagehistory .right {
float:left;
}
.message .messagearea .messagehistory .notification {
padding: 10px;
background-color: #eee;

File diff suppressed because one or more lines are too long