Merge pull request bitpay#69 from bechi/bug/fonts

fix fonts
decred · Jan 16, 2014 · d5072df · d5072df
2 parents 3462b92 + 64cc928
commit d5072df
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 31 deletions.
diff --git a/public/css/common.css b/public/css/common.css
@@ -1,5 +1,7 @@
-.mystery {
-  font-family: Ubuntu-BoldItalic;
+.insight {
+  font-family: Ubuntu, sans-serif;
+  font-weight: 400;
+  font-style: italic;
   font-size: 34px;
   color: #FFFFFF !important;
   line-height: 18px;
@@ -16,6 +18,12 @@ body {
   /* The html and body elements cannot have any padding or margin. */
 }
 
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: Ubuntu, sans-serif;
+  color: #373D42;
+
+}
+
 /* Wrapper for page content to push down footer */
 #wrap {
   min-height: 100%;
@@ -57,19 +65,23 @@ body {
 
 #search {
   color: #fff;
-  font-family: Ubuntu-Light;
+  font-family: Ubuntu, sans-serif;
+  font-weight: 100;
 }
 
 #search::-webkit-input-placeholder { 
-  font-family: Ubuntu-LightItalic;
+  font-family: Ubuntu, sans-serif;
+  font-weight: 100;
+  font-style: italic;
   font-size: 13px;
   color: #BCDF7E;
   line-height: 18px;
 }
 
 
 #search::-moz-placeholder { 
-  font-family: Ubuntu-LightItalic;
+  font-family: Ubuntu, sans-serif;
+  font-weight: 100;
   font-size: 13px;
   color: #BCDF7E;
   line-height: 18px;
@@ -116,7 +128,7 @@ body {
 }
 
 .block-id h1 {
-  font-family: Ubuntu-Medium;
+  font-weight: bold;
   font-size: 24px;
   color: #FFFFFF;
   line-height: 30px;
@@ -146,7 +158,7 @@ body {
   background: #fff;
   border: 2px solid #ccc;
   color: #373D42;
-  font-weight: bold;
+  font-weight: 500;
 }
 
 /* Set the fixed height of the footer here */

diff --git a/public/views/header.html b/public/views/header.html
@@ -1,27 +1,29 @@
-<div data-ng-controller="HeaderController">
-  <div class="navbar-header">
-    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-      <span class="sr-only">Toggle navigation</span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-    </button>
-    <a class="mystery navbar-brand" href="#!">Mystery</a>
-  </div>
-  <div class="collapse navbar-collapse">
-    <ul class="nav navbar-nav">
-      <li data-ng-repeat="item in menu" ui-route="/{{item.link}}" ng-class="{active: $uiRoute}">
-        <a href="#!/{{item.link}}">{{item.title}}</a>
-      </li>
-    </ul>
-    <div ng-controller="SearchController" class="pull-right">
-      <form class="navbar-form navbar-left" role="search" ng-submit="search()">
-        <div class="form-group" ng-class="{'has-error': badQuery}">
-          <input id="search" type="text" class="form-control" ng-model="q" placeholder="Search for block, transaction or address">
-        </div>
-        <span class="text-danger" ng-show="badQuery">No matching records found!</span>
+<div class="container">
+  <div data-ng-controller="HeaderController">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="insight navbar-brand" href="#!">Insight</a>
+    </div>
+    <div class="collapse navbar-collapse">
+      <ul class="nav navbar-nav">
+        <li data-ng-repeat="item in menu" ui-route="/{{item.link}}" ng-class="{active: $uiRoute}">
+          <a href="#!/{{item.link}}">{{item.title}}</a>
+        </li>
+      </ul>
+      <div ng-controller="SearchController" class="pull-right">
+        <form class="navbar-form navbar-left" role="search" ng-submit="search()">
+          <div class="form-group" ng-class="{'has-error': badQuery}">
+            <input id="search" type="text" class="form-control" ng-model="q" placeholder="Search for block, transaction or address">
+          </div>
+          <span class="text-danger" ng-show="badQuery">No matching records found!</span>
 
-      </form>
+        </form>
+      </div>
     </div>
   </div>
-</div>
+</div>