Skip to content

Commit 923dc4a

Browse files
mrholekmrholek
committed
- update: Bootstrap version to v4.0.0-beta.2
- update: vue-chartjs version to 3.0.0 - refactor: Remove old SCSS variables - refactor: Breadcrumb Menu styles - fix: External links issue - fix: Mobile sidebar-nav height issue
1 parent f244f02 commit 923dc4a

File tree

157 files changed

+2406
-1840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+2406
-1840
lines changed

‎Vue_Full_Project/CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
## [vue](./README.md) version `changelog`
22

3+
###### `v1.0.3`
4+
- moved vue-chartjs to `3.0.0` **[breaking change](https://github.com/apertureless/vue-chartjs/releases/tag/v3.0.0)** :fire:
5+
36
###### `v1.0.2`
47
- moved to vue: `^2.5.x`
8+
- updated bootstrap-vue to `1.0.0-beta.9`
59
- (vue `v2.5.x`) deprecated `<template scope="props">` replaced with `<div slot-scope="props">`
610
- `HeaderDropdown` component added to `Header`
7-
- moved to component `b-badge` (bootstrap-vue)
11+
- `b-badge` component added (bootstrap-vue)
12+
- `package.json` project dependencies update
813

‎Vue_Full_Project/package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/vue",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44
"description": "",
55
"author": "Łukasz Holeczek <lukasz@holeczek.pl>",
66
"private": true,
@@ -17,10 +17,9 @@
1717
"bootstrap-vue": "1.0.0-beta.9",
1818
"chart.js": "2.7.0",
1919
"font-awesome": "^4.7.0",
20-
"is-url-external": "^1.0.3",
2120
"simple-line-icons": "^2.4.1",
2221
"vue": "^2.5.2",
23-
"vue-chartjs": "2.8.7",
22+
"vue-chartjs": "^3.0.0",
2423
"vue-router": "^3.0.1"
2524
},
2625
"devDependencies": {
@@ -29,10 +28,10 @@
2928
"babel-eslint": "8.0.1",
3029
"babel-loader": "7.1.2",
3130
"babel-plugin-transform-runtime": "^6.22.0",
32-
"babel-preset-env": "1.6.0",
31+
"babel-preset-env": "1.6.1",
3332
"babel-preset-stage-2": "6.24.1",
3433
"babel-register": "6.26.0",
35-
"chalk": "2.1.0",
34+
"chalk": "2.2.0",
3635
"connect-history-api-fallback": "^1.4.0",
3736
"copy-webpack-plugin": "^4.1.1",
3837
"css-loader": "0.28.7",
@@ -43,7 +42,7 @@
4342
"eslint-plugin-import": "2.7.0",
4443
"eslint-plugin-node": "5.2.0",
4544
"eslint-config-standard": "10.2.1",
46-
"eslint-plugin-promise": "^3.6.0",
45+
"eslint-plugin-promise": "3.6.0",
4746
"eslint-plugin-standard": "3.0.1",
4847
"eventsource-polyfill": "^0.9.6",
4948
"express": "4.16.2",
@@ -53,7 +52,7 @@
5352
"html-webpack-plugin": "2.30.1",
5453
"http-proxy-middleware": "0.17.4",
5554
"webpack-bundle-analyzer": "2.9.0",
56-
"cross-env": "5.0.5",
55+
"cross-env": "^5.1.0",
5756
"karma": "1.7.1",
5857
"karma-coverage": "^1.1.1",
5958
"karma-mocha": "^1.3.0",
@@ -72,7 +71,7 @@
7271
"babel-plugin-istanbul": "4.1.5",
7372
"phantomjs-prebuilt": "^2.1.15",
7473
"chromedriver": "2.33.1",
75-
"cross-spawn": "^5.0.1",
74+
"cross-spawn": "^5.1.0",
7675
"nightwatch": "0.9.16",
7776
"selenium-server": "3.6.0",
7877
"semver": "5.4.1",
@@ -85,9 +84,9 @@
8584
"vue-loader": "13.3.0",
8685
"vue-style-loader": "3.0.3",
8786
"vue-template-compiler": "^2.5.2",
88-
"webpack": "^3.7.1",
89-
"webpack-dev-middleware": "^1.12.0",
90-
"webpack-hot-middleware": "^2.20.0",
87+
"webpack": "^3.8.1",
88+
"webpack-dev-middleware": "1.12.0",
89+
"webpack-hot-middleware": "2.20.0",
9190
"webpack-merge": "4.1.0",
9291
"node-sass": "4.5.3",
9392
"sass-loader": "6.0.6"

‎Vue_Full_Project/scss/_bootstrap-variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ $font-size-base: 0.875rem;
7676
// Breadcrumbs
7777

7878
$breadcrumb-bg: #fff;
79+
$breadcrumb-margin-bottom: 1.5rem;
7980

8081
// Cards
8182

‎Vue_Full_Project/scss/bootstrap/_alert.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
//
44

55
.alert {
6+
position: relative;
67
padding: $alert-padding-y $alert-padding-x;
78
margin-bottom: $alert-margin-bottom;
89
border: $alert-border-width solid transparent;
@@ -28,9 +29,9 @@
2829
.alert-dismissible {
2930
// Adjust close link position
3031
.close {
31-
position: relative;
32-
top: -$alert-padding-y;
33-
right: -$alert-padding-x;
32+
position: absolute;
33+
top: 0;
34+
right: 0;
3435
padding: $alert-padding-y $alert-padding-x;
3536
color: inherit;
3637
}

‎Vue_Full_Project/scss/bootstrap/_badge.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@
99
font-size: $badge-font-size;
1010
font-weight: $badge-font-weight;
1111
line-height: 1;
12-
color: $badge-color;
1312
text-align: center;
1413
white-space: nowrap;
1514
vertical-align: baseline;
16-
@include border-radius();
15+
@include border-radius($badge-border-radius);
1716

1817
// Empty badges collapse automatically
1918
&:empty {

‎Vue_Full_Project/scss/bootstrap/_breadcrumb.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
.breadcrumb {
2+
display: flex;
3+
flex-wrap: wrap;
24
padding: $breadcrumb-padding-y $breadcrumb-padding-x;
3-
margin-bottom: 1rem;
5+
margin-bottom: $breadcrumb-margin-bottom;
46
list-style: none;
57
background-color: $breadcrumb-bg;
68
@include border-radius($border-radius);
7-
@include clearfix;
89
}
910

1011
.breadcrumb-item {
11-
float: left;
12-
1312
// The separator between breadcrumbs (by default, a forward-slash: "/")
1413
+ .breadcrumb-item::before {
1514
display: inline-block; // Suppress underlining of the separator in modern browsers
@@ -28,6 +27,7 @@
2827
+ .breadcrumb-item:hover::before {
2928
text-decoration: underline;
3029
}
30+
// stylelint-disable-next-line no-duplicate-selectors
3131
+ .breadcrumb-item:hover::before {
3232
text-decoration: none;
3333
}

‎Vue_Full_Project/scss/bootstrap/_button-group.scss

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// scss-lint:disable QualifyingElement
1+
// stylelint-disable selector-no-qualifying-type
22

33
// Make the div behave like a button
44
.btn-group,
@@ -10,7 +10,6 @@
1010
> .btn {
1111
position: relative;
1212
flex: 0 1 auto;
13-
margin-bottom: 0;
1413

1514
// Bring the hover, focused, and "active" buttons to the front to overlay
1615
// the borders properly
@@ -48,33 +47,39 @@
4847
border-radius: 0;
4948
}
5049

51-
// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
50+
// Set corners individual because sometimes a single button can be in a .btn-group
51+
// and we need :first-child and :last-child to both match
5252
.btn-group > .btn:first-child {
5353
margin-left: 0;
5454

5555
&:not(:last-child):not(.dropdown-toggle) {
5656
@include border-right-radius(0);
5757
}
5858
}
59-
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
59+
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu
60+
// immediately after it
6061
.btn-group > .btn:last-child:not(:first-child),
6162
.btn-group > .dropdown-toggle:not(:first-child) {
6263
@include border-left-radius(0);
6364
}
6465

65-
// Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group)
66+
// Custom edits for including btn-groups within btn-groups (useful for including
67+
// dropdown buttons within a btn-group)
6668
.btn-group > .btn-group {
6769
float: left;
6870
}
71+
6972
.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
7073
border-radius: 0;
7174
}
75+
7276
.btn-group > .btn-group:first-child:not(:last-child) {
7377
> .btn:last-child,
7478
> .dropdown-toggle {
7579
@include border-right-radius(0);
7680
}
7781
}
82+
7883
.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
7984
@include border-left-radius(0);
8085
}
@@ -129,7 +134,6 @@
129134
//
130135

131136
.btn-group-vertical {
132-
display: inline-flex;
133137
flex-direction: column;
134138
align-items: flex-start;
135139
justify-content: center;
@@ -146,31 +150,36 @@
146150
margin-top: -$input-btn-border-width;
147151
margin-left: 0;
148152
}
149-
}
150153

151-
.btn-group-vertical > .btn {
152-
&:not(:first-child):not(:last-child) {
154+
> .btn {
155+
&:not(:first-child):not(:last-child) {
156+
border-radius: 0;
157+
}
158+
159+
&:first-child:not(:last-child) {
160+
@include border-bottom-radius(0);
161+
}
162+
163+
&:last-child:not(:first-child) {
164+
@include border-top-radius(0);
165+
}
166+
}
167+
168+
> .btn-group:not(:first-child):not(:last-child) > .btn {
153169
border-radius: 0;
154170
}
155-
&:first-child:not(:last-child) {
156-
@include border-bottom-radius(0);
171+
172+
> .btn-group:first-child:not(:last-child) {
173+
> .btn:last-child,
174+
> .dropdown-toggle {
175+
@include border-bottom-radius(0);
176+
}
157177
}
158-
&:last-child:not(:first-child) {
178+
179+
> .btn-group:last-child:not(:first-child) > .btn:first-child {
159180
@include border-top-radius(0);
160181
}
161182
}
162-
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
163-
border-radius: 0;
164-
}
165-
.btn-group-vertical > .btn-group:first-child:not(:last-child) {
166-
> .btn:last-child,
167-
> .dropdown-toggle {
168-
@include border-bottom-radius(0);
169-
}
170-
}
171-
.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
172-
@include border-top-radius(0);
173-
}
174183

175184

176185
// Checkbox and radio options

‎Vue_Full_Project/scss/bootstrap/_buttons.scss

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// scss-lint:disable QualifyingElement
1+
// stylelint-disable selector-no-qualifying-type
22

33
//
44
// Base styles
@@ -22,7 +22,7 @@
2222
&:focus,
2323
&.focus {
2424
outline: 0;
25-
box-shadow: $btn-focus-box-shadow;
25+
box-shadow: $input-btn-focus-box-shadow;
2626
}
2727

2828
// Disabled comes first so active can properly restyle
@@ -32,10 +32,10 @@
3232
@include box-shadow(none);
3333
}
3434

35-
&:active,
36-
&.active {
35+
&:not([disabled]):not(.disabled):active,
36+
&:not([disabled]):not(.disabled).active {
3737
background-image: none;
38-
@include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow);
38+
@include box-shadow($input-btn-focus-box-shadow, $btn-active-box-shadow);
3939
}
4040
}
4141

@@ -58,7 +58,11 @@ fieldset[disabled] a.btn {
5858

5959
@each $color, $value in $theme-colors {
6060
.btn-outline-#{$color} {
61-
@include button-outline-variant($value, #fff);
61+
@if $color == "light" {
62+
@include button-outline-variant($value, $gray-900);
63+
} @else {
64+
@include button-outline-variant($value, $white);
65+
}
6266
}
6367
}
6468

@@ -71,36 +75,27 @@ fieldset[disabled] a.btn {
7175
.btn-link {
7276
font-weight: $font-weight-normal;
7377
color: $link-color;
74-
border-radius: 0;
78+
background-color: transparent;
7579

76-
&,
77-
&:active,
78-
&.active,
79-
&:disabled {
80+
@include hover {
81+
color: $link-hover-color;
82+
text-decoration: $link-hover-decoration;
8083
background-color: transparent;
81-
@include box-shadow(none);
84+
border-color: transparent;
8285
}
83-
&,
86+
8487
&:focus,
85-
&:active {
88+
&.focus {
8689
border-color: transparent;
8790
box-shadow: none;
8891
}
89-
@include hover {
90-
border-color: transparent;
91-
}
92-
@include hover-focus {
93-
color: $link-hover-color;
94-
text-decoration: $link-hover-decoration;
95-
background-color: transparent;
96-
}
97-
&:disabled {
98-
color: $btn-link-disabled-color;
9992

100-
@include hover-focus {
101-
text-decoration: none;
102-
}
93+
&:disabled,
94+
&.disabled {
95+
color: $btn-link-disabled-color;
10396
}
97+
98+
// No need for an active state here
10499
}
105100

106101

@@ -109,11 +104,11 @@ fieldset[disabled] a.btn {
109104
//
110105

111106
.btn-lg {
112-
@include button-size($input-btn-padding-y-lg, $input-btn-padding-x-lg, $font-size-lg, $line-height-lg, $btn-border-radius-lg);
107+
@include button-size($input-btn-padding-y-lg, $input-btn-padding-x-lg, $font-size-lg, $input-btn-line-height-lg, $btn-border-radius-lg);
113108
}
114109

115110
.btn-sm {
116-
@include button-size($input-btn-padding-y-sm, $input-btn-padding-x-sm, $font-size-sm, $line-height-sm, $btn-border-radius-sm);
111+
@include button-size($input-btn-padding-y-sm, $input-btn-padding-x-sm, $font-size-sm, $input-btn-line-height-sm, $btn-border-radius-sm);
117112
}
118113

119114

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy