From 465de586078eb40e6d0ae820d9da8a254c181021 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Sat, 1 Mar 2014 19:27:44 +0200
Subject: Switch from CSS to SASS

I probably should figure out how to start rack in the code, so I'd get
caching of the SASS (and in future Coffee) files, instead of Sinatra
generating them always on the fly
---
 lib/oxidized/api/web/public/css/oxidized.css | 43 -----------------------
 lib/oxidized/api/web/views/head.haml         |  2 +-
 lib/oxidized/api/web/views/oxidized.sass     | 51 ++++++++++++++++++++++++++++
 lib/oxidized/api/web/webapp.rb               | 11 +++---
 4 files changed, 58 insertions(+), 49 deletions(-)
 delete mode 100644 lib/oxidized/api/web/public/css/oxidized.css
 create mode 100644 lib/oxidized/api/web/views/oxidized.sass

(limited to 'lib')

diff --git a/lib/oxidized/api/web/public/css/oxidized.css b/lib/oxidized/api/web/public/css/oxidized.css
deleted file mode 100644
index 9df98c6..0000000
--- a/lib/oxidized/api/web/public/css/oxidized.css
+++ /dev/null
@@ -1,43 +0,0 @@
-body {
-  background: #fdf6e3;
-  color: #002b36;
-}
-
-a:link {
-  color: #dc322f;
-  text-decoration: none;
-}
-
-a:visited {
-}
-
-a:hover {
-  color: #d33682;
-  text-decoration: underline;
-}
-
-a:active {
-}
-
-.center {
-  margin-left: auto;
-  margin-right: auto;
-  text-align: center;
-}
-
-th {
-  color: #2aa198;
-}
-
-tr.odd {
-  background: #eee8d5;
-}
-
-tr.even {
-  background: #fdf6e3;
-}
-
-tr:hover {
-  background: #586e75;
-  color: #fdf6e3;
-}
diff --git a/lib/oxidized/api/web/views/head.haml b/lib/oxidized/api/web/views/head.haml
index 1619512..55fdb7c 100644
--- a/lib/oxidized/api/web/views/head.haml
+++ b/lib/oxidized/api/web/views/head.haml
@@ -1,3 +1,3 @@
 %head
   %title oxidized
-  %link{:rel=>'stylesheet', :href=>'/css/oxidized.css'}
+  %link{:rel=>'stylesheet', :href=>'/stylesheets/oxidized.css'}
diff --git a/lib/oxidized/api/web/views/oxidized.sass b/lib/oxidized/api/web/views/oxidized.sass
new file mode 100644
index 0000000..39d090f
--- /dev/null
+++ b/lib/oxidized/api/web/views/oxidized.sass
@@ -0,0 +1,51 @@
+$font-stack: Helvetica, sans-serif
+$base03:     #002b36
+$base02:     #073642
+$base01:     #586e75
+$base00:     #657b83
+$base0:      #839496
+$base1:      #93a1a1
+$base2:      #eee8d5
+$base3:      #fdf6e3
+$yellow:     #b58900
+$orange:     #cb4b16
+$red:        #dc322f
+$magenta:    #d33682
+$violet:     #6c71c4
+$blue:       #268bd2
+$cyan:       #2aa198
+$green:      #859900
+
+body
+  font: 100% $font-stack
+  color: $base03
+  background: $base3
+
+a:link
+  color: $red
+  text-decoration: none
+
+// a:visited
+// a:active
+
+a:hover
+  color: $magenta
+  text-decoration: underline
+
+.center
+  margin-left: auto
+  margin-right: auto
+  text-align: center
+
+th
+  color: $cyan
+
+tr.odd
+  background: $base2
+
+tr.even
+  background: $base3
+
+tr:hover
+  background: $base01
+  color: $base3
diff --git a/lib/oxidized/api/web/webapp.rb b/lib/oxidized/api/web/webapp.rb
index 4cec200..3d66ba8 100644
--- a/lib/oxidized/api/web/webapp.rb
+++ b/lib/oxidized/api/web/webapp.rb
@@ -1,7 +1,7 @@
 require 'sinatra/base'
 require 'sinatra/json'
 require 'haml'
-require 'pp'
+require 'sass'
 module Oxidized
   module API
     class WebApp < Sinatra::Base
@@ -68,10 +68,11 @@ module Oxidized
         out :node
       end
 
-      #get '/node/:node' do
-      #  @data = nodes.show params[:node]
-      #  out
-      #end
+      get '/stylesheets/*.css' do
+        sass params[:splat].first.to_sym
+      end
+
+      private
 
       def out template=:default
         if @json or params[:format] == 'json'
-- 
cgit v1.2.1