diff options
author | Jonne Haß <me@jhass.eu> | 2014-09-03 13:17:04 +0400 |
---|---|---|
committer | Jonne Haß <me@jhass.eu> | 2014-09-03 13:17:04 +0400 |
commit | d4dc20f59c993a5768c3428b859e7d0b80bff982 (patch) | |
tree | 52daae3acad9df506f19331c06e432c7bfd6c048 /app | |
parent | 5bbf8cd3412542895a9b7d2b5e1f1270554207c0 (diff) | |
parent | b5de6cded9104d9c6d8e30782ad0672fb1a47165 (diff) |
Merge branch 'release/0.4.1.0' into develop
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/header.css.scss | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/app/assets/stylesheets/header.css.scss b/app/assets/stylesheets/header.css.scss index afe12944f..22fc69433 100644 --- a/app/assets/stylesheets/header.css.scss +++ b/app/assets/stylesheets/header.css.scss @@ -17,6 +17,10 @@ body > header { left: 0; border-bottom: 1px solid #000; + > div > div.container { + height: 26px; + } + .diaspora_header_logo { float: left; margin-top: -6px; @@ -260,19 +264,35 @@ body > header { cursor: pointer; z-index: 10; display: inline; + visibility: hidden; top: -4px; float: right; - margin: -2px -5px 0px 0px; + margin: -2px -3px 0px 0px; padding: 0; - border-left: 1px solid #333; - border-right: 1px solid #333; + > li { + display: block; + padding-right: 5px; + border-left: 1px solid #333; + border-right: 1px solid #333; + + &:first-child { + visibility: visible; + } + + &:last-child { + border-bottom: 1px solid #333; + } + } &.active { - margin-top: -3px; @include dropdown-shadow; background-color: rgb(34,30,30); - border: 1px solid $border-dark-grey; + visibility: visible; + + > li { + border-color: $border-dark-grey; + } } } |