Merge branch 'markup' into develop

rbndelrio · Mar 8, 2015 · 74db617 · 74db617
2 parents 0141c6c + 54a5107
commit 74db617
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -25,4 +25,5 @@
 ### Libraries etc.
 
 * jQuery (well, not yet...)
-* Modernizr (shiv and all that jazz)
+* Modernizr (shiv and all that jazz)
+* FontAwesome
diff --git a/brewery.html b/brewery.html
@@ -11,6 +11,7 @@
 	<link rel="icon" sizes="192x192" href="img/touch-icon.png">
 	<link rel="shortcut icon" href="img/fav.ico">
 	<link rel="stylesheet" href="css/style.css">
+	<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
 	<link href='http://fonts.googleapis.com/css?family=Patua+One|Roboto:500,400italic,700,400|Roboto+Condensed:700,400' rel='stylesheet' type='text/css'>
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
 	<script src="min/modernizr.js" type="text/javascript"></script>
@@ -24,7 +25,7 @@
 					<a href="index.html" class="logotype navlink">Florida Beer Co.</a>
 				</li>
 				<li class="pull-left">
-					<a href="#" class="menu navlink"><span class="menutext">Menu</span><span class="darrow">&#x2304;</span></a>
+					<a href="#" class="menu navlink"><span class="menutext">Menu</span><i class="fa fa-chevron-down darrow"></i></a>
 					<div class="fs-menu">
 						<ul class="links">
 							<li><a href="#">Beer</a></li>

diff --git a/index.html b/index.html
@@ -11,6 +11,7 @@
 	<link rel="icon" sizes="192x192" href="img/touch-icon.png">
 	<link rel="shortcut icon" href="img/fav.ico">
 	<link rel="stylesheet" href="css/style.css">
+	<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
 	<link href='http://fonts.googleapis.com/css?family=Patua+One|Roboto:500,400italic,700,400|Roboto+Condensed:700,400' rel='stylesheet' type='text/css'>
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
 	<script src="min/modernizr.js" type="text/javascript"></script>

diff --git a/sass/style.sass b/sass/style.sass
@@ -123,16 +123,18 @@ header
 		font-weight: normal
 		&:hover
 			color: $brand-3
-	span
+	span,i
 		display: inline-block
 		overflow: hidden
 		&.menutext
-			width: 85px			
+			width: 80px			
 		&.darrow
-			font-size: 60px
+			// font-size: 60px
 			height: 100%
 			overflow: hidden
-			line-height: 44px
+			line-height: 53px
+			width: 45px
+			text-align: center
 
 
 //--- MENU ---//