Merge remote-tracking branch 'origin/master'

epicmaxco · Aug 2, 2017 · 2ae5a32 · 2ae5a32
2 parents b0a4284 + b093653
commit 2ae5a32
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/components/extra/Extra.vue b/src/components/extra/Extra.vue
@@ -30,7 +30,7 @@
           <overview-tab></overview-tab>
         </div>
         <div slot="Chart" class="d-flex justify-content-center">
-          <vuestic-chart v-bind:data="bubbleChartData" type="bubble"></vuestic-chart>
+          <vuestic-chart v-bind:data="chartData" type="line"></vuestic-chart>
         </div>
         <div slot="Setup Profile" class="d-flex justify-content-center">
           <setup-profile-tab wizardType="simple"></setup-profile-tab>
@@ -78,7 +78,7 @@
   import VuesticSocialNews from '../vuestic-components/vuestic-social-news/VuesticSocialNews.vue'
   import OverviewTab from '../dashboard/overview-tab/OverviewTab.vue'
   import SetupProfileTab from '../dashboard/setup-profile-tab/SetupProfileTab.vue'
-  import BubbleChartData from '../statistics/charts/BubbleChartData'
+  import chartData from '../statistics/charts/LineChartData'
 
   export default {
     name: 'extra',
@@ -172,7 +172,7 @@
             photoURL: 'http://i.imgur.com/pgrHrPu.png'
           }
         ],
-        bubbleChartData: BubbleChartData
+        chartData: chartData
       }
     }
   }
@@ -181,7 +181,6 @@
 <style lang="scss">
   .tabs {
     .overview-tab {
-      padding-top: 0 !important;
       .explore-row {
         display: none !important;
       }

diff --git a/src/components/vuestic-components/vuestic-multi-select/VuesticMultiSelect.vue b/src/components/vuestic-components/vuestic-multi-select/VuesticMultiSelect.vue
@@ -114,7 +114,9 @@
     .dropdown-menu {
       padding: 0;
       .vuestic-scrollbar {
-        height: $dropdown-item-height * 4;
+        .scrollbar-wrapper {
+          max-height: $dropdown-item-height * 4;
+        }
       }
     }
   }

diff --git a/src/components/vuestic-components/vuestic-simple-select/VuesticSimpleSelect.vue b/src/components/vuestic-components/vuestic-simple-select/VuesticSimpleSelect.vue
@@ -103,7 +103,9 @@
     .dropdown-menu {
       padding: 0;
       .vuestic-scrollbar {
-        height: $dropdown-item-height * 4;
+        .scrollbar-wrapper {
+          max-height: $dropdown-item-height * 4;
+        }
       }
     }
   }

diff --git a/src/components/vuestic-components/vuestic-tabs/VuesticTabs.vue b/src/components/vuestic-components/vuestic-tabs/VuesticTabs.vue
@@ -79,7 +79,6 @@
       width: 100%;
       height: .125rem;
       position: relative;
-      padding-bottom: $tab-content-pt;
       div[class^='underscore-']{
         background-color: $brand-primary;
         height: .125rem;
@@ -101,7 +100,7 @@
     }
     .tab-content {
       padding-bottom: $tab-content-pb;
-
+      padding-top: $tab-content-pt;
       > .tab-pane {
         width: 100%
       }