move to sass is starting to work

pull/4072/head
Torkel Ödegaard 10 years ago
parent 30ddfc7a28
commit 1e891f434d
  1. 16
      public/less/base/base.scss
  2. 1
      public/less/components/navbar.scss
  3. 2
      tasks/default_task.js
  4. 4
      tasks/options/concat.js
  5. 4
      tasks/options/sass.js
  6. 2
      tasks/options/watch.js

@ -19,10 +19,18 @@ body {
a {
color: $linkColor;
text-decoration: none;
}
a:hover,
a:focus {
color: $linkColorHover;
&:hover,
&:focus {
color: $linkColorHover;
text-decoration: none;
}
&:focus {
@include tab-focus();
}
}
img {
vertical-align: middle;
}

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

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

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

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

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

Loading…
Cancel
Save