update design bundle

This commit is contained in:
Eric Hulburd
2016-03-11 19:01:59 -06:00
parent 782f5cbf91
commit cdd6f8dc0f
7 changed files with 36 additions and 6 deletions

View File

@@ -1 +1 @@
export const COMPONENT_MAP = {"energy":"dashboard/energy/energy","energy_graph":"dashboard/energy/graph/graph","energy_table":"dashboard/energy/table/table","layout":"dashboard/layout/layout","power_graph":"dashboard/power/graph/graph","power":"dashboard/power/power","power_table":"dashboard/power/table/table"}
export const COMPONENT_MAP = {"energy":"dashboard/energy/energy","energy_graph":"dashboard/energy/graph/graph","energy_table":"dashboard/energy/table/table","irradiance_graph":"dashboard/irradiance/graph/graph","irradiance":"dashboard/irradiance/irradiance","irradiance_table":"dashboard/irradiance/table/table","layout":"dashboard/layout/layout","power_graph":"dashboard/power/graph/graph","power":"dashboard/power/power","power_table":"dashboard/power/table/table"}

View File

@@ -1,4 +1,5 @@
// Vendor Stylesheets
require('bootstrap/dist/css/bootstrap.min.css');
require('c3/c3.min.css')
require(__dirname + '/../../d3/chart.scss');

View File

@@ -13,7 +13,6 @@ class Styles {
});
all.push(done);
}
var app_styles =
all.push(Styles.addAppCss()
.then((result)=>{ if(result)css += result; }));
return Promise.all(all)
@@ -25,7 +24,11 @@ class Styles {
static addCss(view, fnResolve){
return jQuery.ajax({
url: COMPONENT_MAP[view] + '.scss'
}).then((scss)=>{
})
.fail(()=>{
fnResolve('');
})
.then((scss)=>{
var sass = new Sass();
if (!scss) return fnResolve("");
sass.compile(scss, (result, a)=>{
@@ -38,7 +41,11 @@ class Styles {
return new Promise((fnResolve, fnReject)=>{
jQuery.ajax({
url: '/dashboard/app.scss'
}).then((scss)=>{
})
.fail(()=>{
fnResolve('');
})
.then((scss)=>{
var sass = new Sass();
sass.compile(scss, (result, a)=>{
fnResolve(result.text);