diff --git a/Vue_Full_Project/package.json b/Vue_Full_Project/package.json index ea9ad742..3efd4b46 100644 --- a/Vue_Full_Project/package.json +++ b/Vue_Full_Project/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/vue", - "version": "1.0.0", + "version": "1.0.1", "description": "", "author": "Łukasz Holeczek ", "private": true, diff --git a/Vue_Full_Project/scss/core/_dropdown-menu-right.scss b/Vue_Full_Project/scss/core/_dropdown-menu-right.scss index eec74e81..427ab598 100644 --- a/Vue_Full_Project/scss/core/_dropdown-menu-right.scss +++ b/Vue_Full_Project/scss/core/_dropdown-menu-right.scss @@ -1,7 +1,8 @@ // Temp fix for reactstrap -.show { - > .dropdown-menu-right { - right: 0; - left: auto; // Reset the default from `.dropdown-menu` +.app-header { + .navbar-nav { + .dropdown-menu-right { + right: auto; + } } -} +} \ No newline at end of file diff --git a/Vue_Full_Project/scss/core/_footer.scss b/Vue_Full_Project/scss/core/_footer.scss index 2d678c8c..1c1748b4 100644 --- a/Vue_Full_Project/scss/core/_footer.scss +++ b/Vue_Full_Project/scss/core/_footer.scss @@ -1,8 +1,9 @@ .app-footer { - min-height: $footer-height; + display: flex; padding: 0 $spacer; - line-height: $footer-height; color: $footer-color; background: $footer-bg; + flex-wrap: wrap; + align-items: center; @include borders($footer-borders); } diff --git a/Vue_Full_Project/scss/core/_layout.scss b/Vue_Full_Project/scss/core/_layout.scss index cbab8f04..6e4034db 100644 --- a/Vue_Full_Project/scss/core/_layout.scss +++ b/Vue_Full_Project/scss/core/_layout.scss @@ -11,8 +11,8 @@ app-dashboard, app-root { display: flex; - flex-direction: column; min-height: 100vh; + flex-direction: column; } .app-header { @@ -26,12 +26,12 @@ app-root { .app-body { display: flex; flex-direction: row; - flex-grow: 1; overflow-x: hidden; + flex-grow: 1; .main { - flex: 1; min-width: 0; + flex: 1; } .sidebar { @@ -328,7 +328,8 @@ app-root { margin-top: $navbar-height; } - .sidebar { + .sidebar, + .sidebar-fixed .sidebar { position: fixed; z-index: $zindex-sticky - 1; width: $mobile-sidebar-width; diff --git a/Vue_Full_Project/scss/core/_navbar.scss b/Vue_Full_Project/scss/core/_navbar.scss index ba49147d..780d66ab 100644 --- a/Vue_Full_Project/scss/core/_navbar.scss +++ b/Vue_Full_Project/scss/core/_navbar.scss @@ -1,7 +1,7 @@ .app-header.navbar { position: relative; - flex-direction: row; height: $navbar-height; + flex-direction: row; padding: 0; margin: 0; background-color: $navbar-bg; @@ -102,13 +102,16 @@ background-color: rgba(0,0,0,.075); } -.brand-minimized { - .app-header.navbar { - .navbar-brand { - width: $navbar-brand-minimized-width; - background-color: $navbar-brand-minimized-bg; - background-image: $navbar-brand-minimized-logo; - background-size: $navbar-brand-minimized-logo-size; +@include media-breakpoint-up(lg) { + .brand-minimized { + .app-header.navbar { + .navbar-brand { + width: $navbar-brand-minimized-width; + background-color: $navbar-brand-minimized-bg; + background-image: $navbar-brand-minimized-logo; + background-size: $navbar-brand-minimized-logo-size; + @include borders($navbar-brand-minimized-border); + } } } } diff --git a/Vue_Full_Project/scss/core/_sidebar.scss b/Vue_Full_Project/scss/core/_sidebar.scss index 407ed223..3f83a0dc 100644 --- a/Vue_Full_Project/scss/core/_sidebar.scss +++ b/Vue_Full_Project/scss/core/_sidebar.scss @@ -78,8 +78,8 @@ .nav { @include sidebar-width($sidebar-borders, $sidebar-width); - flex-direction: column; min-height: 100%; + flex-direction: column; } .nav-title { @@ -254,6 +254,7 @@ flex: 0 0 $sidebar-footer-height; padding: $sidebar-footer-padding-y $sidebar-footer-padding-x; background: $sidebar-footer-bg; + @include borders($sidebar-footer-borders); } .sidebar-minimizer { @@ -261,6 +262,7 @@ flex: 0 0 $sidebar-minimizer-height; background-color: $sidebar-minimizer-bg; border: 0; + @include borders($sidebar-minimizer-borders); &::before { position: absolute; diff --git a/Vue_Full_Project/scss/core/_variables.scss b/Vue_Full_Project/scss/core/_variables.scss index 790e5198..a2bebe86 100644 --- a/Vue_Full_Project/scss/core/_variables.scss +++ b/Vue_Full_Project/scss/core/_variables.scss @@ -58,10 +58,11 @@ $navbar-brand-border: ( ) ) !default; -$navbar-brand-minimized-width: 50px !default -$navbar-brand-minimized-bg: #fff !default; +$navbar-brand-minimized-width: 50px !default; +$navbar-brand-minimized-bg: $navbar-brand-bg !default; $navbar-brand-minimized-logo: url('../img/logo-symbol.png') !default; $navbar-brand-minimized-logo-size: 24px !default; +$navbar-brand-minimized-border: $navbar-brand-border !default; $navbar-color: $gray-600 !default; $navbar-hover-color: $gray-800 !default; @@ -132,11 +133,13 @@ $sidebar-footer-height: auto !default; $sidebar-footer-bg: rgba(0,0,0,.2) !default; $sidebar-footer-padding-y: .75rem !default; $sidebar-footer-padding-x: 1rem !default; +$sidebar-footer-borders: 0 !default; // Sidebar Minimizer $sidebar-minimizer-height: 50px !default; $sidebar-minimizer-bg: rgba(0,0,0,.2) !default; +$sidebar-minimizer-borders: 0 !default; $sidebar-minimizer-indicator-color: $gray-600 !default; $sidebar-minimizer-indicator: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 11 14'%3E%3Cpath fill='#{$sidebar-minimizer-indicator-color}' d='M9.148 2.352l-4.148 4.148 4.148 4.148q0.148 0.148 0.148 0.352t-0.148 0.352l-1.297 1.297q-0.148 0.148-0.352 0.148t-0.352-0.148l-5.797-5.797q-0.148-0.148-0.148-0.352t0.148-0.352l5.797-5.797q0.148-0.148 0.352-0.148t0.352 0.148l1.297 1.297q0.148 0.148 0.148 0.352t-0.148 0.352z'/%3E%3C/svg%3E"), "#", "%23") !default; $sidebar-minimizer-hover-bg: rgba(0,0,0,.3) !default; diff --git a/Vue_Full_Project/scss/style.scss b/Vue_Full_Project/scss/style.scss index 4296d776..151efffb 100644 --- a/Vue_Full_Project/scss/style.scss +++ b/Vue_Full_Project/scss/style.scss @@ -1,6 +1,6 @@ /*! * CoreUI - Open Source Bootstrap Admin Template - * @version v1.0.0 + * @version v1.0.1 * @link http://coreui.io * Copyright (c) 2017 creativeLabs Łukasz Holeczek * @license MIT @@ -11,23 +11,17 @@ // Import Bootstrap source files @import "bootstrap/bootstrap"; -// If you want you can import bootstrap scss files directly from node_modules or bower_components. +// If you want you can import bootstrap scss files directly from node_modules. // To do this please remove @import "bootstrap/bootstrap"; and uncomment proper line. // Import Bootstrap source files from node_modules // @import "node_modules/bootstrap/scss/bootstrap"; -// Import Bootstrap source files from bower_components -// @import "bower_components/bootstrap/scss/bootstrap"; - // Override core variables @import "core-variables"; // Import core styles @import "core/core"; -// Import vendors styles -@import "vendors/vendors"; - // Custom styles @import "custom"; diff --git a/Vue_Full_Project/scss/vendors/_variables.scss b/Vue_Full_Project/scss/vendors/_variables.scss new file mode 100644 index 00000000..02636b9a --- /dev/null +++ b/Vue_Full_Project/scss/vendors/_variables.scss @@ -0,0 +1,9 @@ +// @import "node_modules/bootstrap/scss/bootstrap/functions"; +@import "../bootstrap/functions"; +@import "../bootstrap-variables"; +// @import "node_modules/bootstrap/scss/bootstrap/variables"; +@import "../bootstrap/variables"; +// @import "node_modules/bootstrap/scss/bootstrap/mixins"; +@import "../bootstrap/mixins"; +@import "../core-variables"; +@import "../core/variables"; diff --git a/Vue_Full_Project/scss/vendors/_vendors.scss b/Vue_Full_Project/scss/vendors/_vendors.scss deleted file mode 100644 index 7aab6870..00000000 --- a/Vue_Full_Project/scss/vendors/_vendors.scss +++ /dev/null @@ -1 +0,0 @@ -@import "chart.js/chart"; diff --git a/Vue_Full_Project/scss/vendors/chart.js/chart.scss b/Vue_Full_Project/scss/vendors/chart.js/chart.scss index 41eda00f..7e99ccaa 100644 --- a/Vue_Full_Project/scss/vendors/chart.js/chart.scss +++ b/Vue_Full_Project/scss/vendors/chart.js/chart.scss @@ -1,3 +1,6 @@ +// Import variables +@import '../variables'; + .chart-legend, .bar-legend, .line-legend, diff --git a/Vue_Full_Project/src/components/Footer.vue b/Vue_Full_Project/src/components/Footer.vue index a93990e2..8238326b 100644 --- a/Vue_Full_Project/src/components/Footer.vue +++ b/Vue_Full_Project/src/components/Footer.vue @@ -1,7 +1,7 @@