I ran magit to make my small commit, but noticed that apparently I hadn't commited in a while. So here.

1 files changed, 50 insertions, 33 deletions

diff --git a/style.scss b/style.scss
index 8022eef..0b6033c 100644
--- a/style.scss
+++ b/style.scss
@@ -14,12 +14,16 @@ Version: 0.1
 Template: twentyeleven
 */
 
+@import url('http://fonts.googleapis.com/css?family=Anton');
 @import "../twentyeleven/style.css";
+@import "twentyeleven-fix.scss";
 @import "logo-style.scss";
 
+
+
 $yellow         : #FFFF00;
 $background-blue: #2210D2;
-$highlight-blue : #0000FF; //<-lighter that background, darker than light
+$highlight-blue : #0000FF; //<-lighter than background, darker than light
 $light-blue     : #1E90FF;
 
 @mixin gradient($color1, $color2) {
@@ -35,7 +39,8 @@ $light-blue     : #1E90FF;
 body {
 	background-color: $background-blue;		
 	#page {
-		$border-width: 0.1em;
+		//I wouldn't use px, but we get roundoff errors otherwise
+		$border-width: 1px;
 		border: {
 			style: solid;
 			width: $border-width;
@@ -57,8 +62,11 @@ body {
 
 				overflow: hidden;
 				box-shadow: 0 .15em 0 #AAAAFF inset;
-				height: 175px;
-				padding: 25px 50% 0 3em;
+				$bg-width: 472px;
+				$bg-height: 200px;
+				$padding-top: 25px;
+				height: $bg-height - $padding-top;
+				padding: $padding-top $bg-width 0 3em;
 				background: {
 					color: $light-blue;
 					image: url('img/swoosh.png');
@@ -98,7 +106,7 @@ body {
 	}	
 }
 
-@media (max-width: 1050px) {
+@mixin small_branding {
 	body #page header#branding hgroup {
 		#team-name {
 			font-size: 60px;
@@ -106,37 +114,46 @@ body {
 		h2 {
 			font-size: 30px;
 		}
-	}
+	}	
 }
-@media (max-width: 800px) {
-	body #page header#branding hgroup {
-		height: auto;
-		background-image: none;
 
-		#team-name{
-			font-size: 3em;
-		}
-		h2 {
-			font-size: 2em;
-		}
-		#team-number {
-			font-size: 5em;
-			position: relative;
-			right: auto;
-			&:before {
-				text-shadow: none;
-				transform: none;
-				content: "FRC";
-				color: white;
-				font-family: serif;
-				font-size: 0.2em;
-				vertical-align: text-top;
+@media (max-width: 1050px) {
+	@include small_branding;
+}
+@media (max-width: 800px) {
+	body #page header#branding {
+		hgroup {
+			height: auto;
+			background-image: none;
+			padding: 2em;
+			
+			h1, h2 {
+				clear:none;
+			}
+			#team-name{
+				font-size: 3em;
+				float: left
+			}
+			h2 {
+				font-size: 2em;
+				float: left;
+			}
+			#team-number {
+				font-size: 5em;
+				float: right;
+				
+				position: relative;
+				right: auto;
+				&:before {
+					text-shadow: none;
+					transform: none;
+					content: "FRC";
+					color: white;
+					font-family: serif;
+					font-size: 0.2em;
+					vertical-align: text-top;
+				}
 			}
 		}
 	}
 }
-/*
-div.menu-wp_nav_menu-container {
-	margin: 0 .5em !important;
-}
-*/
\ No newline at end of file