move to sass is starting to work

This commit is contained in:
Torkel Ödegaard 2016-02-15 16:44:23 +01:00
parent 30ddfc7a28
commit 1e891f434d
6 changed files with 18 additions and 11 deletions

View File

@ -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;
}

View File

@ -11,7 +11,6 @@
padding-right: 20px;
background-color: $navbarBackground;
border-bottom: $navbarBorder;
@include clearfix();
}

View File

@ -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',

View File

@ -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'

View File

@ -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",
}
}
};

View File

@ -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)) {