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

Merge pull request #6452 from AugierLe42e/typehead-uses-bs-variable

Browse source 
Use BS variable for typehead + header CSS enhancements
This commit is contained in:
Steffen van Bergerem 2015-10-11 14:58:46 +02:00
commit 5d7470d94a
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/assets/stylesheets/header.scss
View file

@ -1,6 +1,7 @@
header > .dark-header > nav { .navbar.navbar-fixed-top {
border-bottom: none; border-bottom: none;
box-shadow: 1px 0 2px $black; box-shadow: 1px 0 2px $black;
a:focus {outline: 0 none; }
.navbar-brand { .navbar-brand {
font-weight: bold; font-weight: bold;
@ -11,11 +12,8 @@ header > .dark-header > nav {
.col-lg-10 { padding: 0; } .col-lg-10 { padding: 0; }
.navbar-header > .nav li { display: inline-block !important; } .navbar-header > .nav li { display: inline-block !important; }
.nav-badge { .nav-badge {
color: $navbar-inverse-link-color;
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
&:hover { color: $navbar-inverse-link-hover-color; }
&:hover, &:focus { background-color: transparent; }
} }
#navbar-collapse { #navbar-collapse {
.form-group, .twitter-typeahead { .form-group, .twitter-typeahead {
@ -60,8 +58,7 @@ header > .dark-header > nav {
.navbar-nav:not(.nav-badges) > li > a { font-weight: bold; } .navbar-nav:not(.nav-badges) > li > a { font-weight: bold; }
.nav-badges { .nav-badges {
& > li { height: 50px; } li { height: $navbar-height; }
.dropdown > a:focus { outline: 0px none; }
.dropdown-open { .dropdown-open {
background-color: $dropdown-bg; background-color: $dropdown-bg;
& > a { color: $dropdown-link-color; } & > a { color: $dropdown-link-color; }

4
app/assets/stylesheets/typeahead.scss
View file

@ -1,6 +1,6 @@
.tt-menu { .tt-menu {
width: 300px; width: 300px;
margin-top: 11px; margin-top: ($navbar-height - $input-height-small) / 2;
background-color: $navbar-inverse-bg; background-color: $navbar-inverse-bg;
box-shadow: 0 5px 10px rgba(0,0,0,.2); box-shadow: 0 5px 10px rgba(0,0,0,.2);
} }
@ -14,6 +14,8 @@
background-color: $brand-primary; background-color: $brand-primary;
} }
&:hover { background-color: lighten($navbar-inverse-bg, 10%); }
&.search-suggestion-person { &.search-suggestion-person {
padding: 8px; padding: 8px;
.avatar { .avatar {