From 767a39d904e1e936e7a6c16b814530c97fda7b9d Mon Sep 17 00:00:00 2001
From: woothu <32914662+woothu@users.noreply.github.com>
Date: Wed, 16 Oct 2019 16:17:34 +0200
Subject: [PATCH] fix: fix template styles

---
 src/containers/TheHeader.vue              |  3 ++-
 src/containers/TheHeaderDropdownAccnt.vue | 16 ++++++++--------
 src/containers/TheSidebar.vue             |  5 +++--
 src/containers/_nav.js                    |  6 +++---
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/containers/TheHeader.vue b/src/containers/TheHeader.vue
index bc237460..e17500ae 100644
--- a/src/containers/TheHeader.vue
+++ b/src/containers/TheHeader.vue
@@ -1,6 +1,7 @@
 <template>
   <CHeader fixed with-subheader light>
-    <CSidebarToggler 
+    <CToggler
+      in-header
       class="c-header-toggler ml-3"
       v-c-emit-root-event:toggle-sidebar
     />
diff --git a/src/containers/TheHeaderDropdownAccnt.vue b/src/containers/TheHeaderDropdownAccnt.vue
index c95c8b2d..620a4e67 100644
--- a/src/containers/TheHeaderDropdownAccnt.vue
+++ b/src/containers/TheHeaderDropdownAccnt.vue
@@ -17,29 +17,29 @@
         </div>
       </CLink>
     </template>
-    <CDropdownHeader tag="div" class="text-center" variant="light">
+    <CDropdownHeader tag="div" class="text-center" color="light">
       <strong>Account</strong>
     </CDropdownHeader>
     <CDropdownItem>
       <i class="cui-bell mr-2"/> Updates
-      <CBadge variant="info" class="ml-auto">{{ itemsCount }}</CBadge>
+      <CBadge color="info" class="ml-auto">{{ itemsCount }}</CBadge>
     </CDropdownItem>
     <CDropdownItem>
       <i class="cui-envelope-open mr-2" /> Messages
-      <CBadge variant="success" class="ml-auto">{{ itemsCount }}</CBadge>
+      <CBadge color="success" class="ml-auto">{{ itemsCount }}</CBadge>
     </CDropdownItem>
     <CDropdownItem>
       <i class="cui-task mr-2" /> Tasks
-      <CBadge variant="danger" class="ml-auto">{{ itemsCount }}</CBadge>
+      <CBadge color="danger" class="ml-auto">{{ itemsCount }}</CBadge>
     </CDropdownItem>
     <CDropdownItem>
       <i class="cui-comment-square mr-2" /> Comments
-      <CBadge variant="warning" class="ml-auto">{{ itemsCount }}</CBadge>
+      <CBadge color="warning" class="ml-auto">{{ itemsCount }}</CBadge>
     </CDropdownItem>
     <CDropdownHeader
       tag="div"
       class="text-center"
-      variant="light"
+      color="light"
     >
       <strong>Settings</strong>
     </CDropdownHeader>
@@ -51,11 +51,11 @@
     </CDropdownItem>
     <CDropdownItem>
       <i class="cui-dollar mr-2" /> Payments
-      <CBadge variant="secondary" class="ml-auto">{{ itemsCount }}</CBadge>
+      <CBadge color="secondary" class="ml-auto">{{ itemsCount }}</CBadge>
     </CDropdownItem>
     <CDropdownItem>
       <i class="cui-file mr-2" /> Projects
-      <CBadge variant="primary" class="ml-auto">{{ itemsCount }}</CBadge>
+      <CBadge color="primary" class="ml-auto">{{ itemsCount }}</CBadge>
     </CDropdownItem>
     <CDropdownDivider/>
     <CDropdownItem>
diff --git a/src/containers/TheSidebar.vue b/src/containers/TheSidebar.vue
index 8badf6e9..b983e8ce 100644
--- a/src/containers/TheSidebar.vue
+++ b/src/containers/TheSidebar.vue
@@ -2,6 +2,7 @@
   <CSidebar 
     fixed 
     :minimize="minimize"
+    :show="show"
   >
     <CSidebarBrand 
       fullSrc="img/brand/coreui-base-white.svg" 
@@ -13,7 +14,7 @@
     <CRenderFunction :contentToRender="nav"/>
     <!-- <CSidebarFooter/> -->
     <CSidebarMinimizer 
-      class="d-md-down-none c-sidebar-minimized-unfoldable"
+      class="d-md-down-none"
       @click.native="minimize = !minimize"
     />
   </CSidebar>
@@ -27,7 +28,7 @@ export default {
     return {
       minimize: false,
       nav,
-      show: null
+      show: true
     }
   },
   mounted () {
diff --git a/src/containers/_nav.js b/src/containers/_nav.js
index 6f1104f7..0ae46af0 100644
--- a/src/containers/_nav.js
+++ b/src/containers/_nav.js
@@ -9,7 +9,7 @@ export default [
           to: '/dashboard',
           icon: 'cui-speedometer',
           badge: {
-            variant: 'primary',
+            color: 'primary',
             textHtml: 'NEW'
           }
         }
@@ -295,7 +295,7 @@ export default [
               to: '/icons/coreui-icons',
               icon: 'cui-star',
               badge: {
-                variant: 'info',
+                color: 'info',
                 textHtml: 'NEW'
               }
             }
@@ -373,7 +373,7 @@ export default [
           to: '/widgets',
           icon: 'cui-calculator',
           badge: {
-            variant: 'primary',
+            color: 'primary',
             textHtml: 'NEW',
             pill: true
           }