Merge pull request #10 from nodecopter/visual-improvements

various ux improvements to typography and other
nodecopter · Dec 13, 2012 · 543593f · 543593f
2 parents 4b775e6 + 39c0228
commit 543593f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/pages/index.md b/pages/index.md
@@ -9,8 +9,7 @@ this.introText =
 
 <h2 id="upcoming-events"><a href="#upcoming-events">Upcoming Events</a></h2>
 
-* [Dec 1, 2012 - San Francisco](http://droneolympics.com/) by [Christian Sanz](https://twitter.com/csanz) & [Jyri Engeström](https://twitter.com/jyri)
-* [May 30, 2013 - Amelia Island](/2013/amelia-island/may-30) by [Core Team](/core) & [JSConf.us](http://2013.jsconf.us/)
+<a href="/2013/amelia-island/may-30"><img src="img/jsconfus-location.png" /></a>
 
 <h2 id="past-events"><a href="#past-events">Past Events</a></h2>
 
@@ -19,6 +18,7 @@ this.introText =
 * [Oct 31, 2012 - San Francisco](/2012/san-francisco/oct-31) by [Christian Sanz](https://twitter.com/csanz)
 * [Nov 8-9, 2012 - Seattle, WA](/2012/seattle/nov-8-9) by [Chris Williams](https://plus.google.com/103300350874263468636/posts)
 * [Nov 10, 2012 - Brighton](/2012/brighton/nov-10) by [Remy Sharp](https://twitter.com/rem)
+* [Dec 1, 2012 - San Francisco](http://droneolympics.com/) by [Christian Sanz](https://twitter.com/csanz) & [Jyri Engeström](https://twitter.com/jyri)
 
 <h2 id="summer-of-drones"><a href="#summer-of-drones">Summer of Drones</a></h2>
 

diff --git a/public/css/main.less b/public/css/main.less
@@ -52,8 +52,7 @@
 body{
   background-color: #f2f0f0;
   margin: 0;
-  font-family: 'Helvetica Neue', sans-serif;
-  font-size: 16px;
+  font: 16px/22px 'Helvetica Neue', Helvetica, Arial, sans-serif;
   color: #333;
 }
 
@@ -125,11 +124,9 @@ a{
   margin: 70px 0 0 0;
 
   h2{
-    margin: 0;
-    font-family: 'Blanch Caps';
+    margin: 40px 0 20px 0;
+    font: normal 50px 'Blanch Caps';
     color: @link-color;
-    font-size: 50px;
-    font-weight: normal;
   }
 
   p{
@@ -149,6 +146,12 @@ a{
   background-color: #fff;
   .box-shadow(0 0 8px, #ccc);
 
+  ul {
+    li {
+      padding: .2em 0;
+    }
+  }
+
   @button-height: 54px;
 
   form{
@@ -202,10 +205,8 @@ a{
   }
 
   h2, h2 a{
-    margin: 25px 0 0 0;
-    font-family: 'Blanch Caps';
-    font-size: 60px;
-    font-weight: normal;
+    margin: 40px 0;
+    font: normal 60px/40px 'Blanch Caps', sans-serif;
     color: #232323;
   }
 

diff --git a/public/img/jsconfus-location.png b/public/img/jsconfus-location.png