refactor(global): little fixes after rewiew with Konstantin

johnny5tw · Feb 18, 2016 · 23d1277 · 23d1277
1 parent ef3ea26
commit 23d1277
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 37 deletions.
diff --git a/src/app/pages/charts/chartJs/chartJs1DCtrl.js b/src/app/pages/charts/chartJs/chartJs1DCtrl.js
@@ -11,8 +11,8 @@
   /** @ngInject */
   function chartJs1DCtrl($scope) {
 
-    $scope.labels =["Sleeping", "Designing", "Coding", "Cycling", "Running"];
-    $scope.data = [20, 40, 5, 35, 10];
+    $scope.labels =["Sleeping", "Designing", "Coding", "Cycling"];
+    $scope.data = [20, 40, 5, 35];
     $scope.options = {
       segmentStrokeColor : "rgba(0,0,0,0)"
     };

diff --git a/src/app/pages/maps/map-lines/MapLinesPageCtrl.js b/src/app/pages/maps/map-lines/MapLinesPageCtrl.js
@@ -77,16 +77,16 @@
               left: 100,
               top: 45,
               labelShiftY: 5,
-              color: layoutColors.danger,
-              labelColor: layoutColors.danger,
-              labelRollOverColor: layoutColors.danger,
+              color: layoutColors.default,
+              labelColor: layoutColors.default,
+              labelRollOverColor: layoutColors.default,
               labelFontSize: 20
             }, {
               label: 'show flights from Vilnius',
               left: 106,
               top: 70,
-              labelColor: layoutColors.warningBg,
-              labelRollOverColor: layoutColors.danger,
+              labelColor: layoutColors.default,
+              labelRollOverColor: layoutColors.default,
               labelFontSize: 11,
               linkToObject: 'vilnius'
             } ]
@@ -145,16 +145,16 @@
                 left: 100,
                 top: 45,
                 labelShiftY: 5,
-                color: layoutColors.danger,
-                labelColor: layoutColors.danger,
-                labelRollOverColor: layoutColors.danger,
+                color: layoutColors.default,
+                labelColor: layoutColors.default,
+                labelRollOverColor: layoutColors.default,
                 labelFontSize: 20
               }, {
                 label: 'show flights from London',
                 left: 106,
                 top: 70,
-                labelColor: layoutColors.warningBg,
-                labelRollOverColor: layoutColors.danger,
+                labelColor: layoutColors.default,
+                labelRollOverColor: layoutColors.default,
                 labelFontSize: 11,
                 linkToObject: 'london'
               } ]
@@ -252,14 +252,14 @@
         },
 
         imagesSettings: {
-          color: layoutColors.danger,
-          rollOverColor: layoutColors.danger,
-          selectedColor: layoutColors.warningBg
+          color: layoutColors.warningBg,
+          rollOverColor: layoutColors.warningBg,
+          selectedColor: layoutColors.warning
         },
 
         linesSettings: {
-          color: layoutColors.danger,
-          alpha: 0.4
+          color: layoutColors.warningBg,
+          alpha: 0.8
         },
 
 

diff --git a/src/app/pages/ui/slider/slider.html b/src/app/pages/ui/slider/slider.html
@@ -9,7 +9,7 @@ <h5>Basic</h5>
                     max="100"
                     from="45"
                     disable="false"
-                    timeout="300">
+                    timeout="2010">
         </ion-slider>
       </div>
       <div>
@@ -21,7 +21,7 @@ <h5>With prefix</h5>
                     prefix="$"
                     from="420"
                     disable="false"
-                    timeout="300">
+                    timeout="2010">
         </ion-slider>
       </div>
       <div>
@@ -33,7 +33,7 @@ <h5>With postfix</h5>
                     postfix="°"
                     from="36"
                     disable="false"
-                    timeout="300">
+                    timeout="2010">
         </ion-slider>
       </div>
       <div>
