From 71b09a5b40dc8a68ee937e19e8b7a110da4194ff Mon Sep 17 00:00:00 2001 From: papasikis Date: Wed, 2 Aug 2017 14:53:23 +0300 Subject: [PATCH 1/2] fix(vuestic-select): fixed croll in vuestic-selects --- .../vuestic-multi-select/VuesticMultiSelect.vue | 4 +++- .../vuestic-simple-select/VuesticSimpleSelect.vue | 4 +++- .../vuestic-components/vuestic-tabs/VuesticTabs.vue | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/components/vuestic-components/vuestic-multi-select/VuesticMultiSelect.vue b/src/components/vuestic-components/vuestic-multi-select/VuesticMultiSelect.vue index cadc00625..9bd936f00 100755 --- 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 index 497504f98..cab725f4e 100755 --- 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 index 88d3924e3..a894d1b10 100644 --- 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% } From b093653682798d1c08df18cc93705f745eeba4c6 Mon Sep 17 00:00:00 2001 From: papasikis Date: Wed, 2 Aug 2017 15:04:21 +0300 Subject: [PATCH 2/2] fix(extra): fixed tabs content --- src/components/extra/Extra.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/components/extra/Extra.vue b/src/components/extra/Extra.vue index c20a3b05b..7c6beb25d 100644 --- a/src/components/extra/Extra.vue +++ b/src/components/extra/Extra.vue @@ -30,7 +30,7 @@
- +
@@ -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 @@