Merge pull request #6 from giulianobg/master

scss/_polvo.scss

@@ -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 'https://fonts.googleapis.com/css?family=Cormorant';
 
 // 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";

scss/polvo/_navbar.scss

@@ -1,68 +1,57 @@
 $transiton: all 0.65s;
 
-.navbar-pplural {
+//
+// Navbar
+// --------------------------------------------------
+
+.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;
-		}
 	}
 }

scss/polvo/_scaffolding.scss

@@ -9,6 +9,21 @@ body {
 }
 
 
+// Page blocks
+.page-block {
+	&-image {
+		background-size: cover;
+		background-position: center top;
+		background-repeat: no-repeat;
+		height: 450px;
+	}
+
+	&-video {
+
+	}
+}
+
+
 // Horizontal rules
 // -------------------------
 .hr {

scss/polvo/_type.scss

@@ -2,6 +2,32 @@
 // Typography
 // --------------------------------------------------
 
+.type {
+	&-xs {
+		font-size: $font-size-xs;
+	}
+
+	&-sm {
+		font-size: $font-size-sm;
+	}
+
+	&-md {
+		font-size: $font-size-md;
+	}
+
+	&-lg {
+		font-size: $font-size-lg;
+	}
+
+	&-xl {
+		font-size: $font-size-xl;
+	}
+
+	&-serif {
+		font-family: $polvo-font-family-serif;
+	}
+}
+
 
 // Headings
 // -------------------------

scss/polvo/_utilities.scss

@@ -3,7 +3,7 @@
 // --------------------------------------------------
 
 
-// Spacers
+// Spacers, margins and paddings
 // -------------------------
 
 .space {
@@ -68,6 +68,17 @@
 	}
 }
 
+// Pullers
+// -------------------------
+.pull {
+	&up {
+		margin-top: -75px;
+	}
+
+	&down {
+		margin-bottom: -75px;
+	}
+}
 
 // Stretch
 // -------------------------

scss/polvo/_variables.scss

@@ -348,8 +348,14 @@ $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;
-$polvo-font-family-base:		$font-family-sans-serif !default;
+$polvo-font-family-base:		'Raleway', "Helvetica Neue", Helvetica, Arial, sans-serif !default;
+$polvo-font-family-serif:		'Cormorant', serif;
+
+$font-size-xs: 14px;
+$font-size-sm: 18px;
+$font-size-md: 24px;
+$font-size-lg: 36px;
+$font-size-xl: 48px;
 
 //$font-size-h1:				floor(($font-size-base * 2.6)) !default; // ~36px
 //$font-size-h2:				floor(($font-size-base * 2.15)) !default; // ~30px
@@ -388,7 +394,7 @@ $card-deck-margin:         .625rem !default;
 //== Utilities
 //
 //## Spacers
-$space-sm:					20px;
+$space-sm:					25px;
 $space-md:					$space-sm * 2;
 $space-lg:					$space-md * 2;