Fix a merge error
This commit is contained in:
parent
2fc393f02e
commit
628443d44b
2 changed files with 7 additions and 5 deletions
File diff suppressed because one or more lines are too long
|
|
@ -685,6 +685,12 @@ ul.dropdown-menu li a {
|
|||
}
|
||||
}
|
||||
|
||||
#settings_dialog {
|
||||
.aboutlink {
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
|
||||
#settings_dialog_menu,
|
||||
#wizard_dialog_menu {
|
||||
margin-left: 0;
|
||||
|
|
@ -694,10 +700,6 @@ ul.dropdown-menu li a {
|
|||
.acl_decision {
|
||||
margin-top: 1em;
|
||||
}
|
||||
|
||||
.aboutlink {
|
||||
float: left;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue