Merge pull request #46 from vrockai/lessFix

Fixed LESS variables broken paths
hawkular · Mar 23, 2015 · 91787d5 · 91787d5
2 parents 74bdf9f + 25606a6
commit 91787d5
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 23 deletions.
diff --git a/bower.json b/bower.json
@@ -23,7 +23,6 @@
     "!dist/*"
   ],
   "dependencies": {
-    "bootstrap": "3.3.2",
     "angular-bootstrap": "0.11.0",
     "angular-ui-select": "0.11.2",
     "bootstrap-select": "1.6",

diff --git a/build/gulpfile.js b/build/gulpfile.js
@@ -127,7 +127,9 @@ module.exports = function(gulp, config, pluginName){
       licenceFile,
       '.tmp/' + pluginName + '/compiled.js',
       '.tmp/' + pluginName + '/templates.js'])
+      .pipe(plugins.sourcemaps.init({loadMaps: true}))
       .pipe(plugins.concat(config.js(pluginName)))
+      .pipe(plugins.sourcemaps.write())
       .pipe(gulp.dest(config.dist));
   });
 

diff --git a/dist/hawkular-ui-components-accounts.js b/dist/hawkular-ui-components-accounts.js
diff --git a/dist/hawkular-ui-components-alerts.js b/dist/hawkular-ui-components-alerts.js
diff --git a/dist/hawkular-ui-components-directives.css b/dist/hawkular-ui-components-directives.css
@@ -277,7 +277,6 @@ h2 {
 }
 .metrics-boxes li.green {
   background-image: -webkit-linear-gradient(top, #fbfdfa 0%, #f1f8f0 100%);
-  background-image: -o-linear-gradient(top, #fbfdfa 0%, #f1f8f0 100%);
   background-image: linear-gradient(to bottom, #fbfdfa 0%, #f1f8f0 100%);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbfdfa', endColorstr='#fff1f8f0', GradientType=0);
@@ -290,7 +289,6 @@ h2 {
 }
 .metrics-boxes li.green:hover {
   background-image: -webkit-linear-gradient(top, #f1f8f0 0%, #f1f8f0 100%);
-  background-image: -o-linear-gradient(top, #f1f8f0 0%, #f1f8f0 100%);
   background-image: linear-gradient(to bottom, #f1f8f0 0%, #f1f8f0 100%);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff1f8f0', endColorstr='#fff1f8f0', GradientType=0);
@@ -300,7 +298,6 @@ h2 {
 }
 .metrics-boxes li.orange {
   background-image: -webkit-linear-gradient(top, #fffcfa 0%, #fef5ed 100%);
-  background-image: -o-linear-gradient(top, #fffcfa 0%, #fef5ed 100%);
   background-image: linear-gradient(to bottom, #fffcfa 0%, #fef5ed 100%);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffffcfa', endColorstr='#fffef5ed', GradientType=0);
@@ -313,7 +310,6 @@ h2 {
 }
 .metrics-boxes li.orange:hover {
   background-image: -webkit-linear-gradient(top, #fef5ed 0%, #fef5ed 100%);
-  background-image: -o-linear-gradient(top, #fef5ed 0%, #fef5ed 100%);
   background-image: linear-gradient(to bottom, #fef5ed 0%, #fef5ed 100%);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffef5ed', endColorstr='#fffef5ed', GradientType=0);
@@ -706,7 +702,6 @@ h2 {
 }
 .metrics-boxes li.green {
   background-image: -webkit-linear-gradient(top, #fbfdfa 0%, #f1f8f0 100%);
-  background-image: -o-linear-gradient(top, #fbfdfa 0%, #f1f8f0 100%);
   background-image: linear-gradient(to bottom, #fbfdfa 0%, #f1f8f0 100%);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbfdfa', endColorstr='#fff1f8f0', GradientType=0);
@@ -719,7 +714,6 @@ h2 {
 }
 .metrics-boxes li.green:hover {
   background-image: -webkit-linear-gradient(top, #f1f8f0 0%, #f1f8f0 100%);
-  background-image: -o-linear-gradient(top, #f1f8f0 0%, #f1f8f0 100%);
   background-image: linear-gradient(to bottom, #f1f8f0 0%, #f1f8f0 100%);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff1f8f0', endColorstr='#fff1f8f0', GradientType=0);
@@ -729,7 +723,6 @@ h2 {
 }
 .metrics-boxes li.orange {
   background-image: -webkit-linear-gradient(top, #fffcfa 0%, #fef5ed 100%);
-  background-image: -o-linear-gradient(top, #fffcfa 0%, #fef5ed 100%);
   background-image: linear-gradient(to bottom, #fffcfa 0%, #fef5ed 100%);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffffcfa', endColorstr='#fffef5ed', GradientType=0);
@@ -742,7 +735,6 @@ h2 {
 }
 .metrics-boxes li.orange:hover {
   background-image: -webkit-linear-gradient(top, #fef5ed 0%, #fef5ed 100%);
-  background-image: -o-linear-gradient(top, #fef5ed 0%, #fef5ed 100%);
   background-image: linear-gradient(to bottom, #fef5ed 0%, #fef5ed 100%);
   background-repeat: repeat-x;
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffef5ed', endColorstr='#fffef5ed', GradientType=0);

diff --git a/dist/hawkular-ui-components-directives.js b/dist/hawkular-ui-components-directives.js
diff --git a/dist/hawkular-ui-components-inventory.js b/dist/hawkular-ui-components-inventory.js
diff --git a/dist/hawkular-ui-components-metrics.js b/dist/hawkular-ui-components-metrics.js
diff --git a/plugins/directives/plugins/sidebar/less/main.less b/plugins/directives/plugins/sidebar/less/main.less
@@ -1,5 +1,5 @@
-@import "../../../../../libs/bootstrap/less/variables.less";
-@import "../../../../../libs/bootstrap/less/mixins.less";
+@import "../../../../../libs/patternfly/components/bootstrap/less/variables.less";
+@import "../../../../../libs/patternfly/components/bootstrap/less/mixins.less";
 @import "../../../../../libs/patternfly/less/variables.less";
 
 //variables override

diff --git a/plugins/directives/plugins/topbar/less/main.less b/plugins/directives/plugins/topbar/less/main.less
@@ -1,5 +1,5 @@
-@import "../../../../../libs/bootstrap/less/variables.less";
-@import "../../../../../libs/bootstrap/less/mixins.less";
+@import "../../../../../libs/patternfly/components/bootstrap/less/variables.less";
+@import "../../../../../libs/patternfly/components/bootstrap/less/mixins.less";
 @import "../../../../../libs/patternfly/less/variables.less";
 
 //variables override