From 684960cc5c95e43c7ba29cc155d58c1ce86a4c7e Mon Sep 17 00:00:00 2001 From: cristij Date: Sun, 14 Oct 2018 15:56:29 +0300 Subject: [PATCH] Css tweaks & improvements Make green as primary color --- package.json | 3 +- .../custom/_sidebar-and-main-panel.scss | 11 ++++--- .../black-dashboard/custom/_variables.scss | 8 ++--- src/components/SidebarPlugin/SideBar.vue | 3 +- src/config.js | 10 ++++++ src/layout/dashboard/TopNavbar.vue | 5 +-- src/pages/Dashboard.vue | 33 +++++++++---------- 7 files changed, 44 insertions(+), 29 deletions(-) create mode 100644 src/config.js diff --git a/package.json b/package.json index 36fb0af..af7a569 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "e2e": "node test/e2e/runner.js", "lint": "vue-cli-service lint", "lint-fix": "vue-cli-service lint --fix", - "dev": "vue-cli-service serve --open" + "dev": "vue-cli-service serve --open", + "serve": "vue-cli-service serve --open" }, "dependencies": { "chart.js": "^2.7.2", diff --git a/src/assets/sass/black-dashboard/custom/_sidebar-and-main-panel.scss b/src/assets/sass/black-dashboard/custom/_sidebar-and-main-panel.scss index 0c2ddb2..36acc06 100644 --- a/src/assets/sass/black-dashboard/custom/_sidebar-and-main-panel.scss +++ b/src/assets/sass/black-dashboard/custom/_sidebar-and-main-panel.scss @@ -295,6 +295,9 @@ img { max-width: 21px; } + &.logo-img-rtl { + margin-right: 0; + } } a.logo-normal{ @@ -359,8 +362,8 @@ @include linear-gradient($success-states, $success); } - &[data="vue"] { - @include linear-gradient($vue-states, $vue); + &[data="purple"] { + @include linear-gradient($purple-states, $purple); } .user{ @@ -468,8 +471,8 @@ border-top: 2px solid $success; } - &[data="vue"]{ - border-top: 2px solid $vue; + &[data="purple"]{ + border-top: 2px solid $purple; } &[data="primary"]{ diff --git a/src/assets/sass/black-dashboard/custom/_variables.scss b/src/assets/sass/black-dashboard/custom/_variables.scss index a771c5a..3caabfb 100644 --- a/src/assets/sass/black-dashboard/custom/_variables.scss +++ b/src/assets/sass/black-dashboard/custom/_variables.scss @@ -100,24 +100,24 @@ $default-color-opacity: rgba(182, 182, 182, .6) !default; $orange-color: #f96332 !default; $default: #344675 !default; -$primary: #e14eca !default; +$primary: #42b883 !default; $secondary: #f4f5f7 !default; $success: #00f2c3 !default; $info: #1d8cf8 !default; $warning: #ff8d72 !default; $danger: #fd5d93 !default; $black: #222a42 !default; -$vue: #42b883 !default; +$purple: #e14eca !default; // gradient $default-states: #263148 !default; -$primary-states: #ba54f5 !default; +$primary-states: #38ef7d !default; $success-states: #0098f0 !default; $info-states: #3358f4 !default; $warning-states: #ff6491 !default; $danger-states: #ec250d !default; $black-states: #1d253b !default; -$vue-states: #38ef7d !default; +$purple-states: #ba54f5 !default; $background-black: #1e1e2f !default; $background-states-black: #1e1e24 !default; diff --git a/src/components/SidebarPlugin/SideBar.vue b/src/components/SidebarPlugin/SideBar.vue index f852ff0..9769d7a 100644 --- a/src/components/SidebarPlugin/SideBar.vue +++ b/src/components/SidebarPlugin/SideBar.vue @@ -9,7 +9,8 @@