From 44f80324df82e4472057f93c13500ff8b36a02f7 Mon Sep 17 00:00:00 2001
From: woothu <32914662+woothu@users.noreply.github.com>
Date: Fri, 20 Sep 2019 18:07:44 +0200
Subject: [PATCH] refactor: adjust header and sidebar to new styles

---
 public/img/brand/coreui-base-white.svg        | 24 +++++++
 public/img/brand/coreui-base.svg              | 24 +++++++
 public/img/brand/coreui-signet-white.svg      | 16 +++++
 public/img/brand/coreui-signet.svg            | 16 +++++
 public/img/brand/logo.svg                     | 53 ---------------
 public/img/brand/sygnet.svg                   | 53 ---------------
 src/containers/DefaultContainer.vue           | 25 +++----
 src/containers/DefaultHeaderDropdownAccnt.vue | 26 ++++----
 src/containers/TheHeader.vue                  | 66 +++++++------------
 src/containers/TheSidebar.vue                 |  5 ++
 src/containers/_nav.js                        |  6 +-
 11 files changed, 139 insertions(+), 175 deletions(-)
 create mode 100644 public/img/brand/coreui-base-white.svg
 create mode 100644 public/img/brand/coreui-base.svg
 create mode 100644 public/img/brand/coreui-signet-white.svg
 create mode 100644 public/img/brand/coreui-signet.svg
 delete mode 100644 public/img/brand/logo.svg
 delete mode 100644 public/img/brand/sygnet.svg

