FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14 from skiprope/issue-16 

Implements additions of and fixes retrospring/bugs#16
This commit is contained in:
Georg G. 2015-04-22 07:33:24 +02:00
parent ef4fd30cd9 ef0330eae9
commit a1a0781cc9
2 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/stylesheets/application.css.scss
View File

@ -28,10 +28,11 @@ $font-size-h6: ceil(($font-size-base * 0.85)); // ~12px
$brand-primary: #5e35b1; $brand-primary: #5e35b1;
$navbar-inverse-bg: #5e35b1; $navbar-inverse-bg: #5e35b1;
$navbar-inverse-link-color: #ffffff; $navbar-inverse-link-color: #ffffff;
$navbar-inverse-link-hover-color: #bfbfbf; $navbar-inverse-link-hover-color: #ffffff;
$navbar-inverse-link-hover-bg: transparent; $navbar-inverse-link-hover-bg: transparent;
$navbar-inverse-link-active-color: #bfbfbf; $navbar-inverse-link-active-color: #ffffff;
$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 6.5%); $navbar-inverse-link-active-bg: transparent;
$navbar-inverse-link-active-bg-mobile: darken(#5e35b1, 7%);
$navbar-inverse-link-disabled-color: darken(#fff, 12.5%); $navbar-inverse-link-disabled-color: darken(#fff, 12.5%);
$navbar-inverse-link-disabled-bg: transparent; $navbar-inverse-link-disabled-bg: transparent;
$navbar-inverse-brand-color: $navbar-inverse-link-color; $navbar-inverse-brand-color: $navbar-inverse-link-color;

56
app/assets/stylesheets/scss/navbar.scss
View File

@ -126,9 +126,61 @@
min-height: 50px; min-height: 50px;
min-width: 50px; min-width: 50px;
height: 50px; height: 50px;
width: 50px; width: 50px;
} }
.navbar-inverse { .navbar-inverse {
border: none; border: none;
} }
@media (min-width: 768px) {
nav.navbar .nav > li:not(.profile--image-dropdown) {
-moz-osx-font-smoothing: grayscale;
position: relative;
&:before {
content: "";
position: absolute;
left: 0;
right: 0;
bottom: 0;
background: $navbar-inverse-link-color;
height: 0px;
-webkit-transition-property: height;
transition-property: height;
-webkit-transition-duration: 0.3s;
transition-duration: 0.3s;
-webkit-transition-timing-function: ease-out;
transition-timing-function: ease-out;
}
&:hover, &:focus, &:active {
&:before {
height: 4px
}
}
&.active:before {
height: 4px;
}
}
}
@media (max-width: 768px) {
nav.navbar .nav {
margin-bottom: 0;
margin-top: 0;
& > li {
&.active a {
background-color: $navbar-inverse-link-active-bg-mobile !important;
}
&.dropdown.profile--image-dropdown a .visible-xs {
padding-left: 15px;
line-height: 40px;
margin: 0;
}
}
}
}