merge in master, resolve conflicts

2026-05-21 13:24:08 +03:00 · 2011-08-21 20:47:24 -07:00
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;