Skip to content

Commit

Permalink
Fix navbar height and navbar > nav
Browse files Browse the repository at this point in the history
  • Loading branch information
giulianobg committed Apr 8, 2016
1 parent 04ebbec commit cf7bc97
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 113 deletions.
112 changes: 46 additions & 66 deletions css/polvo.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 4 additions & 12 deletions scss/_polvo.scss
Original file line number Diff line number Diff line change
@@ -1,29 +1,21 @@
//@import url(https://fonts.googleapis.com/css?family=Raleway:100,300,500,700);
@import url(https://fonts.googleapis.com/css?family=Dosis:400,200,700);
@import url(https://fonts.googleapis.com/css?family=Raleway:100,300,500,700);
//@import url(https://fonts.googleapis.com/css?family=Dosis:200,400,700);

// Core variables and mixins
@import "polvo/variables";
@import "polvo/mixins";

// Reset and dependencies
//@import "bootstrap/normalize";
//@import "bootstrap/print";
//@import "bootstrap/glyphicons";

// Core CSS
@import "polvo/scaffolding";
@import "polvo/type";

// Components
@import "polvo/buttons";
@import "polvo/cards";
@import "polvo/navbar";
@import "polvo/panels";

// Pages
@import "polvo/faq";
@import "polvo/footer";
@import "polvo/hero-carousel";
@import "polvo/navbar";
@import "polvo/panels";

// Utility classes
@import "polvo/utilities";
53 changes: 19 additions & 34 deletions scss/polvo/_navbar.scss
Original file line number Diff line number Diff line change
@@ -1,68 +1,53 @@
$transiton: all 0.65s;

.navbar-pplural {
.navbar-polvo {
background-color: transparent;
border-color: transparent;
-webkit-transition: $transiton;
-moz-transition: $transiton;
transition: $transiton;
min-height: 80px;

.navbar-brand {
color: color('grey', '100');
font-size: 30px;
font-weight: 700;
line-height: 50px;
height: 80px;

&:hover,
&:focus {
color: map-get(map-get($material-colors, 'grey'), '200');
color: color('grey', '300');
background-color: transparent;
}

img {
width: 42px;
display: inline;
}
}

.navbar-text {
color: color('grey', '200');
font-weight: 100;
color: color('grey', '400');
}

.nav {
> li > a {
color: color('grey', '100');
background: transparent;

&:hover,
&:focus {
color: color('grey', '300');
}
}
}
}

@media (min-width: $screen-md-min) {
.affix {
background-color: color('blue-grey', '700');
/*opacity: 0.925;*/
/*border-color: rgba(34, 34, 34, 0.05);*/
min-height: 50px;
background-color: color('grey', '900');
border-color: color('grey', '800');

.navbar-header .navbar-brand {
color: color('grey', '100');
font-size: 18px;
line-height: 20px;
height: 50px;

&:hover,
&:focus {
color: color('grey', '200');
}

img {
width: 24px;
color: color('grey', '300');
}
}

.nav > li > a,
.nav > li > a:focus {
color: #222222;
}

.nav > li > a:hover,
.nav > li > a:focus:hover {
color: #f05f40;
}
}
}
2 changes: 1 addition & 1 deletion scss/polvo/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ $polvo-cta: #41724d;
//
//## Font, line-height, and color for body text, headings, and more.

$font-family-sans-serif: 'Dosis', "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$font-family-sans-serif: 'Raleway', "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$polvo-font-family-base: $font-family-sans-serif !default;

//$font-size-h1: floor(($font-size-base * 2.6)) !default; // ~36px
Expand Down

0 comments on commit cf7bc97

Please sign in to comment.