merge in master, resolve conflicts
This commit is contained in:
parent
5cc933cccc
commit
a98d2cccb8
10 changed files with 614 additions and 476 deletions
|
|
@ -195,6 +195,9 @@ div.topbar-wrapper {
|
|||
div.topbar-wrapper div.topbar {
|
||||
position: absolute;
|
||||
margin: 0 -20px;
|
||||
}
|
||||
|
||||
div.topbar-wrapper div.topbar .fill {
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
-webkit-border-radius: 4px;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue