Skip to content

Commit 0a73de9

Browse files
xidedixxidedix
committed
chore: dependencies update
- chore: update `bootstrap` to `^4.2.1` - chore: update `@babel/polyfill` to `^7.2.5` - chore: update `@babel/cli` to `^7.2.3` - chore: update `@babel/core` to `^7.2.2` - chore: update `@babel/preset-env` to `^7.2.3` - chore: update `autoprefixer` to `^9.4.4` - chore: update `eslint` to `^5.12.0` - chore: update `node-sass` to `^4.11.0` - chore: update `nodemon` to `^1.18.9` - chore: update `postcss-cli` to `^6.1.1` - chore: update `rimraf` to `^2.6.3` - chore: update `rollup` to `^0.68.2` - chore: update `rollup-plugin-babel` to `^4.2.0` - chore: update `stylelint-scss` to `^3.4.4`
1 parent 06a6e9c commit 0a73de9

Some content is hidden

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

48 files changed

+1238
-572
lines changed

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
## v2.1.next
2+
###### Dependencies update:
3+
- chore: update `bootstrap` to `^4.2.1`
4+
- chore: update `@babel/polyfill` to `^7.2.5`
5+
- chore: update `@babel/cli` to `^7.2.3`
6+
- chore: update `@babel/core` to `^7.2.2`
7+
- chore: update `@babel/preset-env` to `^7.2.3`
8+
- chore: update `autoprefixer` to `^9.4.4`
9+
- chore: update `eslint` to `^5.12.0`
10+
- chore: update `node-sass` to `^4.11.0`
11+
- chore: update `nodemon` to `^1.18.9`
12+
- chore: update `postcss-cli` to `^6.1.1`
13+
- chore: update `rimraf` to `^2.6.3`
14+
- chore: update `rollup` to `^0.68.2`
15+
- chore: update `rollup-plugin-babel` to `^4.2.0`
16+
- chore: update `stylelint-scss` to `^3.4.4`
17+
118
## v2.1.4
219
- fix(scss): .sidebar .nav-link.disabled
320
- chore: update `@babel/cli` to `^7.2.0`

‎package-lock.json‎