diff --git a/public/img/brand/coreui-base-white.svg b/public/img/brand/coreui-base-white.svg
new file mode 100644
index 00000000..047dbdf5
--- /dev/null
+++ b/public/img/brand/coreui-base-white.svg
@@ -0,0 +1,24 @@
+<svg id="Warstwa_1" data-name="Warstwa 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 376 178">
+  <defs>
+    <style>
+      .cls-2 {
+        fill: #fff;
+      }
+    </style>
+  </defs>
+  <title>Base_negative</title>
+  <g>
+    <g>
+      <path class="cls-2" d="M128,56.1244,89,33.6077a12,12,0,0,0-12,0L38,56.1243a12.0339,12.0339,0,0,0-6,10.3924V111.55a12.0333,12.0333,0,0,0,6,10.3923L77,144.459a12,12,0,0,0,12,0l39-22.5167a12.0333,12.0333,0,0,0,6-10.3923V66.5167A12.0336,12.0336,0,0,0,128,56.1244ZM126,111.55a4,4,0,0,1-2,3.4641L85,137.5308a4,4,0,0,1-4,0L42,115.0141a4,4,0,0,1-2-3.4641V66.5167a4,4,0,0,1,2-3.4641L81,40.5359a4,4,0,0,1,4,0l39,22.5167a4,4,0,0,1,2,3.4641Z"/>
+      <path class="cls-2" d="M106.0216,102.0713h-2.866a3.9993,3.9993,0,0,0-1.9246.4935L83.95,112.05,64,100.5315V77.554L83.95,66.0354l17.2894,9.455a4,4,0,0,0,1.9192.4905h2.8632a2,2,0,0,0,2-2V71.2691a2,2,0,0,0-1.04-1.7547L87.793,59.0188a8.0391,8.0391,0,0,0-7.8428.09L60,70.6262A8.0245,8.0245,0,0,0,56,77.5549v22.976a8,8,0,0,0,4,6.9283l19.95,11.5186a8.0429,8.0429,0,0,0,7.8433.0879l19.19-10.5312a2,2,0,0,0,1.0378-1.7533v-2.71A2,2,0,0,0,106.0216,102.0713Z"/>
+    </g>
+    <g>
+      <path class="cls-2" d="M200.7447,65.4285a15.0166,15.0166,0,0,0-15,14.9995V97.7054a15,15,0,1,0,30,0V80.428A15.0166,15.0166,0,0,0,200.7447,65.4285Zm7,32.2769a7,7,0,1,1-14,0V80.428a7,7,0,0,1,14,0Z"/>
+      <path class="cls-2" d="M164.0788,73.4878a7.01,7.01,0,0,1,7.8681,6.0752.9893.9893,0,0,0,.9843.865h6.0305a1.0109,1.0109,0,0,0,.9987-1.0971,15.0183,15.0183,0,0,0-15.7162-13.8837A15.288,15.288,0,0,0,150,80.8635V97.27a15.288,15.288,0,0,0,14.2441,15.4163A15.0184,15.0184,0,0,0,179.96,98.8025a1.0108,1.0108,0,0,0-.9987-1.0971h-6.0305a.9893.9893,0,0,0-.9843.865,7.01,7.01,0,0,1-7.868,6.0757A7.1642,7.1642,0,0,1,158,97.4612V80.6724A7.1638,7.1638,0,0,1,164.0788,73.4878Z"/>
+      <path class="cls-2" d="M246.9222,92.9944a12.1584,12.1584,0,0,0,7.1842-11.0771V78.2161A12.1494,12.1494,0,0,0,241.957,66.0667H225a1,1,0,0,0-1,1v44a1,1,0,0,0,1,1h6a1,1,0,0,0,1-1v-17h6.6215l7.9154,17.4138a1,1,0,0,0,.91.5862h6.5911a1,1,0,0,0,.91-1.4138Zm-.8158-11.0771a4.1538,4.1538,0,0,1-4.1489,4.1494h-9.8511v-12h9.8511a4.1538,4.1538,0,0,1,4.1489,4.1494Z"/>
+      <path class="cls-2" d="M289,66.0667H263a1,1,0,0,0-1,1v44a1,1,0,0,0,1,1h26a1,1,0,0,0,1-1v-6a1,1,0,0,0-1-1H270v-12h13a1,1,0,0,0,1-1v-6a1,1,0,0,0-1-1H270v-10h19a1,1,0,0,0,1-1v-6A1,1,0,0,0,289,66.0667Z"/>
+      <path class="cls-2" d="M327,66.0667h-6a1,1,0,0,0-1,1V89.7142a7.0066,7.0066,0,1,1-14,0V67.0667a1,1,0,0,0-1-1h-6a1,1,0,0,0-1,1V89.7142a15.0031,15.0031,0,1,0,30,0V67.0667A1,1,0,0,0,327,66.0667Z"/>
+      <rect class="cls-2" x="336" y="66.0667" width="8" height="38" rx="1"/>
+    </g>
+  </g>
+</svg>
diff --git a/public/img/brand/coreui-base.svg b/public/img/brand/coreui-base.svg
new file mode 100644
index 00000000..b452672b
--- /dev/null
+++ b/public/img/brand/coreui-base.svg
@@ -0,0 +1,24 @@
+<svg id="Warstwa_1" data-name="Warstwa 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 376.0106 178">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #3c4b64;
+      }
+    </style>
+  </defs>
+  <title>Base</title>
+  <g>
+    <g>
+      <path class="cls-1" d="M128,56.1244,89,33.6077a12,12,0,0,0-12,0L38,56.1243a12.0339,12.0339,0,0,0-6,10.3924V111.55a12.0333,12.0333,0,0,0,6,10.3923L77,144.459a12,12,0,0,0,12,0l39-22.5167a12.0333,12.0333,0,0,0,6-10.3923V66.5167A12.0336,12.0336,0,0,0,128,56.1244ZM126,111.55a4,4,0,0,1-2,3.4641L85,137.5308a4,4,0,0,1-4,0L42,115.0141a4,4,0,0,1-2-3.4641V66.5167a4,4,0,0,1,2-3.4641L81,40.5359a4,4,0,0,1,4,0l39,22.5167a4,4,0,0,1,2,3.4641Z"/>
+      <path class="cls-1" d="M106.0216,102.0713h-2.866a3.9993,3.9993,0,0,0-1.9246.4935L83.95,112.05,64,100.5315V77.554L83.95,66.0354l17.2894,9.455a4,4,0,0,0,1.9192.4905h2.8632a2,2,0,0,0,2-2V71.2691a2,2,0,0,0-1.04-1.7547L87.793,59.0188a8.0391,8.0391,0,0,0-7.8428.09L60,70.6262A8.0245,8.0245,0,0,0,56,77.5549v22.976a8,8,0,0,0,4,6.9283l19.95,11.5186a8.0429,8.0429,0,0,0,7.8433.0879l19.19-10.5312a2,2,0,0,0,1.0378-1.7533v-2.71A2,2,0,0,0,106.0216,102.0713Z"/>
+    </g>
+    <g>
+      <path class="cls-1" d="M200.7447,65.4285a15.0166,15.0166,0,0,0-15,14.9995V97.7054a15,15,0,1,0,30,0V80.428A15.0166,15.0166,0,0,0,200.7447,65.4285Zm7,32.2769a7,7,0,1,1-14,0V80.428a7,7,0,0,1,14,0Z"/>
+      <path class="cls-1" d="M164.0788,73.4878a7.01,7.01,0,0,1,7.8681,6.0752.9893.9893,0,0,0,.9843.865h6.0305a1.0109,1.0109,0,0,0,.9987-1.0971,15.0183,15.0183,0,0,0-15.7162-13.8837A15.288,15.288,0,0,0,150,80.8635V97.27a15.288,15.288,0,0,0,14.2441,15.4163A15.0184,15.0184,0,0,0,179.96,98.8025a1.0108,1.0108,0,0,0-.9987-1.0971h-6.0305a.9893.9893,0,0,0-.9843.865,7.01,7.01,0,0,1-7.868,6.0757A7.1642,7.1642,0,0,1,158,97.4612V80.6724A7.1638,7.1638,0,0,1,164.0788,73.4878Z"/>
+      <path class="cls-1" d="M246.9222,92.9944a12.1584,12.1584,0,0,0,7.1842-11.0771V78.2161A12.1494,12.1494,0,0,0,241.957,66.0667H225a1,1,0,0,0-1,1v44a1,1,0,0,0,1,1h6a1,1,0,0,0,1-1v-17h6.6215l7.9154,17.4138a1,1,0,0,0,.91.5862h6.5911a1,1,0,0,0,.91-1.4138Zm-.8158-11.0771a4.1538,4.1538,0,0,1-4.1489,4.1494h-9.8511v-12h9.8511a4.1538,4.1538,0,0,1,4.1489,4.1494Z"/>
+      <path class="cls-1" d="M289,66.0667H263a1,1,0,0,0-1,1v44a1,1,0,0,0,1,1h26a1,1,0,0,0,1-1v-6a1,1,0,0,0-1-1H270v-12h13a1,1,0,0,0,1-1v-6a1,1,0,0,0-1-1H270v-10h19a1,1,0,0,0,1-1v-6A1,1,0,0,0,289,66.0667Z"/>
+      <path class="cls-1" d="M327,66.0667h-6a1,1,0,0,0-1,1V89.7142a7.0066,7.0066,0,1,1-14,0V67.0667a1,1,0,0,0-1-1h-6a1,1,0,0,0-1,1V89.7142a15.0031,15.0031,0,1,0,30,0V67.0667A1,1,0,0,0,327,66.0667Z"/>
+      <rect class="cls-1" x="336" y="66.0667" width="8" height="38" rx="1"/>
+    </g>
+  </g>
+</svg>
diff --git a/public/img/brand/coreui-signet-white.svg b/public/img/brand/coreui-signet-white.svg
new file mode 100644
index 00000000..ee9700dc
--- /dev/null
+++ b/public/img/brand/coreui-signet-white.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 160">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+      }
+    </style>
+  </defs>
+  <title>signet_white</title>
+  <g id="Warstwa_1" data-name="Warstwa 1">
+    <g>
+      <path class="cls-1" d="M125,47.091,86,24.5743a12,12,0,0,0-12,0L35,47.091a12.0336,12.0336,0,0,0-6,10.3923v45.0334a12.0335,12.0335,0,0,0,6,10.3923l39,22.5166a11.9993,11.9993,0,0,0,12,0l39-22.5166a12.0335,12.0335,0,0,0,6-10.3923V57.4833A12.0336,12.0336,0,0,0,125,47.091Zm-2,55.4257a4,4,0,0,1-2,3.464L82,128.4974a4,4,0,0,1-4,0L39,105.9807a4,4,0,0,1-2-3.464V57.4833a4,4,0,0,1,2-3.4641L78,31.5025a4,4,0,0,1,4,0l39,22.5167a4,4,0,0,1,2,3.4641Z"/>
+      <path class="cls-1" d="M103.0216,93.0379h-2.866a4,4,0,0,0-1.9246.4935L80.95,103.0167,61,91.4981V68.5206L80.95,57.002l17.2894,9.455a4,4,0,0,0,1.9192.4905h2.8632a2,2,0,0,0,2-2V62.2357a2,2,0,0,0-1.04-1.7547L84.793,49.9854a8.0391,8.0391,0,0,0-7.8428.09L57,61.5929A8.0243,8.0243,0,0,0,53,68.5216v22.976a8,8,0,0,0,4,6.9283l19.95,11.5185a8.0422,8.0422,0,0,0,7.8433.0879l19.19-10.5311a2,2,0,0,0,1.0378-1.7534v-2.71A2,2,0,0,0,103.0216,93.0379Z"/>
+    </g>
+  </g>
+</svg>
diff --git a/public/img/brand/coreui-signet.svg b/public/img/brand/coreui-signet.svg
new file mode 100644
index 00000000..278b33c3
--- /dev/null
+++ b/public/img/brand/coreui-signet.svg
@@ -0,0 +1,16 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 160 160">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #3c4b64;
+      }
+    </style>
+  </defs>
+  <title>signet</title>
+  <g id="Warstwa_1" data-name="Warstwa 1">
+    <g>
+      <path class="cls-1" d="M125,47.091,86,24.5743a12,12,0,0,0-12,0L35,47.091a12.0336,12.0336,0,0,0-6,10.3923v45.0334a12.0335,12.0335,0,0,0,6,10.3923l39,22.5166a11.9993,11.9993,0,0,0,12,0l39-22.5166a12.0335,12.0335,0,0,0,6-10.3923V57.4833A12.0336,12.0336,0,0,0,125,47.091Zm-2,55.4257a4,4,0,0,1-2,3.464L82,128.4974a4,4,0,0,1-4,0L39,105.9807a4,4,0,0,1-2-3.464V57.4833a4,4,0,0,1,2-3.4641L78,31.5025a4,4,0,0,1,4,0l39,22.5167a4,4,0,0,1,2,3.4641Z"/>
+      <path class="cls-1" d="M103.0216,93.0379h-2.866a4,4,0,0,0-1.9246.4935L80.95,103.0167,61,91.4981V68.5206L80.95,57.002l17.2894,9.455a4,4,0,0,0,1.9192.4905h2.8632a2,2,0,0,0,2-2V62.2357a2,2,0,0,0-1.04-1.7547L84.793,49.9854a8.0391,8.0391,0,0,0-7.8428.09L57,61.5929A8.0243,8.0243,0,0,0,53,68.5216v22.976a8,8,0,0,0,4,6.9283l19.95,11.5185a8.0422,8.0422,0,0,0,7.8433.0879l19.19-10.5311a2,2,0,0,0,1.0378-1.7534v-2.71A2,2,0,0,0,103.0216,93.0379Z"/>
+    </g>
+  </g>
+</svg>
diff --git a/public/img/brand/logo.svg b/public/img/brand/logo.svg
deleted file mode 100644
index f24d16fc..00000000
--- a/public/img/brand/logo.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Warstwa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="707.1px" height="200px" viewBox="0 0 707.1 200" style="enable-background:new 0 0 707.1 200;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#1FA8D7;}
-	.st1{fill:#FFFFFF;}
-	.st2{opacity:4.000000e-02;stroke:#FFFFFF;stroke-miterlimit:10;}
-	.st3{opacity:8.000000e-02;stroke:#FFFFFF;stroke-miterlimit:10;}
-	.st4{opacity:0;stroke:#FFFFFF;stroke-miterlimit:10;}
-	.st5{fill:#333333;}
-	.st6{fill:#1EA7D6;}
-</style>
-<polygon class="st0" points="0,150 0,50 86.6,0 173.2,50 173.2,150 86.6,200 "/>
-<polygon class="st1" points="86.6,133.3 57.7,116.7 57.7,83.3 86.6,66.7 115.5,83.3 144.3,66.7 86.6,33.3 28.9,66.7 28.9,133.3 
-	86.6,166.7 144.3,133.3 115.5,116.7 "/>
-<polygon class="st2" points="0,50 86.6,100 86.6,0 "/>
-<polygon class="st2" points="0,150 86.6,200 86.6,100 "/>
-<polygon class="st3" points="86.6,100 173.2,150 173.2,50 "/>
-<polygon class="st4" points="86.6,100 0,50 0,150 "/>
-<polygon class="st3" points="173.2,150 86.6,100 86.6,200 "/>
-<polygon class="st3" points="173.2,50 86.6,0 86.6,100 "/>
-<g>
-	<path class="st5" d="M290.4,127.3c1,0,1.8,0.4,2.6,1.1l7.2,7.8c-4,4.9-8.8,8.7-14.6,11.3c-5.8,2.6-12.7,3.9-20.8,3.9
-		c-7.2,0-13.8-1.2-19.5-3.7c-5.8-2.5-10.7-5.9-14.8-10.3c-4.1-4.4-7.2-9.7-9.4-15.8c-2.2-6.1-3.3-12.8-3.3-20
-		c0-7.3,1.2-14.1,3.6-20.1c2.4-6.1,5.8-11.4,10.3-15.8c4.4-4.4,9.7-7.8,15.8-10.3c6.1-2.5,12.9-3.7,20.4-3.7c7.2,0,13.6,1.2,19,3.5
-		c5.4,2.3,10.1,5.4,13.9,9.2l-6.1,8.4c-0.4,0.5-0.8,1-1.4,1.4c-0.6,0.4-1.3,0.6-2.3,0.6c-1,0-2.1-0.4-3.2-1.2s-2.5-1.7-4.1-2.6
-		c-1.7-0.9-3.8-1.8-6.3-2.6c-2.5-0.8-5.8-1.2-9.7-1.2c-4.6,0-8.8,0.8-12.7,2.4c-3.8,1.6-7.2,3.9-9.9,6.9s-4.9,6.6-6.5,10.8
-		c-1.6,4.3-2.3,9-2.3,14.3c0,5.5,0.8,10.4,2.3,14.6c1.6,4.3,3.7,7.9,6.3,10.8c2.7,2.9,5.8,5.2,9.4,6.7c3.6,1.6,7.5,2.3,11.6,2.3
-		c2.5,0,4.7-0.1,6.7-0.4c2-0.3,3.8-0.7,5.5-1.3c1.7-0.6,3.3-1.3,4.8-2.3c1.5-0.9,3-2.1,4.5-3.4c0.4-0.4,0.9-0.7,1.4-1
-		C289.3,127.4,289.9,127.3,290.4,127.3z"/>
-	<path class="st5" d="M407.5,101.5c0,7.2-1.2,13.8-3.6,19.9c-2.4,6.1-5.7,11.4-10.1,15.8c-4.3,4.5-9.5,7.9-15.6,10.4
-		c-6.1,2.5-12.8,3.7-20.2,3.7c-7.4,0-14.1-1.2-20.2-3.7c-6.1-2.5-11.3-6-15.7-10.4c-4.3-4.5-7.7-9.7-10.1-15.8
-		c-2.4-6.1-3.6-12.7-3.6-19.9c0-7.2,1.2-13.8,3.6-19.9c2.4-6.1,5.7-11.4,10.1-15.8c4.3-4.5,9.6-7.9,15.7-10.4
-		c6.1-2.5,12.8-3.7,20.2-3.7c7.4,0,14.1,1.3,20.2,3.8c6.1,2.5,11.3,6,15.6,10.4c4.3,4.4,7.7,9.7,10.1,15.8
-		C406.3,87.7,407.5,94.3,407.5,101.5z M388.9,101.5c0-5.4-0.7-10.2-2.1-14.4c-1.4-4.3-3.5-7.9-6.1-10.8c-2.7-3-5.9-5.2-9.7-6.8
-		c-3.8-1.6-8.1-2.4-12.9-2.4c-4.8,0-9.1,0.8-12.9,2.4c-3.8,1.6-7.1,3.8-9.8,6.8c-2.7,3-4.7,6.6-6.2,10.8c-1.4,4.3-2.2,9.1-2.2,14.4
-		c0,5.4,0.7,10.2,2.2,14.4c1.4,4.3,3.5,7.9,6.2,10.8c2.7,2.9,5.9,5.2,9.8,6.8c3.8,1.6,8.1,2.4,12.9,2.4c4.8,0,9.1-0.8,12.9-2.4
-		c3.8-1.6,7-3.8,9.7-6.8c2.7-2.9,4.7-6.5,6.1-10.8C388.2,111.7,388.9,106.9,388.9,101.5z"/>
-	<path class="st5" d="M440.6,112.2v38.1h-18.2V52.7h29.8c6.7,0,12.4,0.7,17.1,2.1c4.7,1.4,8.6,3.3,11.7,5.8c3,2.5,5.3,5.4,6.7,8.9
-		c1.4,3.4,2.1,7.2,2.1,11.4c0,3.3-0.5,6.4-1.5,9.3c-1,2.9-2.4,5.6-4.2,8c-1.8,2.4-4.1,4.5-6.8,6.3c-2.7,1.8-5.7,3.2-9.1,4.3
-		c2.3,1.3,4.3,3.2,5.9,5.6l24.4,36h-16.3c-1.6,0-2.9-0.3-4-0.9c-1.1-0.6-2-1.5-2.8-2.7l-20.5-31.3c-0.8-1.2-1.6-2-2.5-2.5
-		c-0.9-0.5-2.3-0.7-4.1-0.7H440.6z M440.6,99.1h11.3c3.4,0,6.4-0.4,8.9-1.3c2.5-0.9,4.6-2,6.3-3.5c1.6-1.5,2.9-3.3,3.7-5.4
-		c0.8-2.1,1.2-4.3,1.2-6.8c0-4.9-1.6-8.8-4.9-11.4c-3.3-2.7-8.2-4-15-4h-11.6V99.1z"/>
-	<path class="st5" d="M571.8,52.7v14.4h-43.3v27.1h34.1v14h-34.1v27.6h43.3v14.5h-61.6V52.7H571.8z"/>
-	<path class="st6" d="M626.8,135.7c3.5,0,6.6-0.6,9.4-1.8c2.8-1.2,5.1-2.8,7-4.9c1.9-2.1,3.4-4.7,4.4-7.7c1-3,1.5-6.4,1.5-10.1V52.7
-		h18.2v58.5c0,5.8-0.9,11.2-2.8,16.1c-1.9,4.9-4.6,9.2-8.1,12.8c-3.5,3.6-7.8,6.4-12.8,8.4s-10.6,3-16.9,3s-11.9-1-16.9-3
-		s-9.2-4.8-12.7-8.4c-3.5-3.6-6.2-7.8-8-12.8c-1.9-4.9-2.8-10.3-2.8-16.1V52.7h18.2v58.4c0,3.7,0.5,7.1,1.5,10.1
-		c1,3,2.5,5.6,4.4,7.7c1.9,2.1,4.2,3.8,7,5C620.1,135.1,623.3,135.7,626.8,135.7z"/>
-	<path class="st6" d="M706.2,150.3H688V52.7h18.2V150.3z"/>
-</g>
-</svg>
diff --git a/public/img/brand/sygnet.svg b/public/img/brand/sygnet.svg
deleted file mode 100644
index 06c4d833..00000000
--- a/public/img/brand/sygnet.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Warstwa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="173.2px" height="200px" viewBox="0 0 173.2 200" style="enable-background:new 0 0 173.2 200;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#1FA8D7;}
-	.st1{fill:#FFFFFF;}
-	.st2{opacity:4.000000e-02;stroke:#FFFFFF;stroke-miterlimit:10;}
-	.st3{opacity:8.000000e-02;stroke:#FFFFFF;stroke-miterlimit:10;}
-	.st4{opacity:0;stroke:#FFFFFF;stroke-miterlimit:10;}
-	.st5{fill:#333333;}
-	.st6{fill:#1EA7D6;}
-</style>
-<polygon class="st0" points="0,150 0,50 86.6,0 173.2,50 173.2,150 86.6,200 "/>
-<polygon class="st1" points="86.6,133.3 57.7,116.7 57.7,83.3 86.6,66.7 115.5,83.3 144.3,66.7 86.6,33.3 28.9,66.7 28.9,133.3 
-	86.6,166.7 144.3,133.3 115.5,116.7 "/>
-<polygon class="st2" points="0,50 86.6,100 86.6,0 "/>
-<polygon class="st2" points="0,150 86.6,200 86.6,100 "/>
-<polygon class="st3" points="86.6,100 173.2,150 173.2,50 "/>
-<polygon class="st4" points="86.6,100 0,50 0,150 "/>
-<polygon class="st3" points="173.2,150 86.6,100 86.6,200 "/>
-<polygon class="st3" points="173.2,50 86.6,0 86.6,100 "/>
-<g>
-	<path class="st5" d="M290.4,127.3c1,0,1.8,0.4,2.6,1.1l7.2,7.8c-4,4.9-8.8,8.7-14.6,11.3c-5.8,2.6-12.7,3.9-20.8,3.9
-		c-7.2,0-13.8-1.2-19.5-3.7c-5.8-2.5-10.7-5.9-14.8-10.3c-4.1-4.4-7.2-9.7-9.4-15.8c-2.2-6.1-3.3-12.8-3.3-20
-		c0-7.3,1.2-14.1,3.6-20.1c2.4-6.1,5.8-11.4,10.3-15.8c4.4-4.4,9.7-7.8,15.8-10.3c6.1-2.5,12.9-3.7,20.4-3.7c7.2,0,13.6,1.2,19,3.5
-		c5.4,2.3,10.1,5.4,13.9,9.2l-6.1,8.4c-0.4,0.5-0.8,1-1.4,1.4c-0.6,0.4-1.3,0.6-2.3,0.6c-1,0-2.1-0.4-3.2-1.2s-2.5-1.7-4.1-2.6
-		c-1.7-0.9-3.8-1.8-6.3-2.6c-2.5-0.8-5.8-1.2-9.7-1.2c-4.6,0-8.8,0.8-12.7,2.4c-3.8,1.6-7.2,3.9-9.9,6.9s-4.9,6.6-6.5,10.8
-		c-1.6,4.3-2.3,9-2.3,14.3c0,5.5,0.8,10.4,2.3,14.6c1.6,4.3,3.7,7.9,6.3,10.8c2.7,2.9,5.8,5.2,9.4,6.7c3.6,1.6,7.5,2.3,11.6,2.3
-		c2.5,0,4.7-0.1,6.7-0.4c2-0.3,3.8-0.7,5.5-1.3c1.7-0.6,3.3-1.3,4.8-2.3c1.5-0.9,3-2.1,4.5-3.4c0.4-0.4,0.9-0.7,1.4-1
-		C289.3,127.4,289.9,127.3,290.4,127.3z"/>
-	<path class="st5" d="M407.5,101.5c0,7.2-1.2,13.8-3.6,19.9c-2.4,6.1-5.7,11.4-10.1,15.8c-4.3,4.5-9.5,7.9-15.6,10.4
-		c-6.1,2.5-12.8,3.7-20.2,3.7c-7.4,0-14.1-1.2-20.2-3.7c-6.1-2.5-11.3-6-15.7-10.4c-4.3-4.5-7.7-9.7-10.1-15.8
-		c-2.4-6.1-3.6-12.7-3.6-19.9c0-7.2,1.2-13.8,3.6-19.9c2.4-6.1,5.7-11.4,10.1-15.8c4.3-4.5,9.6-7.9,15.7-10.4
-		c6.1-2.5,12.8-3.7,20.2-3.7c7.4,0,14.1,1.3,20.2,3.8c6.1,2.5,11.3,6,15.6,10.4c4.3,4.4,7.7,9.7,10.1,15.8
-		C406.3,87.7,407.5,94.3,407.5,101.5z M388.9,101.5c0-5.4-0.7-10.2-2.1-14.4c-1.4-4.3-3.5-7.9-6.1-10.8c-2.7-3-5.9-5.2-9.7-6.8
-		c-3.8-1.6-8.1-2.4-12.9-2.4c-4.8,0-9.1,0.8-12.9,2.4c-3.8,1.6-7.1,3.8-9.8,6.8c-2.7,3-4.7,6.6-6.2,10.8c-1.4,4.3-2.2,9.1-2.2,14.4
-		c0,5.4,0.7,10.2,2.2,14.4c1.4,4.3,3.5,7.9,6.2,10.8c2.7,2.9,5.9,5.2,9.8,6.8c3.8,1.6,8.1,2.4,12.9,2.4c4.8,0,9.1-0.8,12.9-2.4
-		c3.8-1.6,7-3.8,9.7-6.8c2.7-2.9,4.7-6.5,6.1-10.8C388.2,111.7,388.9,106.9,388.9,101.5z"/>
-	<path class="st5" d="M440.6,112.2v38.1h-18.2V52.7h29.8c6.7,0,12.4,0.7,17.1,2.1c4.7,1.4,8.6,3.3,11.7,5.8c3,2.5,5.3,5.4,6.7,8.9
-		c1.4,3.4,2.1,7.2,2.1,11.4c0,3.3-0.5,6.4-1.5,9.3c-1,2.9-2.4,5.6-4.2,8c-1.8,2.4-4.1,4.5-6.8,6.3c-2.7,1.8-5.7,3.2-9.1,4.3
-		c2.3,1.3,4.3,3.2,5.9,5.6l24.4,36h-16.3c-1.6,0-2.9-0.3-4-0.9c-1.1-0.6-2-1.5-2.8-2.7l-20.5-31.3c-0.8-1.2-1.6-2-2.5-2.5
-		c-0.9-0.5-2.3-0.7-4.1-0.7H440.6z M440.6,99.1h11.3c3.4,0,6.4-0.4,8.9-1.3c2.5-0.9,4.6-2,6.3-3.5c1.6-1.5,2.9-3.3,3.7-5.4
-		c0.8-2.1,1.2-4.3,1.2-6.8c0-4.9-1.6-8.8-4.9-11.4c-3.3-2.7-8.2-4-15-4h-11.6V99.1z"/>
-	<path class="st5" d="M571.8,52.7v14.4h-43.3v27.1h34.1v14h-34.1v27.6h43.3v14.5h-61.6V52.7H571.8z"/>
-	<path class="st6" d="M626.8,135.7c3.5,0,6.6-0.6,9.4-1.8c2.8-1.2,5.1-2.8,7-4.9c1.9-2.1,3.4-4.7,4.4-7.7c1-3,1.5-6.4,1.5-10.1V52.7
-		h18.2v58.5c0,5.8-0.9,11.2-2.8,16.1c-1.9,4.9-4.6,9.2-8.1,12.8c-3.5,3.6-7.8,6.4-12.8,8.4s-10.6,3-16.9,3s-11.9-1-16.9-3
-		s-9.2-4.8-12.7-8.4c-3.5-3.6-6.2-7.8-8-12.8c-1.9-4.9-2.8-10.3-2.8-16.1V52.7h18.2v58.4c0,3.7,0.5,7.1,1.5,10.1
-		c1,3,2.5,5.6,4.4,7.7c1.9,2.1,4.2,3.8,7,5C620.1,135.1,623.3,135.7,626.8,135.7z"/>
-	<path class="st6" d="M706.2,150.3H688V52.7h18.2V150.3z"/>
-</g>
-</svg>
diff --git a/src/containers/DefaultContainer.vue b/src/containers/DefaultContainer.vue
index b300720d..6205566c 100644
--- a/src/containers/DefaultContainer.vue
+++ b/src/containers/DefaultContainer.vue
@@ -1,18 +1,19 @@
 <template>
-  <div class="c-app c-default-layout">
-    <TheHeader/>
+  <div class="c-app">
     <TheSidebar/>
-    <div class="c-body">
-      <main class="c-main">
-        <CBreadcrumbRouter/>
-        <CContainer fluid>
-          <transition name="fade">
-            <router-view></router-view>
-          </transition>
-        </CContainer>
-      </main>
+    <div class="c-wrapper">
+      <TheHeader/>
+      <div class="c-body">
+        <main class="c-main">
+          <CContainer fluid>
+            <transition name="fade">
+              <router-view></router-view>
+            </transition>
+          </CContainer>
+        </main>
+      </div>
+      <TheFooter/>
     </div>
-    <TheFooter/>
   </div>
 </template>
 
diff --git a/src/containers/DefaultHeaderDropdownAccnt.vue b/src/containers/DefaultHeaderDropdownAccnt.vue
index aa4aa547..0b1f05a0 100644
--- a/src/containers/DefaultHeaderDropdownAccnt.vue
+++ b/src/containers/DefaultHeaderDropdownAccnt.vue
@@ -2,17 +2,21 @@
   <CDropdown
     nav
     no-caret
-    no-popper
-    add-menu-classes="dropdown-menu-right"
+    class="c-header-nav-items"
+    placement="bottom-end"
+    add-menu-classes="pt-0"
   >
-    <template #toggler-content>
-      <img
-        src="img/avatars/6.jpg"
-        class="img-avatar"
-        alt="admin@bootstrapmaster.com"
-      />
+    <template #toggler="{click}">
+      <CLink class="c-header-nav-link" @click="click">
+        <div class="c-avatar">
+          <img
+            src="img/avatars/6.jpg"
+            class="c-avatar-img "
+          />
+        </div>
+      </CLink>
     </template>
-    <CDropdownHeader tag="div" class="text-center">
+    <CDropdownHeader tag="div" class="text-center bg-light">
       <strong>Account</strong>
     </CDropdownHeader>
     <CDropdownItem>
@@ -32,8 +36,8 @@
       <CBadge variant="warning">{{ itemsCount }}</CBadge>
     </CDropdownItem>
     <CDropdownHeader
-     tag="div"
-      class="text-center"
+      tag="div"
+      class="text-center bg-light"
     >
       <strong>Settings</strong>
     </CDropdownHeader>
diff --git a/src/containers/TheHeader.vue b/src/containers/TheHeader.vue
index a68b05bf..224b29c1 100644
--- a/src/containers/TheHeader.vue
+++ b/src/containers/TheHeader.vue
@@ -1,56 +1,34 @@
 <template>
-  <CHeader fixed>
+  <CHeader fixed with-subheader light>
     <CSidebarToggler 
-      class="c-header-toggler d-lg-none mr-auto"
+      class="c-header-toggler"
       v-c-emit-root-event:c-sidebar-toggle
     />
-    <CLink :class="logoClasses" to="/">
-      <img
-        v-show="sidebarIsMinimized"
-        class="navbar-brand-minimized d-md-down-none" 
-        src="img/brand/sygnet.svg" 
-        width="30" 
-        height="30" 
-        alt="CoreUI Logo"
-      >
-      <img
-        v-show="!sidebarIsMinimized"
-        class="navbar-brand-full d-md-down-none" 
-        src="img/brand/logo.svg" 
-        width="89" 
-        height="25" 
-        alt="CoreUI Logo"
-      >
-      <img
-        class="navbar-brand-full d-lg-none" 
-        src="img/brand/logo.svg" 
-        width="89" 
-        height="25" 
-        alt="CoreUI Logo"
-      >
-    </CLink>
-    <CSidebarToggler 
-      class="c-header-toggler d-md-down-none" 
-      v-c-emit-root-event:c-sidebar-toggle
+    <img
+      class="c-header-brand mx-auto d-lg-none" 
+      src="img/brand/coreui-base.svg" 
+      width="97" 
+      height="46" 
+      alt="CoreUI Logo"
     />
-    <ul class="c-header-nav d-md-down-none">
-      <CNavItem class="px-3" to="/dashboard">Dashboard</CNavItem>
-      <CNavItem class="px-3" to="/users" exact>Users</CNavItem>
-      <CNavItem class="px-3">Settings</CNavItem>
+    <ul class="c-header-nav d-md-down-none mr-auto">
+      <CHeaderNavItem class="px-3" to="/dashboard">Dashboard</CHeaderNavItem>
+      <CHeaderNavItem class="px-3" to="/users" exact>Users</CHeaderNavItem>
+      <CHeaderNavItem class="px-3">Settings</CHeaderNavItem>
     </ul>
-    <CNav class="c-header-nav ml-auto">
-      <CNavItem class="d-md-down-none">
+    <ul class="c-header-nav">
+      <CHeaderNavItem class="d-md-down-none mx-2">
         <i class="cui-bell"></i>
-        <CBadge pill variant="danger">5</CBadge>
-      </CNavItem>
-      <CNavItem class="d-md-down-none">
+      </CHeaderNavItem>
+      <CHeaderNavItem class="d-md-down-none mx-2">
         <i class="cui-list"></i>
-      </CNavItem>
-      <CNavItem class="d-md-down-none">
-        <i class="cui-location-pin"></i>
-      </CNavItem>
+      </CHeaderNavItem>
+      <CHeaderNavItem class="d-md-down-none mx-2">
+        <i class="cui-envelope-open"></i>
+      </CHeaderNavItem>
       <DefaultHeaderDropdownAccnt/>
-    </CNav>
+    </ul>
+    <CBreadcrumbRouter class="c-subheader px-3"/>
   </CHeader>
 </template>
 
diff --git a/src/containers/TheSidebar.vue b/src/containers/TheSidebar.vue
index efe526ea..f0742feb 100644
--- a/src/containers/TheSidebar.vue
+++ b/src/containers/TheSidebar.vue
@@ -3,6 +3,11 @@
     fixed 
     :minimize="minimize"
   >
+    <CSidebarBrand 
+      fullSrc="img/brand/coreui-base-white.svg" 
+      minimizedSrc="img/brand/coreui-signet-white.svg"
+      :wrappedInLink="{ href: 'https://coreui.io/', target: '_blank'}"
+    />
     <!-- <CSidebarHeader/> -->
     <!-- <CSidebarForm/> -->
     <CRenderFunction :contentToRender="nav"/>
diff --git a/src/containers/_nav.js b/src/containers/_nav.js
index b2bdff75..b77013a0 100644
--- a/src/containers/_nav.js
+++ b/src/containers/_nav.js
@@ -446,8 +446,10 @@ export default [
           name: 'Download CoreUI',
           href: 'http://coreui.io/vue/',
           icon: 'cui-cloud-download',
+          addLinkClasses: 'c-nav-link-success',
+        },
+        attrs: {
           class: 'mt-auto',
-          variant: 'success'
         }
       }
     ],
@@ -458,7 +460,7 @@ export default [
           name: 'Try CoreUI PRO',
           href: 'http://coreui.io/pro/vue/',
           icon: 'cui-layers',
-          variant: 'danger'
+          addLinkClasses: 'c-nav-link-danger',
         }
       }
     ]