refactor(global): Vova

src/app/pages/charts/amCharts/areaChart/AreaChartCtrl.js

@@ -87,7 +87,7 @@
           bullet: 'square',
           bulletBorderAlpha: 1,
           bulletBorderThickness: 1,
-          fillAlphas: 0.3,
+          fillAlphas: 0.5,
           fillColorsField: 'lineColor',
           legendValueText: '[[value]]',
           lineColorField: 'lineColor',

src/app/pages/charts/amCharts/barChart/BarChartCtrl.js

@@ -59,7 +59,7 @@
         {
           balloonText: '<b>[[category]]: [[value]]</b>',
           fillColorsField: 'color',
-          fillAlphas: 0.5,
+          fillAlphas: 0.7,
           lineAlpha: 0.2,
           type: 'column',
           valueField: 'visits'

src/app/pages/charts/amCharts/combinedChart/combinedChartCtrl.js

@@ -19,6 +19,8 @@
       "precision": 2,
       "valueAxes": [{
         color: layoutColors.default,
+        axisColor: layoutColors.default,
+        gridColor: layoutColors.default,
         "id": "v1",
         "title": "Sales",
         "position": "left",
@@ -27,6 +29,9 @@
           return "$" + Math.round(value) + "M";
         }
       }, {
+        color: layoutColors.default,
+        axisColor: layoutColors.default,
+        gridColor: layoutColors.default,
         "id": "v2",
         "title": "Market Days",
         "gridAlpha": 0,
@@ -123,14 +128,17 @@
       },
       "categoryField": "date",
       "categoryAxis": {
-        color: "#fff",
+        "axisColor": "#fff",
+        "color": "#fff",
+        "gridColor": "#fff",
         "parseDates": true,
         "dashLength": 1,
         "minorGridEnabled": true
       },
       "legend": {
         "useGraphSettings": true,
-        "position": "top"
+        "position": "top",
+        "color": "#fff"
       },
       "balloon": {
         "borderThickness": 1,

src/app/pages/charts/amCharts/funnelChart/FunnelChartCtrl.js

@@ -51,6 +51,7 @@
       funnelAlpha: 0.9,
       valueField: 'value',
       startX: 0,
+      alpha: 0.8,
       neckWidth: '0%',
       startAlpha: 0,
       outlineThickness: 1,

src/app/pages/charts/amCharts/pieChart/PieChartCtrl.js

@@ -90,6 +90,7 @@
 
       autoMargins: false,
       marginTop: 10,
+      alpha: 0.8,
       marginBottom: 0,
       marginLeft: 0,
       marginRight: 0,

src/app/pages/ui/modals/modalTemplates/dangerModal.html

@@ -1,6 +1,6 @@
 <div class="modal-content">
   <div class="modal-header bg-danger">
-    <i class="ion-flame"></i><span> Error</span>
+    <i class="ion-flame modal-icon"></i><span> Error</span>
   </div>
   <div class="modal-body text-center">Your information hasn't been saved!</div>
   <div class="modal-footer">

src/app/pages/ui/modals/modalTemplates/infoModal.html

@@ -1,6 +1,6 @@
 <div class="modal-content">
   <div class="modal-header bg-info">
-    <i class="ion-information-circled"></i><span> Information</span>
+    <i class="ion-information-circled modal-icon"></i><span> Information</span>
   </div>
   <div class="modal-body text-center">You've got a new email!</div>
   <div class="modal-footer">

src/app/pages/ui/modals/modalTemplates/successModal.html

@@ -1,6 +1,6 @@
 <div class="modal-content">
   <div class="modal-header bg-success">
-    <i class="ion-checkmark"></i><span> Success</span>
+    <i class="ion-checkmark modal-icon"></i><span> Success</span>
   </div>
   <div class="modal-body text-center">Your information has been saved successfully</div>
   <div class="modal-footer">

src/app/pages/ui/modals/modalTemplates/warningModal.html

@@ -1,6 +1,6 @@
 <div class="modal-content">
   <div class="modal-header bg-warning">
-    <i class="ion-android-warning"></i><span> Warning</span>
+    <i class="ion-android-warning modal-icon"></i><span> Warning</span>
   </div>
   <div class="modal-body text-center">Your computer is about to explode!</div>
   <div class="modal-footer">

src/app/pages/ui/notifications/notifications.html

@@ -57,56 +57,56 @@
     </div>
     <div class="col-md-2 col-sm-3 toastr-radio-setup">
       <div id="toastTypeGroup">
-        <div class="controls">
+        <div class="controls radio-controls">
           <label class="radio-header">Toast Type</label>
-          <label class="radio">
-            <input type="radio" ng-model="options.type" name="toasts" value="success"/>Success
+          <label class="radio custom-radio">
+            <input type="radio" ng-model="options.type" name="toasts" value="success"/><span>Success</span>
           </label>
-          <label class="radio">
-            <input type="radio" ng-model="options.type" name="toasts" value="info"/>Info
+          <label class="radio custom-radio">
+            <input type="radio" ng-model="options.type" name="toasts" value="info"/><span>Info</span>
           </label>
-          <label class="radio">
-            <input type="radio" ng-model="options.type" name="toasts" value="warning"/>Warning
+          <label class="radio custom-radio">
+            <input type="radio" ng-model="options.type" name="toasts" value="warning"/><span>Warning</span>
           </label>
-          <label class="radio">
-            <input type="radio" ng-model="options.type" name="toasts" value="error"/>Error
+          <label class="radio custom-radio">
+            <input type="radio" ng-model="options.type" name="toasts" value="error"/><span>Error</span>
           </label>
         </div>
       </div>
       <div id="positionGroup">
-        <div class="controls">
+        <div class="controls radio-controls">
           <label class="radio-header position-header">Position</label>
-          <label class="radio">
+          <label class="radio custom-radio">
             <input type="radio" ng-model="options.positionClass" name="positions" value="toast-top-right"/>
-            Top Right
+            <span>Top Right</span>
           </label>
-          <label class="radio">
+          <label class="radio custom-radio">
             <input type="radio" ng-model="options.positionClass" name="positions" value="toast-bottom-right"/>
-            Bottom Right
+            <span>Bottom Right</span>
           </label>
-          <label class="radio">
+          <label class="radio custom-radio">
             <input type="radio" ng-model="options.positionClass" name="positions" value="toast-bottom-left"/>
-            Bottom Left
+            <span>Bottom Left</span>
           </label>
-          <label class="radio">
+          <label class="radio custom-radio">
             <input type="radio" ng-model="options.positionClass" name="positions" value="toast-top-left"/>
-            Top Left
+            <span>Top Left</span>
           </label>
-          <label class="radio">
+          <label class="radio custom-radio">
             <input type="radio" ng-model="options.positionClass" name="positions" value="toast-top-full-width"/>
-            Top Full Width
+            <span>Top Full Width</span>
           </label>
-          <label class="radio">
+          <label class="radio custom-radio">
             <input type="radio" ng-model="options.positionClass" name="positions" value="toast-bottom-full-width"/>
-            Bottom Full Width
+            <span>Bottom Full Width</span>
           </label>
-          <label class="radio">
+          <label class="radio custom-radio">
             <input type="radio" ng-model="options.positionClass" name="positions" value="toast-top-center"/>
-            Top Center
+            <span>Top Center</span>
           </label>
-          <label class="radio">
+          <label class="radio custom-radio">
             <input type="radio" ng-model="options.positionClass" name="positions" value="toast-bottom-center"/>
-            Bottom Center
+            <span>Bottom Center</span>
           </label>
         </div>
       </div>

src/app/theme/components/sidebar/sidebar.html

@@ -30,7 +30,7 @@
                 subSubitem.title }}</a>
             </li>
           </ul>
