IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

move to sass is starting to work

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/less/base/base.scss
View File

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

1
public/less/components/navbar.scss
View File

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

2
tasks/default_task.js
View File

@ -2,7 +2,7 @@
module.exports = function(grunt) { module.exports = function(grunt) {
'use strict'; 'use strict';
grunt.registerTask('css', ['less', 'concat:cssDark', 'concat:cssLight']); grunt.registerTask('css', ['sass', 'concat:cssDark', 'concat:cssLight']);
grunt.registerTask('default', [ grunt.registerTask('default', [
'jscs', 'jscs',
'jshint', 'jshint',

4
tasks/options/concat.js
View File

@ -6,7 +6,7 @@ module.exports = function(config) {
src: [ src: [
'<%= genDir %>/vendor/css/timepicker.css', '<%= genDir %>/vendor/css/timepicker.css',
'<%= genDir %>/vendor/css/spectrum.css', '<%= genDir %>/vendor/css/spectrum.css',
'<%= genDir %>/css/bootstrap.dark.min.css', '<%= genDir %>/css/grafana.dark.css',
'<%= genDir %>/vendor/css/font-awesome.min.css' '<%= genDir %>/vendor/css/font-awesome.min.css'
], ],
dest: '<%= genDir %>/css/grafana.dark.min.css' dest: '<%= genDir %>/css/grafana.dark.min.css'
@ -16,7 +16,7 @@ module.exports = function(config) {
src: [ src: [
'<%= genDir %>/vendor/css/timepicker.css', '<%= genDir %>/vendor/css/timepicker.css',
'<%= genDir %>/vendor/css/spectrum.css', '<%= genDir %>/vendor/css/spectrum.css',
'<%= genDir %>/css/bootstrap.light.min.css', '<%= genDir %>/css/grafana.light.css',
'<%= genDir %>/vendor/css/font-awesome.min.css' '<%= genDir %>/vendor/css/font-awesome.min.css'
], ],
dest: '<%= genDir %>/css/grafana.light.min.css' dest: '<%= genDir %>/css/grafana.light.min.css'

4
tasks/options/sass.js
View File

@ -4,8 +4,8 @@ module.exports = function(config) {
src:{ src:{
options: {}, options: {},
files: { files: {
"<%= genDir %>/css/grafana.dark.min.css": "<%= srcDir %>/less/grafana.dark.scss", "<%= genDir %>/css/grafana.dark.css": "<%= srcDir %>/less/grafana.dark.scss",
"<%= genDir %>/css/grafana.light.min.css": "<%= srcDir %>/less/grafana.light.scss", "<%= genDir %>/css/grafana.light.css": "<%= srcDir %>/less/grafana.light.scss",
} }
} }
}; };

2
tasks/options/watch.js
View File

@ -23,7 +23,7 @@ module.exports = function(config, grunt) {
if (/(\.scss)$/.test(filepath)) { if (/(\.scss)$/.test(filepath)) {
grunt.task.run('clean:css'); grunt.task.run('clean:css');
grunt.task.run('sass'); grunt.task.run('css');
} }
if (/(\.ts)$/.test(filepath)) { if (/(\.ts)$/.test(filepath)) {