From 26d30c2fb0e221025c69650a7ac711582459ade0 Mon Sep 17 00:00:00 2001 From: woothu <32914662+woothu@users.noreply.github.com> Date: Tue, 15 Oct 2019 10:53:25 +0200 Subject: [PATCH] refactor: small fixes and refactors, update coreui styles --- package.json | 2 +- src/containers/TheHeader.vue | 10 +-- src/containers/TheSidebar.vue | 8 +- src/views/base/Cards.vue | 4 +- src/views/base/Forms.vue | 18 ++-- src/views/base/Navbars.vue | 10 +-- src/views/base/ProgressBars.vue | 20 ++--- src/views/base/Table.vue | 2 +- src/views/buttons/ButtonGroups.vue | 134 ++++++++++++++--------------- src/views/notifications/Modals.vue | 22 ++--- src/views/users/UsersData.js | 53 ++++++------ 11 files changed, 144 insertions(+), 139 deletions(-) diff --git a/package.json b/package.json index 7f2f561c..06e4da59 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "test:e2e": "vue-cli-service test:e2e" }, "dependencies": { - "@coreui/coreui": "3.0.0-alpha.13", + "@coreui/coreui": "3.0.0-alpha.14", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.3.1", "@coreui/coreui-vue-chartjs": "../coreui-vue-chartjs", "@coreui/icons": "github:coreui/coreui-icons#v1-alpha", diff --git a/src/containers/TheHeader.vue b/src/containers/TheHeader.vue index ff0277ed..bc237460 100644 --- a/src/containers/TheHeader.vue +++ b/src/containers/TheHeader.vue @@ -2,7 +2,7 @@ CoreUI Logo - - +
diff --git a/src/containers/TheSidebar.vue b/src/containers/TheSidebar.vue index f0742feb..8badf6e9 100644 --- a/src/containers/TheSidebar.vue +++ b/src/containers/TheSidebar.vue @@ -13,7 +13,7 @@ @@ -26,8 +26,12 @@ export default { data () { return { minimize: false, - nav + nav, + show: null } + }, + mounted () { + this.$root.$on('toggle-sidebar', () => this.show = !this.show) } } diff --git a/src/views/base/Cards.vue b/src/views/base/Cards.vue index 3e88871b..e4052c02 100644 --- a/src/views/base/Cards.vue +++ b/src/views/base/Cards.vue @@ -66,7 +66,9 @@ Card with label 42 - + + {{loremIpsum}} + diff --git a/src/views/base/Forms.vue b/src/views/base/Forms.vue index 846b0081..b2c69359 100644 --- a/src/views/base/Forms.vue +++ b/src/views/base/Forms.vue @@ -210,14 +210,14 @@ @@ -561,7 +561,7 @@