fix less building

This commit is contained in:
Spencer Alger 2015-06-25 10:31:50 -07:00
parent 472a67d607
commit 2181f32a3b
37 changed files with 40 additions and 50 deletions

View file

@ -34,25 +34,13 @@ module.exports = function (grunt) {
lintThese: [
'Gruntfile.js',
'<%= root %>/tasks/**/*.js',
'<%= src %>/kibana/*.js',
'<%= src %>/server/**/*.js',
'<%= src %>/kibana/{components,directives,factories,filters,plugins,registry,services,utils}/**/*.js',
'<%= src %>/**/*.js',
'<%= unitTestDir %>/**/*.js',
'!<%= unitTestDir %>/specs/vislib/fixture/**/*'
],
lessFiles: [
'<%= src %>/kibana/components/*/*.less',
'<%= src %>/kibana/styles/main.less',
'<%= src %>/kibana/components/vislib/styles/main.less',
'<%= plugins %>/dashboard/styles/main.less',
'<%= plugins %>/discover/styles/main.less',
'<%= plugins %>/settings/styles/main.less',
'<%= plugins %>/visualize/styles/main.less',
'<%= plugins %>/visualize/styles/visualization.less',
'<%= plugins %>/visualize/styles/main.less',
'<%= plugins %>/table_vis/table_vis.less',
'<%= plugins %>/metric_vis/metric_vis.less',
'<%= plugins %>/markdown_vis/markdown_vis.less'
'<%= src %>/**/*.less',
'!<%= src %>/**/_*.less'
]
};

View file

@ -1,6 +1,6 @@
@import (reference) "../../../styles/_bootstrap.less";
@import (reference) "../../../styles/theme/_theme.less";
@import (reference) "../../../styles/_mixins.less";
@import (reference) "ui-styles/_bootstrap.less";
@import (reference) "ui-styles/theme/_theme.less";
@import (reference) "ui-styles/_mixins.less";
@import (reference) "lesshat.less";
@dashboard-background: @gray-lighter;

View file

@ -1,6 +1,6 @@
@import (reference) "../../../styles/_bootstrap.less";
@import (reference) "../../../styles/theme/_theme.less";
@import (reference) "../../../styles/_variables.less";
@import (reference) "ui-styles/_bootstrap.less";
@import (reference) "ui-styles/theme/_theme.less";
@import (reference) "ui-styles/_variables.less";
.application-discover {
overflow-x: hidden;

View file

@ -1,8 +1,8 @@
@import (reference) "lesshat.less";
@import (reference) "../../../styles/_bootstrap.less";
@import (reference) "../../../styles/theme/_theme.less";
@import (reference) "../../../styles/_variables.less";
@import (reference) "../../../styles/_mixins.less";
@import (reference) "ui-styles/_bootstrap.less";
@import (reference) "ui-styles/theme/_theme.less";
@import (reference) "ui-styles/_variables.less";
@import (reference) "ui-styles/_mixins.less";
kibana-settings-app,
kbn-settings-indices,

View file

@ -1,4 +1,4 @@
@import (reference) "../../../styles/main.less";
@import (reference) "ui-styles/main.less";
.vis-wizard {
h1 {
@ -54,4 +54,4 @@
}
@import "../editor/styles/editor.less";
@import "../editor/styles/.editor.less";

View file

@ -1,4 +1,4 @@
@import (reference) "../../styles/_mixins.less";
@import (reference) "ui-styles/_mixins.less";
@import (reference) "lesshat.less";
.markdown-vis {

View file

@ -1,4 +1,4 @@
@import (reference) "../../styles/_mixins.less";
@import (reference) "ui-styles/_mixins.less";
@import (reference) "lesshat.less";
.metric-vis {
@ -20,4 +20,4 @@
padding: 1em;
.flex();
}
}
}

View file

@ -1,5 +1,5 @@
@import (reference) "lesshat.less";
@import (reference) "../../styles/theme/_variables.less";
@import (reference) "ui-styles/theme/_variables.less";
kbn-agg-table,
kbn-agg-table-group {
@ -32,4 +32,4 @@ kbn-agg-table-group {
padding: 0;
}
}
}
}

View file

@ -1,5 +1,5 @@
@import (reference) "../../styles/_bootstrap.less";
@import (reference) "../../styles/theme/_theme.less";
@import (reference) "ui-styles/_bootstrap.less";
@import (reference) "ui-styles/theme/_theme.less";
@import (reference) "lesshat.less";
doc-table {

View file

@ -1,5 +1,5 @@
@import (reference) "../../styles/_bootstrap.less";
@import (reference) "../../styles/theme/_theme.less";
@import (reference) "ui-styles/_bootstrap.less";
@import (reference) "ui-styles/theme/_theme.less";
@import (reference) "lesshat.less";
doc-viewer .doc-viewer {
@ -22,4 +22,4 @@ doc-viewer .doc-viewer {
.content {
margin-top: @padding-base-vertical;
}
}
}

View file

@ -1,5 +1,5 @@
@import (reference) "../../styles/_bootstrap.less";
@import (reference) "../../styles/theme/_theme.less";
@import (reference) "ui-styles/_bootstrap.less";
@import (reference) "ui-styles/theme/_theme.less";
@import (reference) "lesshat.less";
filter-bar .confirm {

View file

@ -1,6 +1,6 @@
@import (reference) "../../styles/_bootstrap.less";
@import (reference) "../../styles/theme/_theme.less";
@import (reference) "../../styles/_variables.less";
@import (reference) "ui-styles/_bootstrap.less";
@import (reference) "ui-styles/theme/_theme.less";
@import (reference) "ui-styles/_variables.less";
.typeahead {
position: relative;

View file

@ -1,4 +1,4 @@
@import (reference) "../../../styles/main.less";
@import (reference) "ui-styles/main.less";
@import (reference) "lesshat.less";
@import "_error";
@ -7,4 +7,4 @@
@import "_svg";
@import "_tooltip";
@import "_tilemap";
@import "_alerts";
@import "_alerts";

View file

@ -1,6 +1,6 @@
@import (reference) "../../styles/_bootstrap.less";
@import (reference) "../../styles/theme/_theme.less";
@import (reference) "../../styles/_variables.less";
@import (reference) "ui-styles/_bootstrap.less";
@import (reference) "ui-styles/theme/_theme.less";
@import (reference) "ui-styles/_variables.less";
@import (reference) "lesshat.less";
visualize {

View file

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before After
Before After

View file

@ -6,9 +6,9 @@ html(lang='en')
meta(charset='utf-8')
meta(http-equiv='X-UA-Compatible', content='IE=edge,chrome=1')
meta(name='viewport', content='width=device-width')
link(rel='shortcut icon', href='/styles/theme/elk.ico')
link(rel='shortcut icon', href='/ui-styles/theme/elk.ico')
title
link(rel='stylesheet', href='/styles/main.css?_b=#{buildNumber}')
link(rel='stylesheet', href='/ui-styles/main.css?_b=#{buildNumber}')
body(kbn-chrome, ng-class="'application-' + activeApp.id")
.col-md-offset-4.col-md-4.page-header.initial-load
center

View file

@ -5,7 +5,9 @@ module.exports = {
sourceMapFileInline: true,
ieCompat: false,
paths: [
'<%= src %>/kibana/bower_components/lesshat/build/'
'bower_components/lesshat/build/',
'bower_components',
'src/plugins/ui/public'
]
},
dev: {