Better fonts, fix up some CSS ugliness.

symondsandson · Jan 25, 2015 · dd88b00 · dd88b00
1 parent 889e2e1
commit dd88b00
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/source/css/main.css.scss b/source/css/main.css.scss
@@ -20,12 +20,10 @@ $darkgray: #3e3e3e;
     font-family: "Cubano Regular";
     src: url('fonts/Cubano-Regular.otf') format('opentype'); }
 
-@font-face {
-    font-family: "Vevey";
-    src: url('fonts/vevey.ttf') format('truetype'); }
+
 
 .centered {
-    width: 800px;
+    width: 100%;
     margin: 0 auto;
     padding: 0;
 }
@@ -74,7 +72,7 @@ $darkgray: #3e3e3e;
 
 h2 {
     text-transform: uppercase;
-    font-family: "Vevey";
+    font-family: 'Lato', sans-serif;
     font-size: 42px;
     margin: 0 auto;
     font-weight: normal;
@@ -83,7 +81,7 @@ h2 {
 }
 
 h3 {
-    font-family: "Vevey";
+    font-family: 'Lato', sans-serif;
     font-size: 36px;
     margin: 0 auto;
     font-weight: normal;
@@ -93,14 +91,14 @@ h3 {
 
 
 p {
-    font-family: "Edmond Sans Regular";
+    font-family: 'Lato', sans-serif;
 }
 
 body {
     width: 100%;
     padding: 0;
     margin: 0;
-    font-family: "Edmond Sans Medium";
+    font-family: 'Lato', sans-serif;
     font-size: 18px;
     background-color: #f2f2e6;
     color: $gray;
@@ -115,6 +113,12 @@ div#navbar {
     z-index: 100;
     top: 30px;
 
+    div {
+        width: 800px;
+        margin: 0 auto;
+        padding: 0;
+    }
+
     ul {
         height: 100%;
         list-style-type: none;
@@ -202,7 +206,6 @@ div#top {
     h4 {
         width: 100%;
         text-align: center;
-        text-transform: uppercase;
         font-weight: normal;
         font-size: 18px;
         letter-spacing: 8px;
@@ -545,7 +548,7 @@ footer {
     text-align: center;
     margin: 50px 0 20px 0;
     background: url("/img/crafters.png") center no-repeat;
-    font-family: "Cubano Regular";
+    font-family: 'Lato', sans-serif;
     letter-spacing: 1px;
 }
 

diff --git a/source/index.html.erb b/source/index.html.erb
@@ -11,7 +11,7 @@ javascript: index
 </div>
 
 <div id='who_we_are'>
-  <div class='centered-full'>
+  <div class='centered'>
     <div id="ruby-divider"></div>
     <h2>Web Crafters &amp; Application Artisans</h2>
     <div id="started-sidebar" class="orange">

diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
@@ -13,14 +13,15 @@
 
         <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
 
+        <link href='http://fonts.googleapis.com/css?family=Lato:100,300,400,700,900' rel='stylesheet' type='text/css'>
         <link rel="stylesheet" href="/css/normalize.css">
         <link rel="stylesheet" href="/css/boilerplate.css">
         <link rel="stylesheet" href="/css/main.css">
         <script src="js/vendor/modernizr-2.6.1.min.js"></script>
     </head>
     <body>
         <div id='navbar'>
-          <div class='centered'>
+          <div>
             <ul>
               <li><%= link_to 'Who We Are', '/#who_we_are' %></li>
               <li><%= link_to 'Our Experience', '/#our_experience' %></li>