nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'release/0.4.1.0' into develop

Browse source
This commit is contained in:
Jonne Haß 2014-09-03 11:17:04 +02:00
commit d4dc20f59c
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/assets/stylesheets/header.css.scss
View file

@ -17,6 +17,10 @@ body > header {
left: 0; left: 0;
border-bottom: 1px solid #000; border-bottom: 1px solid #000;
> div > div.container {
height: 26px;
}
.diaspora_header_logo { .diaspora_header_logo {
float: left; float: left;
margin-top: -6px; margin-top: -6px;
@ -260,19 +264,35 @@ body > header {
cursor: pointer; cursor: pointer;
z-index: 10; z-index: 10;
display: inline; display: inline;
visibility: hidden;
top: -4px; top: -4px;
float: right; float: right;
margin: -2px -5px 0px 0px; margin: -2px -3px 0px 0px;
padding: 0; padding: 0;
border-left: 1px solid #333; > li {
border-right: 1px solid #333; 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 { &.active {
margin-top: -3px;
@include dropdown-shadow; @include dropdown-shadow;
background-color: rgb(34,30,30); background-color: rgb(34,30,30);
border: 1px solid $border-dark-grey; visibility: visible;
> li {
border-color: $border-dark-grey;
}
} }
} }