From c1366a54922adafd8c3146b9c963bbd714a9b087 Mon Sep 17 00:00:00 2001
From: Raymond Wanyoike <raymond.wanyoike@gmail.com>
Date: Sat, 31 May 2014 16:53:18 +0300
Subject: [PATCH] Move stylesheet changes to less file

---
 alchemy/static/css/style.css   | 20 +++++++++++++-------
 alchemy/static/less/style.less | 27 +++++++++++++++------------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/alchemy/static/css/style.css b/alchemy/static/css/style.css
index e7fdbd4..0073d0d 100644
--- a/alchemy/static/css/style.css
+++ b/alchemy/static/css/style.css
@@ -5,7 +5,7 @@
  */
 /*! normalize.css v3.0.0 | MIT License | git.io/normalize */
 html {
-  font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: sans-serif;
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%;
 }
@@ -103,7 +103,7 @@ code,
 kbd,
 pre,
 samp {
-  font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace;
+  font-family: monospace, monospace;
   font-size: 1em;
 }
 button,
@@ -270,7 +270,7 @@ html {
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 body {
-  font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
   line-height: 1.42857143;
   color: #333;
@@ -687,7 +687,7 @@ code,
 kbd,
 pre,
 samp {
-  font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace;
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }
 code {
   padding: 2px 4px;
@@ -5429,7 +5429,7 @@ button.close {
   height: 20px;
   margin-top: -10px;
   margin-left: -10px;
-  font-family: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif;
+  font-family: serif;
 }
 .carousel-control .icon-prev:before {
   content: '\2039';
@@ -6034,6 +6034,7 @@ green     #859900  operators, other keywords
 .highlight .il {
   color: #2aa198;
 }
+/* Literal.Number.Integer.Long */
 body {
   background-color: #fafafa;
   font-family: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif;
@@ -6044,8 +6045,13 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans",
-"Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace;
 }
 a {
   -webkit-transition: color 0.2s ease-in-out;
diff --git a/alchemy/static/less/style.less b/alchemy/static/less/style.less
index 3e5b680..75e56ec 100644
--- a/alchemy/static/less/style.less
+++ b/alchemy/static/less/style.less
@@ -4,27 +4,30 @@
 
 @import "lesshat.less";
 
-@font-face {
-    .font-face(merriweatherlight, "../font/merriweather-light", 300);
-}
-
-@font-face {
-    .font-face(ralewaymedium, "../font/raleway-medium", 500);
-}
-
 body {
     background-color: #fafafa;
-    font-family: merriweatherlight;
+    font-family: Constantia, "Lucida Bright", Lucidabright, "Lucida Serif", Lucida, "DejaVu Serif", "Bitstream Vera Serif", "Liberation Serif", Georgia, serif;
 }
 
-h1, h2, h3, h4, h5, h6 {
-    font-family: 'ralewaymedium';
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+    font-family: Frutiger, "Frutiger Linotype", Univers, Calibri, "Gill Sans", "Gill Sans MT", "Myriad Pro", Myriad, "DejaVu Sans Condensed", "Liberation Sans", "Nimbus Sans L", Tahoma, Geneva, "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+code,
+kbd,
+pre,
+samp {
+  font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace;
 }
 
 a {
     .transition(color 0.2s ease-in-out);
     color: #2e2e2e;
-    // text-decoration: underline;
     &:hover {
         color: orange;
     }