Lines changed: 398 additions & 159 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,34 +71,34 @@
7171
"watch-css": "nodemon --ignore dist/ -e scss -x \"npm run css\""
7272
},
7373
"dependencies": {
74-
"@babel/polyfill": "^7.0.0",
74+
"@babel/polyfill": "^7.2.5",
7575
"@coreui/coreui-plugin-npm-postinstall": "^1.0.2",
76-
"bootstrap": "^4.1.3"
76+
"bootstrap": "^4.2.1"
7777
},
7878
"devDependencies": {
79-
"@babel/cli": "^7.2.0",
80-
"@babel/core": "^7.2.0",
79+
"@babel/cli": "^7.2.3",
80+
"@babel/core": "^7.2.2",
8181
"@babel/plugin-external-helpers": "^7.2.0",
8282
"@babel/plugin-proposal-object-rest-spread": "^7.2.0",
8383
"@babel/plugin-proposal-throw-expressions": "^7.2.0",
8484
"@babel/plugin-transform-runtime": "^7.2.0",
85-
"@babel/preset-env": "^7.2.0",
86-
"autoprefixer": "^9.4.2",
85+
"@babel/preset-env": "^7.2.3",
86+
"autoprefixer": "^9.4.4",
8787
"babel-eslint": "^10.0.1",
8888
"babel-plugin-istanbul": "^5.1.0",
8989
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
9090
"clean-css-cli": "^4.2.1",
9191
"copyfiles": "^2.1.0",
9292
"cross-env": "^5.2.0",
93-
"eslint": "^5.9.0",
93+
"eslint": "^5.12.0",
9494
"eslint-plugin-compat": "^2.6.2",
95-
"node-sass": "^4.10.0",
96-
"nodemon": "^1.18.7",
95+
"node-sass": "^4.11.0",
96+
"nodemon": "^1.18.9",
9797
"npm-run-all": "^4.1.5",
98-
"postcss-cli": "^6.0.1",
99-
"rimraf": "^2.6.2",
100-
"rollup": "^0.67.4",
101-
"rollup-plugin-babel": "^4.0.3",
98+
"postcss-cli": "^6.1.1",
99+
"rimraf": "^2.6.3",
100+
"rollup": "^0.68.2",
101+
"rollup-plugin-babel": "^4.2.0",
102102
"rollup-plugin-commonjs": "^9.2.0",
103103
"rollup-plugin-node-resolve": "^3.4.0",
104104
"semver": "^5.6.0",
@@ -108,7 +108,7 @@
108108
"stylelint-config-recommended-scss": "^3.2.0",
109109
"stylelint-config-standard": "^18.2.0",
110110
"stylelint-order": "^2.0.0",
111-
"stylelint-scss": "^3.4.1",
111+
"stylelint-scss": "^3.4.4",
112112
"uglify-js": "^3.4.9"
113113
},
114114
"peerDependencies": {

‎scss/bootstrap/_alert.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
// Expand the right padding and account for the close button's positioning.
2828

2929
.alert-dismissible {
30-
padding-right: ($close-font-size + $alert-padding-x * 2);
30+
padding-right: $close-font-size + $alert-padding-x * 2;
3131

3232
// Adjust close link position
3333
.close {

‎scss/bootstrap/_badge.scss‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@
1414
vertical-align: baseline;
1515
@include border-radius($badge-border-radius);
1616

17+
@at-root a#{&} {
18+
@include hover-focus {
19+
text-decoration: none;
20+
}
21+
}
22+
1723
// Empty badges collapse automatically
1824
&:empty {
1925
display: none;

‎scss/bootstrap/_button-group.scss‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
> .btn {
1111
position: relative;
12-
flex: 0 1 auto;
12+
flex: 1 1 auto;
1313

1414
// Bring the hover, focused, and "active" buttons to the front to overlay
1515
// the borders properly
@@ -22,14 +22,6 @@
2222
z-index: 1;
2323
}
2424
}
25-
26-
// Prevent double borders when buttons are next to each other
27-
.btn + .btn,
28-
.btn + .btn-group,
29-
.btn-group + .btn,
30-
.btn-group + .btn-group {
31-
margin-left: -$btn-border-width;
32-
}
3325
}
3426

3527
// Optional: Group multiple button groups together for a toolbar
@@ -44,8 +36,10 @@
4436
}
4537

