fixed merge conflicts

This commit is contained in:
John McLear 2011-12-04 18:55:35 +00:00 committed by Peter 'Pita' Martischka
parent 3401a7bc11
commit d20dcc7c57
4 changed files with 22 additions and 1 deletions

View file

@ -1162,7 +1162,6 @@ label[for=readonlyinput] {
margin-left:10px;
}
@media screen and (max-width: 960px) {
.modaldialog {
position: relative;
@ -1251,3 +1250,6 @@ label[for=readonlyinput] {
display:none;
}
}
.rtl{
direction:RTL;
}