Merge remote-tracking branch 'origin/v2' into v2

src/app/pages/dashboard/_dashboard.scss

@@ -7,6 +7,12 @@
   }
 }
 
+@media screen and (max-width: $resXXL) {
+ .panel.feed-panel {
+   height: 824px;
+ }
+}
+
 .user-stats-panel {
   .panel-title {
     padding: 0 0 15px;

src/app/pages/dashboard/dashboard.html

@@ -29,7 +29,7 @@
     </div>
   </div>
   <div class="col-lg-4 col-md-5 col-sm-12 col-xs-12">
-    <blur-panel title="Feed" class-container="large-panel with-scroll">
+    <blur-panel title="Feed" class-container="large-panel with-scroll feed-panel">
       <blur-feed></blur-feed>
     </blur-panel>
   </div>

src/app/pages/dashboard/widgets/amChart/amChart.js

@@ -40,11 +40,12 @@ blurAdminApp.directive('amChart', function () {
       var chart = AmCharts.makeChart('amchart', {
         type: 'serial',
         theme: 'blur',
-        marginTop: 0,
+        marginTop: 15,
         marginRight: 15,
         dataProvider: chartData,
         valueAxes: [
           {
+            minVerticalGap: 50,
             gridAlpha: 0
           }
         ],
@@ -63,10 +64,10 @@ blurAdminApp.directive('amChart', function () {
             fillColorsField: 'lineColor'
           }
         ],
-        chartScrollbar: {
+/*        chartScrollbar: {
           graph: 'g1',
           gridAlpha: 0,
-          color: '#888888',
+          color: '#FF0000',
           scrollbarHeight: 55,
           backgroundAlpha: 0,
           selectedBackgroundAlpha: 0.1,
@@ -78,7 +79,7 @@ blurAdminApp.directive('amChart', function () {
           graphLineColor: '#c2c2c2',
           selectedGraphLineColor: '#888888',
           selectedGraphLineAlpha: 1
-        },
+        },*/
         chartCursor: {
           categoryBalloonDateFormat: 'MM YYYY',
           categoryBalloonColor: '#4285F4',

src/app/pages/dashboard/widgets/amChartMap/amChartMap.js

@@ -8,6 +8,7 @@ blurAdminApp.directive('amChartMap', function () {
       var map = AmCharts.makeChart('amChartMap', {
         type: 'map',
         theme: 'blur',
+        zoomControl: { zoomControlEnabled: false, panControlEnabled: false },
 
         dataProvider: {
           map: 'worldLow',

src/app/pages/dashboard/widgets/blurFeed/_blurFeed.scss

@@ -63,7 +63,7 @@
       position: absolute;
       width: 30px;
       height: 30px;
-      right: -4px;
+      right: -2px;
       bottom: -4px;
       border: 2px solid #fff;
     }