From 1e891f434d5ef0738dcd80bd7f98224fcb6ecabc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Mon, 15 Feb 2016 16:44:23 +0100
Subject: [PATCH] move to sass is starting to work

---
 public/less/base/base.scss         | 16 ++++++++++++----
 public/less/components/navbar.scss |  1 -
 tasks/default_task.js              |  2 +-
 tasks/options/concat.js            |  4 ++--
 tasks/options/sass.js              |  4 ++--
 tasks/options/watch.js             |  2 +-
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/public/less/base/base.scss b/public/less/base/base.scss
index 1556ee1d534..928ecb857ec 100644
--- a/public/less/base/base.scss
+++ b/public/less/base/base.scss
@@ -19,10 +19,18 @@ body {
 a {
   color: $linkColor;
   text-decoration: none;
+
+  &:hover,
+  &:focus {
+    color: $linkColorHover;
+    text-decoration: none;
+  }
+
+  &:focus {
+    @include tab-focus();
+  }
 }
 
-a:hover,
-a:focus {
-  color: $linkColorHover;
+img {
+  vertical-align: middle;
 }
-
diff --git a/public/less/components/navbar.scss b/public/less/components/navbar.scss
index 92aaf8b2176..24f28d06812 100644
--- a/public/less/components/navbar.scss
+++ b/public/less/components/navbar.scss
@@ -11,7 +11,6 @@
   padding-right: 20px;
   background-color: $navbarBackground;
   border-bottom: $navbarBorder;
-
   @include clearfix();
 }
 
diff --git a/tasks/default_task.js b/tasks/default_task.js
index 033acb3921e..3ec98fc660f 100644
--- a/tasks/default_task.js
+++ b/tasks/default_task.js
@@ -2,7 +2,7 @@
 module.exports = function(grunt) {
   'use strict';
 
-  grunt.registerTask('css', ['less', 'concat:cssDark', 'concat:cssLight']);
+  grunt.registerTask('css', ['sass', 'concat:cssDark', 'concat:cssLight']);
   grunt.registerTask('default', [
     'jscs',
     'jshint',
diff --git a/tasks/options/concat.js b/tasks/options/concat.js
index 521db4d9f39..59042fc26b0 100644
--- a/tasks/options/concat.js
+++ b/tasks/options/concat.js
@@ -6,7 +6,7 @@ module.exports = function(config) {
       src: [
         '<%= genDir %>/vendor/css/timepicker.css',
         '<%= genDir %>/vendor/css/spectrum.css',
-        '<%= genDir %>/css/bootstrap.dark.min.css',
+        '<%= genDir %>/css/grafana.dark.css',
         '<%= genDir %>/vendor/css/font-awesome.min.css'
       ],
       dest: '<%= genDir %>/css/grafana.dark.min.css'
@@ -16,7 +16,7 @@ module.exports = function(config) {
       src: [
         '<%= genDir %>/vendor/css/timepicker.css',
         '<%= genDir %>/vendor/css/spectrum.css',
-        '<%= genDir %>/css/bootstrap.light.min.css',
+        '<%= genDir %>/css/grafana.light.css',
         '<%= genDir %>/vendor/css/font-awesome.min.css'
       ],
       dest: '<%= genDir %>/css/grafana.light.min.css'
diff --git a/tasks/options/sass.js b/tasks/options/sass.js
index 3218e99e078..38e72f28a98 100644
--- a/tasks/options/sass.js
+++ b/tasks/options/sass.js
@@ -4,8 +4,8 @@ module.exports = function(config) {
     src:{
       options: {},
       files: {
-        "<%= genDir %>/css/grafana.dark.min.css": "<%= srcDir %>/less/grafana.dark.scss",
-        "<%= genDir %>/css/grafana.light.min.css": "<%= srcDir %>/less/grafana.light.scss",
+        "<%= genDir %>/css/grafana.dark.css": "<%= srcDir %>/less/grafana.dark.scss",
+        "<%= genDir %>/css/grafana.light.css": "<%= srcDir %>/less/grafana.light.scss",
       }
     }
   };
diff --git a/tasks/options/watch.js b/tasks/options/watch.js
index 8e02bb2a509..3d4ed5ac02c 100644
--- a/tasks/options/watch.js
+++ b/tasks/options/watch.js
@@ -23,7 +23,7 @@ module.exports = function(config, grunt) {
 
     if (/(\.scss)$/.test(filepath)) {
       grunt.task.run('clean:css');
-      grunt.task.run('sass');
+      grunt.task.run('css');
     }
 
     if (/(\.ts)$/.test(filepath)) {