@@ -45,7 +45,7 @@ <h5>Two way range</h5>
                     from="420"
                     to="900"
                     disable="false"
-                    timeout="300">
+                    timeout="2010">
         </ion-slider>
       </div>
       <div>
@@ -57,7 +57,7 @@ <h5>With Steps</h5>
                     from="300"
                     step="50"
                     disable="false"
-                    timeout="300">
+                    timeout="2010">
         </ion-slider>
       </div>
       <div>
@@ -71,7 +71,7 @@ <h5>Decorating numbers</h5>
                     prettify-separator="."
                     prettify="true"
                     disable="false"
-                    timeout="300">
+                    timeout="2010">
         </ion-slider>
       </div>
       <div>
@@ -85,7 +85,7 @@ <h5>Using custom values array</h5>
                             'July', 'August', 'September',
                             'October', 'November', 'December']"
                     disable="false"
-                    timeout="300">
+                    timeout="2010">
         </ion-slider>
       </div>
       <div>
@@ -96,7 +96,7 @@ <h5>Disabled</h5>
                     max="100"
                     from="45"
                     disable="true"
-                    timeout="300">
+                    timeout="2010">
         </ion-slider>
       </div>
     </div>

diff --git a/src/app/pages/ui/tabs/tabs.module.js b/src/app/pages/ui/tabs/tabs.module.js
@@ -14,7 +14,7 @@
         .state('ui.tabs', {
           url: '/tabs',
           templateUrl: 'app/pages/ui/tabs/tabs.html',
-          title: 'Tabs and Accordions',
+          title: 'Tabs & Accordions',
           sidebarMeta: {
             order: 800,
           },

diff --git a/src/sass/app/_form.scss b/src/sass/app/_form.scss
@@ -430,7 +430,6 @@ label.custom-input-danger {
 .bootstrap-select {
   .btn-default {
     background: transparent;
-    border-color: $default;
     color: #555555;
     &:focus {
       background: #ffffff;

diff --git a/src/sass/theme/_buttons.scss b/src/sass/theme/_buttons.scss
@@ -64,7 +64,7 @@ $hover: 24;
 }
 
 .btn-default {
-  border-width: 2px;
+  border-width: 1px;
   @include buttonColor(transparent, $default);
 }
 

diff --git a/src/sass/theme/conf/_mixins.scss b/src/sass/theme/conf/_mixins.scss
@@ -100,9 +100,6 @@
   .help-block{
     color: $color;
   }
-  .traffic-text {
-    color: $warning;
-  }
   .feed-message .message-time, .text-muted {
     color: darken($color, 20);
   }

diff --git a/src/sass/theme/conf/_variables.scss b/src/sass/theme/conf/_variables.scss
@@ -29,7 +29,7 @@ $warning-charts :#b9f2a1;
 $danger-charts  :#ffa76d;
 $default-charts :#ffffff;
 
-$view-total :#242343;
+$view-total :rgba(0,0,0,.4);
 
 
 $accent: #E3FF53;

diff --git a/src/sass/theme/dashboard/_popularApp.scss b/src/sass/theme/dashboard/_popularApp.scss
@@ -5,7 +5,7 @@
 
   .popular-app-img {
     position: relative;
-    background: #2d2d2d;
+    background: rgba(0, 0, 0, 0.5);
     padding: 30px 0;
     height: 260px;
     border-top-right-radius: 5px;
@@ -40,14 +40,13 @@
   }
 }
 
-
-body.badmin-transparent{
+body.badmin-transparent {
   .popular-app-img {
     border-top-right-radius: 5px;
     border-top-left-radius: 5px;
   }
-  .popular-app-cost{
-    border-bottom: 1px solid rgba(0,0,0,0.12);
+  .popular-app-cost {
+    border-bottom: 1px solid rgba(0, 0, 0, 0.12);
     box-shadow: 0px 1px 0px 0px rgba(255, 255, 255, 0.12);
   }
 }