mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-24 09:26:14 -04:00
fixed merge conflicts
This commit is contained in:
parent
3401a7bc11
commit
d20dcc7c57
4 changed files with 22 additions and 1 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue