Skip to content

Commit 96f2aff

Browse files
xidedixxidedix
authored
Merge pull request #19 from mrholek/v1-0-1
v1.0.1
2 parents 0a00ed0 + b500475 commit 96f2aff

25 files changed

+101
-69
lines changed

‎Vue_Full_Project/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/vue",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "",
55
"author": "Łukasz Holeczek <lukasz@holeczek.pl>",
66
"private": true,

‎Vue_Full_Project/scss/core/_dropdown-menu-right.scss

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// Temp fix for reactstrap
2-
.show {
3-
> .dropdown-menu-right {
4-
right: 0;
5-
left: auto; // Reset the default from `.dropdown-menu`
2+
.app-header {
3+
.navbar-nav {
4+
.dropdown-menu-right {
5+
right: auto;
6+
}
67
}
7-
}
8+
}

‎Vue_Full_Project/scss/core/_footer.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
.app-footer {
2-
min-height: $footer-height;
2+
display: flex;
33
padding: 0 $spacer;
4-
line-height: $footer-height;
54
color: $footer-color;
65
background: $footer-bg;
6+
flex-wrap: wrap;
7+
align-items: center;
78
@include borders($footer-borders);
89
}

‎Vue_Full_Project/scss/core/_layout.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
app-dashboard,
1212
app-root {
1313
display: flex;
14-
flex-direction: column;
1514
min-height: 100vh;
15+
flex-direction: column;
1616
}
1717

1818
.app-header {
@@ -26,12 +26,12 @@ app-root {
2626
.app-body {
2727
display: flex;
2828
flex-direction: row;
29-
flex-grow: 1;
3029
overflow-x: hidden;
30+
flex-grow: 1;
3131

3232
.main {
33-
flex: 1;
3433
min-width: 0;
34+
flex: 1;
3535
}
3636

3737
.sidebar {
@@ -328,7 +328,8 @@ app-root {
328328
margin-top: $navbar-height;
329329
}
330330

331-
.sidebar {
331+
.sidebar,
332+
.sidebar-fixed .sidebar {
332333
position: fixed;
333334
z-index: $zindex-sticky - 1;
334335
width: $mobile-sidebar-width;

‎Vue_Full_Project/scss/core/_navbar.scss

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.app-header.navbar {
22
position: relative;
3-
flex-direction: row;
43
height: $navbar-height;
4+
flex-direction: row;
55
padding: 0;
66
margin: 0;
77
background-color: $navbar-bg;
@@ -102,13 +102,16 @@
102102
background-color: rgba(0,0,0,.075);
103103
}
104104

105-
.brand-minimized {
106-
.app-header.navbar {
107-
.navbar-brand {
108-
width: $navbar-brand-minimized-width;
109-
background-color: $navbar-brand-minimized-bg;
110-
background-image: $navbar-brand-minimized-logo;
111-
background-size: $navbar-brand-minimized-logo-size;
105+
@include media-breakpoint-up(lg) {
106+
.brand-minimized {
107+
.app-header.navbar {
108+
.navbar-brand {
109+
width: $navbar-brand-minimized-width;
110+
background-color: $navbar-brand-minimized-bg;
111+
background-image: $navbar-brand-minimized-logo;
112+
background-size: $navbar-brand-minimized-logo-size;
113+
@include borders($navbar-brand-minimized-border);
114+
}
112115
}
113116
}
114117
}

‎Vue_Full_Project/scss/core/_sidebar.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878

7979
.nav {
8080
@include sidebar-width($sidebar-borders, $sidebar-width);
81-
flex-direction: column;
8281
min-height: 100%;
82+
flex-direction: column;
8383
}
8484

8585
.nav-title {
@@ -254,13 +254,15 @@
254254
flex: 0 0 $sidebar-footer-height;
255255
padding: $sidebar-footer-padding-y $sidebar-footer-padding-x;
256256
background: $sidebar-footer-bg;
257+
@include borders($sidebar-footer-borders);
257258
}
258259

259260
.sidebar-minimizer {
260261
position: relative;
261262
flex: 0 0 $sidebar-minimizer-height;
262263
background-color: $sidebar-minimizer-bg;
263264
border: 0;
265+
@include borders($sidebar-minimizer-borders);
264266

265267
&::before {
266268
position: absolute;

‎Vue_Full_Project/scss/core/_variables.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,11 @@ $navbar-brand-border: (
5858
)
5959
) !default;
6060

61-
$navbar-brand-minimized-width: 50px !default
62-
$navbar-brand-minimized-bg: #fff !default;
61+
$navbar-brand-minimized-width: 50px !default;
62+
$navbar-brand-minimized-bg: $navbar-brand-bg !default;
6363
$navbar-brand-minimized-logo: url('../img/logo-symbol.png') !default;
6464
$navbar-brand-minimized-logo-size: 24px !default;
65+
$navbar-brand-minimized-border: $navbar-brand-border !default;
6566

6667
$navbar-color: $gray-600 !default;
6768
$navbar-hover-color: $gray-800 !default;
@@ -132,11 +133,13 @@ $sidebar-footer-height: auto !default;
132133
$sidebar-footer-bg: rgba(0,0,0,.2) !default;
133134
$sidebar-footer-padding-y: .75rem !default;
134135
$sidebar-footer-padding-x: 1rem !default;
136+
$sidebar-footer-borders: 0 !default;
135137

136138
// Sidebar Minimizer
137139

138140
$sidebar-minimizer-height: 50px !default;
139141
$sidebar-minimizer-bg: rgba(0,0,0,.2) !default;
142+
$sidebar-minimizer-borders: 0 !default;
140143
$sidebar-minimizer-indicator-color: $gray-600 !default;
141144
$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;
142145
$sidebar-minimizer-hover-bg: rgba(0,0,0,.3) !default;

‎Vue_Full_Project/scss/style.scss

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* CoreUI - Open Source Bootstrap Admin Template
3-
* @version v1.0.0
3+
* @version v1.0.1
44
* @link http://coreui.io
55
* Copyright (c) 2017 creativeLabs Łukasz Holeczek
66
* @license MIT
@@ -11,23 +11,17 @@
1111
// Import Bootstrap source files
1212
@import "bootstrap/bootstrap";
1313

14-
// If you want you can import bootstrap scss files directly from node_modules or bower_components.
14+
// If you want you can import bootstrap scss files directly from node_modules.
1515
// To do this please remove @import "bootstrap/bootstrap"; and uncomment proper line.
1616

1717
// Import Bootstrap source files from node_modules
1818
// @import "node_modules/bootstrap/scss/bootstrap";
1919

20-
// Import Bootstrap source files from bower_components
21-
// @import "bower_components/bootstrap/scss/bootstrap";
22-
2320
// Override core variables
2421
@import "core-variables";
2522

2623
// Import core styles
2724
@import "core/core";
2825

29-
// Import vendors styles
30-
@import "vendors/vendors";
31-
3226
// Custom styles
3327
@import "custom";

‎Vue_Full_Project/scss/vendors/_variables.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// @import "node_modules/bootstrap/scss/bootstrap/functions";
2+
@import "../bootstrap/functions";
3+
@import "../bootstrap-variables";
4+
// @import "node_modules/bootstrap/scss/bootstrap/variables";
5+
@import "../bootstrap/variables";
6+
// @import "node_modules/bootstrap/scss/bootstrap/mixins";
7+
@import "../bootstrap/mixins";
8+
@import "../core-variables";
9+
@import "../core/variables";

‎Vue_Full_Project/scss/vendors/_vendors.scss

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Vue_Full_Project/scss/vendors/chart.js/chart.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Import variables
2+
@import '../variables';
3+
14
.chart-legend,
25
.bar-legend,
36
.line-legend,

‎Vue_Full_Project/src/components/Footer.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<footer class="app-footer">
3-
<a href="http://coreui.io">CoreUI</a> &copy; 2017 creativeLabs.
4-
<span class="float-right">Powered by <a href="http://coreui.io">CoreUI</a></span>
3+
<span><a href="http://coreui.io">CoreUI</a> &copy; 2017 creativeLabs.</span>
4+
<span class="ml-auto">Powered by <a href="http://coreui.io">CoreUI</a></span>
55
</footer>
66
</template>
77
<script>

‎Vue_Starter/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/vue",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "",
55
"author": "Łukasz Holeczek <lukasz@holeczek.pl>",
66
"private": true,

‎Vue_Starter/scss/core/_dropdown-menu-right.scss

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// Temp fix for reactstrap
2-
.show {
3-
> .dropdown-menu-right {
4-
right: 0;
5-
left: auto; // Reset the default from `.dropdown-menu`
2+
.app-header {
3+
.navbar-nav {
4+
.dropdown-menu-right {
5+
right: auto;
6+
}
67
}
7-
}
8+
}

‎Vue_Starter/scss/core/_footer.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
.app-footer {
2-
min-height: $footer-height;
2+
display: flex;
33
padding: 0 $spacer;
4-
line-height: $footer-height;
54
color: $footer-color;
65
background: $footer-bg;
6+
flex-wrap: wrap;
7+
align-items: center;
78
@include borders($footer-borders);
89
}

‎Vue_Starter/scss/core/_layout.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
app-dashboard,
1212
app-root {
1313
display: flex;
14-
flex-direction: column;
1514
min-height: 100vh;
15+
flex-direction: column;
1616
}
1717

1818
.app-header {
@@ -26,12 +26,12 @@ app-root {
2626
.app-body {
2727
display: flex;
2828
flex-direction: row;
29-
flex-grow: 1;
3029
overflow-x: hidden;
30+
flex-grow: 1;
3131

3232
.main {
33-
flex: 1;
3433
min-width: 0;
34+
flex: 1;
3535
}
3636

3737
.sidebar {
@@ -328,7 +328,8 @@ app-root {
328328
margin-top: $navbar-height;
329329
}
330330

331-
.sidebar {
331+
.sidebar,
332+
.sidebar-fixed .sidebar {
332333
position: fixed;
333334
z-index: $zindex-sticky - 1;
334335
width: $mobile-sidebar-width;

‎Vue_Starter/scss/core/_navbar.scss

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.app-header.navbar {
22
position: relative;
3-
flex-direction: row;
43
height: $navbar-height;
4+
flex-direction: row;
55
padding: 0;
66
margin: 0;
77
background-color: $navbar-bg;
@@ -102,13 +102,16 @@
102102
background-color: rgba(0,0,0,.075);
103103
}
104104

105-
.brand-minimized {
106-
.app-header.navbar {
107-
.navbar-brand {
108-
width: $navbar-brand-minimized-width;
109-
background-color: $navbar-brand-minimized-bg;
110-
background-image: $navbar-brand-minimized-logo;
111-
background-size: $navbar-brand-minimized-logo-size;
105+
@include media-breakpoint-up(lg) {
106+
.brand-minimized {
107+
.app-header.navbar {
108+
.navbar-brand {
109+
width: $navbar-brand-minimized-width;
110+
background-color: $navbar-brand-minimized-bg;
111+
background-image: $navbar-brand-minimized-logo;
112+
background-size: $navbar-brand-minimized-logo-size;
113+
@include borders($navbar-brand-minimized-border);
114+
}
112115
}
113116
}
114117
}

‎Vue_Starter/scss/core/_sidebar.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878

7979
.nav {
8080
@include sidebar-width($sidebar-borders, $sidebar-width);
81-
flex-direction: column;
8281
min-height: 100%;
82+
flex-direction: column;
8383
}
8484

8585
.nav-title {
@@ -254,13 +254,15 @@
254254
flex: 0 0 $sidebar-footer-height;
255255
padding: $sidebar-footer-padding-y $sidebar-footer-padding-x;
256256
background: $sidebar-footer-bg;
257+
@include borders($sidebar-footer-borders);
257258
}
258259

259260
.sidebar-minimizer {
260261
position: relative;
261262
flex: 0 0 $sidebar-minimizer-height;
262263
background-color: $sidebar-minimizer-bg;
263264
border: 0;
265+
@include borders($sidebar-minimizer-borders);
264266

265267
&::before {
266268
position: absolute;

‎Vue_Starter/scss/core/_variables.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,11 @@ $navbar-brand-border: (
5858
)
5959
) !default;
6060

61-
$navbar-brand-minimized-width: 50px !default
62-
$navbar-brand-minimized-bg: #fff !default;
61+
$navbar-brand-minimized-width: 50px !default;
62+
$navbar-brand-minimized-bg: $navbar-brand-bg !default;
6363
$navbar-brand-minimized-logo: url('../img/logo-symbol.png') !default;
6464
$navbar-brand-minimized-logo-size: 24px !default;
65+
$navbar-brand-minimized-border: $navbar-brand-border !default;
6566

6667
$navbar-color: $gray-600 !default;
6768
$navbar-hover-color: $gray-800 !default;
@@ -132,11 +133,13 @@ $sidebar-footer-height: auto !default;
132133
$sidebar-footer-bg: rgba(0,0,0,.2) !default;
133134
$sidebar-footer-padding-y: .75rem !default;
134135
$sidebar-footer-padding-x: 1rem !default;
136+
$sidebar-footer-borders: 0 !default;
135137

136138
// Sidebar Minimizer
137139

138140
$sidebar-minimizer-height: 50px !default;
139141
$sidebar-minimizer-bg: rgba(0,0,0,.2) !default;
142+
$sidebar-minimizer-borders: 0 !default;
140143
$sidebar-minimizer-indicator-color: $gray-600 !default;
141144
$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;
142145
$sidebar-minimizer-hover-bg: rgba(0,0,0,.3) !default;

0 commit comments

Comments
 (0)