-          <a  ng-mouseenter="hoverItem($event, item)" ng-if="!subitem.subMenu" href="{{ subitem.root }}">{{ subitem.title}}</a>
+          <a  ng-mouseenter="hoverItem($event, item)" target="{{subitem.root[0]=='#' ? '_self' : '_blank'}}" ng-if="!subitem.subMenu" href="{{ subitem.root }}">{{ subitem.title}}</a>
         </li>
       </ul>
     </li>

src/app/theme/components/sidebar/sidebar.service.js

@@ -26,11 +26,13 @@
         title: 'Menu Level 1',
         icon: 'ion-ios-more',
         subMenu: [{
-            title: 'Menu Level 1.1'
+            title: 'Menu Level 1.1',
+            root: '#'
           }, {
             title: 'Menu Level 1.2',
             subMenu: [{
-              title: 'Menu Level 1.2.1'
+              title: 'Menu Level 1.2.1',
+              root: '#'
             }]
           }]
       }];

src/index.html

@@ -25,7 +25,10 @@
   <!-- endbuild -->
 </head>
 <body>
-
+<div class="preload-images">
+  <img class="preload-bg" width="1" height="1">
+  <img class="preload-blurred-bg" width="1" height="1">
+</div>
 <main ng-if="$pageFinishedLoading" ng-class="{ 'menu-collapsed': $isMenuCollapsed }">
 
   <sidebar></sidebar>

