recompiled webmaker-nav.css.

k88hudson · Nov 1, 2012 · bf68fdc · bf68fdc
1 parent 6677665
commit bf68fdc
Showing 1 changed file with 28 additions and 2 deletions.
diff --git a/webmaker-nav/css/webmaker-nav.css b/webmaker-nav/css/webmaker-nav.css
@@ -57,7 +57,34 @@
   border-color: #328f70;
   box-shadow: 0 4px 7px -4px rgba(0, 0, 0, 0.6);
 }
+/* The font family/weight/style of these rules is taken from Tabzilla's CSS:
+   https://raw.github.com/mozilla/tabzilla/master/media/css/tabzilla.css
+   
+   This is done to ensure that smart browsers won't load two separate
+   sets of fonts if webmaker-nav is used on the same page as Tabzilla. */
+@font-face {
+  font-family: 'Open Sans';
+  src: url('../fonts/OpenSans-Regular-webfont.eot');
+  src: url('../fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans-Regular-webfont.woff') format('woff'), url('../fonts/OpenSans-Regular-webfont.ttf') format('truetype'), url('../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'Open Sans';
+  src: url('../fonts/OpenSans-Semibold-webfont.eot');
+  src: url('../fonts/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans-Semibold-webfont.woff') format('woff'), url('../fonts/OpenSans-Semibold-webfont.ttf') format('truetype'), url('../fonts/OpenSans-Semibold-webfont.svg#OpenSansSemibold') format('svg');
+  font-weight: bold;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'Open Sans Light';
+  src: url('../fonts/OpenSans-Light-webfont.eot');
+  src: url('../fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'), url('../fonts/OpenSans-Light-webfont.woff') format('woff'), url('../fonts/OpenSans-Light-webfont.ttf') format('truetype'), url('../fonts/OpenSans-Light-webfont.svg#OpenSansSemibold') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
 .webmaker-nav-container {
+  font-family: "Open Sans";
   font-size: 12px;
   border-bottom: 1px solid #2d2f2f;
 }
@@ -305,10 +332,9 @@
   margin-top: 11px;
   width: 70px;
   height: 70px;
-  background: url(../img/webmaker-logo.png) no-repeat;
+  background: url(../img/webmaker-logo.png ) no-repeat;
 }
 .tab-webmaker .webmaker-slogan {
-  float: left;
   width: 420px;
   padding: 20px;
   margin: 0;