Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2103 from awesomerobot/master 

fixing the remnant borders left on the header buttons
This commit is contained in:
Régis Hanol 2014-03-11 09:11:32 +01:00
parent 7482f07eaa 81b5b6de0e
commit f71846f269
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/stylesheets/desktop/header.scss
View File

@ -48,7 +48,8 @@
a { a {
color: $secondary_text_color; color: $secondary_text_color;
font-size: 14px; font-size: 14px;
line-height: 40px; display:block;
margin-top: 10px;
} }
button { button {
margin-top: 9px; margin-top: 9px;
@ -68,16 +69,17 @@
color: $nav-button-color; color: $nav-button-color;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
border-top: 1px solid $tertiary_border_color; border-top: 1px solid transparent;
border-left: 1px solid $tertiary_border_color; border-left: 1px solid transparent;
border-right: 1px solid $tertiary_border_color; border-right: 1px solid transparent;
&:hover { &:hover {
color: $nav-button-color-hover; color: $nav-button-color-hover;
background-color: $nav-button-background-color-hover; background-color: $nav-button-background-color-hover;
border-top: 1px solid $primary_border_color; border-top: 1px solid transparent;
border-left: 1px solid $primary_border_color; border-left: 1px solid transparent;
border-right: 1px solid $primary_border_color; border-right: 1px solid transparent;
} }
&:active { &:active {
color: $nav-button-color-active; color: $nav-button-color-active;
@ -156,7 +158,6 @@
top: 100%; top: 100%;
right: 0; right: 0;
z-index: 1100; z-index: 1100;
margin-top: -1px;
border: 1px solid $primary_border_color; border: 1px solid $primary_border_color;
background-color: $primary_background_color; background-color: $primary_background_color;
@include box-shadow(0 2px 2px rgba($primary_shadow_color, .4)); @include box-shadow(0 2px 2px rgba($primary_shadow_color, .4));
@ -237,7 +238,7 @@
} }
&#user-dropdown { &#user-dropdown {
width: 116px; width: 118px;
.user-dropdown-links { .user-dropdown-links {
text-align: right; text-align: right;