src/sass/app/_alerts.scss

@@ -25,7 +25,7 @@
 }
 
 .bg-success {
-  background-color: $success;
+  background-color: rgba($success,0.85);
   a{
     color: $primary-charts;
     &:hover{
@@ -34,7 +34,7 @@
   }
 }
 .bg-info {
-  background-color: $info;
+  background-color: rgba($info,0.85);
   a{
     color: $warning-bg;
     &:hover{
@@ -43,7 +43,7 @@
   }
 }
 .bg-warning {
-  background-color: $warning;
+  background-color: rgba($warning,0.85);
   a{
     color: $danger;
     &:hover{
@@ -52,7 +52,7 @@
   }
 }
 .bg-danger {
-  background-color: $danger;
+  background-color: rgba($danger,0.85);
   a{
     color: $primary-light;
     &:hover{

src/sass/app/_iconsPage.scss

@@ -40,8 +40,8 @@ a.see-all-icons {
 .kameleon-row {
   width: 20%;
   float: left;
+  min-height: 80px;
   position: relative;
-  min-height: 1px;
   padding-right: 15px;
   padding-left: 15px;
   margin-bottom: 12px;

src/sass/app/_modals.scss

@@ -31,6 +31,9 @@
     border: none;
     padding-top: 0;
   }
+  .modal-icon{
+    margin-right: 3px;
+  }
   .sn-link-close {
     color: #949494;
     font-size: 30px;

src/sass/app/_notifications.scss

@@ -18,6 +18,10 @@
   }
 }
 
+.radio-controls .custom-radio{
+    margin-top: 5px;
+}
+
 @media (max-width: 991px) {
   .toastr-radio-setup {
     margin-left: 22px;

src/sass/theme/bootstrap-overrides/_panel.scss

@@ -177,6 +177,16 @@ $panel-heading-font-size: 16px;
   font-weight: $font-light;
 }
 
+div.preload-images {
+   height: 0;
+  .preload-bg{
+    background: url($images-root + 'blur-bg.jpg') no-repeat;
+  }
+  .preload-blurred-bg{
+    background: url($images-root + 'blur-bg-blurred.jpg') no-repeat;
+  }
+}
+
 /*
 .panel-group .panel {
   border-radius: 0;

src/sass/theme/bootstrap-overrides/_tabs.scss

@@ -149,7 +149,7 @@
   }
   & > li.active > a {
     color: $default;
-    background-color: rgba(0, 0, 0, .15);
+    background-color: rgba(0, 0, 0, .25);
   }
   > li:first-of-type a {
     border-top-left-radius: 5px;