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

Merge branch 'refatoring-header' into develop

Browse source
This commit is contained in:
Jonne Haß 2013-08-11 23:30:37 +02:00
commit ed7281d730
2 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -10,6 +10,7 @@
* Convert all ActivityStreams::Photo to StatusMessages and drop ActivityStreams::Photo [#4144](https://github.com/diaspora/diaspora/issues/4144) * Convert all ActivityStreams::Photo to StatusMessages and drop ActivityStreams::Photo [#4144](https://github.com/diaspora/diaspora/issues/4144)
* Port the Rails application to strong_parameters in preparation to the upgrade to Rails 4 [#4143](https://github.com/diaspora/diaspora/issues/4143) * Port the Rails application to strong_parameters in preparation to the upgrade to Rails 4 [#4143](https://github.com/diaspora/diaspora/issues/4143)
* Refactor left bar side menu, improve tag autosuggestion design [#4271](https://github.com/diaspora/diaspora/issues/4271), [#4316](https://github.com/diaspora/diaspora/pull/4316) * Refactor left bar side menu, improve tag autosuggestion design [#4271](https://github.com/diaspora/diaspora/issues/4271), [#4316](https://github.com/diaspora/diaspora/pull/4316)
* Extract and factorize the header css in a new file, fix ugly header in registration [#4389](https://github.com/diaspora/diaspora/pull/4389)
## Bug fixes ## Bug fixes
* Check twitter write access before adding/authorizing it for a user. [#4124](https://github.com/diaspora/diaspora/issues/4124) * Check twitter write access before adding/authorizing it for a user. [#4124](https://github.com/diaspora/diaspora/issues/4124)

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

@ -44,6 +44,7 @@ body > header {
display: inline-block; display: inline-block;
margin-top: 2px; margin-top: 2px;
float: left; float: left;
width: 61px;
a:hover { text-decoration: none; } a:hover { text-decoration: none; }
@ -56,6 +57,18 @@ body > header {
font-weight: bold; font-weight: bold;
font-size: smaller; font-size: smaller;
.badge_count {
@include border-radius(2px);
z-index: 3;
position: absolute;
top: -4px;
left: 15px;
padding: 1px 2px;
background-color: #A40802;
line-height: 12px;
color: #fff;
}
&:hover .badge_count { background-color: lighten(#A40802, 5%); } &:hover .badge_count { background-color: lighten(#A40802, 5%); }
.icons-notifications_grey { height: 16px; } .icons-notifications_grey { height: 16px; }
@ -74,29 +87,19 @@ body > header {
padding: 0px 3px; padding: 0px 3px;
} }
#message_inbox_badge { padding-top: 3px; } #message_inbox_badge {
padding-top: 3px;
margin-right: 0px;
padding-right: 0px;
}
#notification_badge { #notification_badge.active {
.active { z-index: 10;
z-index: 10; background-color: #fff;
background-color: #fff; border: 1px solid #888;
border: 1px solid #888; border-bottom: 0px;
border-bottom: 0px; margin-left: 0px;
margin-left: 0px; padding-bottom: 12px;
padding-bottom: 12px;
}
.badge_count {
@include border-radius(2px);
z-index: 3;
position: absolute;
top: -2px;
left: 13px;
padding: 0 2px 1px 2px;
background-color: #A40802;
line-height: 12px;
color: #fff;
}
} }
#notification_dropdown { #notification_dropdown {
@ -192,7 +195,8 @@ body > header {
width: 200px; width: 200px;
} }
&::-webkit-input-placeholder, &:-moz-placeholder { text-shadow: none; } &::-webkit-input-placeholder { text-shadow: none; }
&:-moz-placeholder { text-shadow: none; }
} }
} }
} }
@ -212,10 +216,8 @@ body > header {
margin: -2px -5px 0px 0px; margin: -2px -5px 0px 0px;
padding: 5px 7px 5px 32px; padding: 5px 7px 5px 32px;
border { border-left: 1px solid #333;
left: 1px solid #333; border-right: 1px solid #333;
right: 1px solid #333;
}
li { li {
a { a {
@ -253,7 +255,6 @@ body > header {
&.active { &.active {
margin-top: -3px; margin-top: -3px;
margin-right: -5px;
@include dropdown-shadow; @include dropdown-shadow;
background-color: rgb(34,30,30); background-color: rgb(34,30,30);
border: 1px solid #999; border: 1px solid #999;
@ -286,10 +287,8 @@ body > header {
height: 100%; height: 100%;
display: inline-block; display: inline-block;
margin-left: -4px; margin-left: -4px;
border { border-left: 1px solid #333;
left: 1px solid #333; border-right: 1px solid #333;
right: 1px solid #333;
}
&:last-child { &:last-child {
margin-left: -5px; margin-left: -5px;