4638
.btn-group {
47-
> .btn:first-child {
48-
margin-left: 0;
39+
// Prevent double borders when buttons are next to each other
40+
> .btn:not(:first-child),
41+
> .btn-group:not(:first-child) {
42+
margin-left: -$btn-border-width;
4943
}
5044

5145
// Reset rounded corners
@@ -119,17 +113,14 @@
119113
align-items: flex-start;
120114
justify-content: center;
121115

122-
.btn,
123-
.btn-group {
116+
> .btn,
117+
> .btn-group {
124118
width: 100%;
125119
}
126120

127-
> .btn + .btn,
128-
> .btn + .btn-group,
129-
> .btn-group + .btn,
130-
> .btn-group + .btn-group {
121+
> .btn:not(:first-child),
122+
> .btn-group:not(:first-child) {
131123
margin-top: -$btn-border-width;
132-
margin-left: 0;
133124
}
134125

135126
// Reset rounded corners

‎scss/bootstrap/_buttons.scss‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@
77
.btn {
88
display: inline-block;
99
font-weight: $btn-font-weight;
10+
color: $body-color;
1011
text-align: center;
11-
white-space: nowrap;
1212
vertical-align: middle;
1313
user-select: none;
14+
background-color: transparent;
1415
border: $btn-border-width solid transparent;
15-
@include button-size($btn-padding-y, $btn-padding-x, $font-size-base, $btn-line-height, $btn-border-radius);
16+
@include button-size($btn-padding-y, $btn-padding-x, $btn-font-size, $btn-line-height, $btn-border-radius);
1617
@include transition($btn-transition);
1718

18-
// Share hover and focus styles
19-
@include hover-focus {
19+
@include hover {
20+
color: $body-color;
2021
text-decoration: none;
2122
}
2223

@@ -80,19 +81,15 @@ fieldset:disabled a.btn {
8081
.btn-link {
8182
font-weight: $font-weight-normal;
8283
color: $link-color;
83-
background-color: transparent;
8484

8585
@include hover {
8686
color: $link-hover-color;
8787
text-decoration: $link-hover-decoration;
88-
background-color: transparent;
89-
border-color: transparent;
9088
}
9189

9290
&:focus,
9391
&.focus {
9492
text-decoration: $link-hover-decoration;
95-
border-color: transparent;
9693
box-shadow: none;
9794
}
9895

@@ -111,11 +108,11 @@ fieldset:disabled a.btn {
111108
//
112109

113110
.btn-lg {
114-
@include button-size($btn-padding-y-lg, $btn-padding-x-lg, $font-size-lg, $btn-line-height-lg, $btn-border-radius-lg);
111+
@include button-size($btn-padding-y-lg, $btn-padding-x-lg, $btn-font-size-lg, $btn-line-height-lg, $btn-border-radius-lg);
115112
}
116113

117114
.btn-sm {
118-
@include button-size($btn-padding-y-sm, $btn-padding-x-sm, $font-size-sm, $btn-line-height-sm, $btn-border-radius-sm);
115+
@include button-size($btn-padding-y-sm, $btn-padding-x-sm, $btn-font-size-sm, $btn-line-height-sm, $btn-border-radius-sm);
119116
}
120117

121118

‎scss/bootstrap/_card.scss‎

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
}
4444

4545
.card-subtitle {
46-
margin-top: -($card-spacer-y / 2);
46+
margin-top: -$card-spacer-y / 2;
4747
margin-bottom: 0;
4848
}
4949

@@ -68,6 +68,7 @@
6868
.card-header {
6969
padding: $card-spacer-y $card-spacer-x;
7070
margin-bottom: 0; // Removes the default margin-bottom of <hN>
71+
color: $card-cap-color;
7172
background-color: $card-cap-bg;
7273
border-bottom: $card-border-width solid $card-border-color;
7374

@@ -98,15 +99,15 @@
9899
//
99100

100101
.card-header-tabs {
101-
margin-right: -($card-spacer-x / 2);
102+
margin-right: -$card-spacer-x / 2;
102103
margin-bottom: -$card-spacer-y;
103-
margin-left: -($card-spacer-x / 2);
104+
margin-left: -$card-spacer-x / 2;
104105
border-bottom: 0;
105106
}
106107

107108
.card-header-pills {
108-
margin-right: -($card-spacer-x / 2);
109-
margin-left: -($card-spacer-x / 2);
109+
margin-right: -$card-spacer-x / 2;
110+
margin-left: -$card-spacer-x / 2;
110111
}
111112

112113
// Card image
@@ -277,25 +278,33 @@
277278
//
278279

279280
.accordion {
280-
.card:not(:first-of-type):not(:last-of-type) {
281-
border-bottom: 0;
282-
border-radius: 0;
283-
}
281+
.card {
282+
overflow: hidden;
283+
284+
&:not(:first-of-type) {
285+
.card-header:first-child {
286+
border-radius: 0;
287+
}
284288

285-
.card:not(:first-of-type) {
286-
.card-header:first-child {
287-
border-radius: 0;
289+
&:not(:last-of-type) {
290+
border-bottom: 0;
291+
border-radius: 0;
292+
}
288293
}
289-
}
290294

291-
.card:first-of-type {
292-
border-bottom: 0;
293-
border-bottom-right-radius: 0;
294-
border-bottom-left-radius: 0;
295-
}
295+
&:first-of-type {
296+
border-bottom: 0;
297+
border-bottom-right-radius: 0;
298+
border-bottom-left-radius: 0;
299+
}
296300

297-
.card:last-of-type {
298-
border-top-left-radius: 0;
299-
border-top-right-radius: 0;
301+
&:last-of-type {
302+
border-top-left-radius: 0;
303+
border-top-right-radius: 0;
304+
}
305+
306+
.card-header {
307+
margin-bottom: -$card-border-width;
308+
}
300309
}
301310
}

0 commit comments

Comments
 (0)