Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.

Commit 9f7fba2

Browse files
authored
Merge pull request #1491 from ghiscoding/chore/sass-uses-part2
fix: more styling fixes after switching to @use instead of @imports
2 parents 34a1cf7 + 099f132 commit 9f7fba2

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

angular.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
}
5050
],
5151
"styles": [
52-
"node_modules/bootstrap/dist/css/bootstrap.min.css",
5352
"node_modules/@ng-select/ng-select/themes/default.theme.css",
5453
"src/styles.scss"
5554
],

src/app/examples/grid-composite-editor.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ $slick-button-border-color: #ababab !default;
22

33
.editable-field {
44
// box-shadow: inset 0 0 0 1px lightblue !important;
5-
background-color: rgba(227, 240, 251, 0.569) !important;
5+
background-color: rgba(227, 240, 251, 0.57) !important;
66
}
77
.slick-dark-mode .editable-field {
8-
background-color: rgb(105 123 145 / 57%) !important
8+
background-color: rgba(105, 123, 145, 0.57) !important
99
}
1010
.unsaved-editable-field {
1111
background-color: #fbfdd1 !important;

src/app/examples/grid-custom-tooltip.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// }
1818

1919
.editable-field {
20-
background-color: rgba(227, 240, 251, 0.569) !important;
20+
background-color: rgba(227, 240, 251, 0.57) !important;
2121
}
2222
.unsaved-editable-field {
2323
background-color: #fbfdd1 !important;

src/app/examples/grid-resize-by-content.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$slick-button-border-color: #ababab !default;
22

33
.editable-field {
4-
background-color: rgba(227, 240, 251, 0.569) !important;
4+
background-color: rgba(227, 240, 251, 0.57) !important;
55
}
66
.unsaved-editable-field {
77
background-color: #fbfdd1 !important;

src/styles.scss

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
@use 'sass:color';
22

3+
$primary-color: #0d6efd;
4+
5+
@use 'bootstrap' with (
6+
$primary: $primary-color
7+
);
8+
39
// -- 1. load with modern `@use`
4-
@use '@slickgrid-universal/common/dist/styles/sass/slickgrid-theme-bootstrap.scss';
5-
// @use '@slickgrid-universal/common/dist/styles/sass/slickgrid-theme-bootstrap.scss' with (
6-
// $slick-primary-color: red,
7-
// $slick-link-color: red
8-
// );
10+
// @use '@slickgrid-universal/common/dist/styles/sass/slickgrid-theme-bootstrap.scss';
11+
@use '@slickgrid-universal/common/dist/styles/sass/slickgrid-theme-bootstrap.scss' with (
12+
$slick-primary-color: $primary-color,
13+
// $slick-input-focus-box-shadow: 0 0 0 0.25rem rgba($primary-color, 0.25),
14+
);
915

1016
// -- 2. load with legacy `@import`
1117
// $slick-primary-color: red;
1218
// $slick-link-color: red;
1319
// @import '@slickgrid-universal/common/dist/styles/sass/slickgrid-theme-bootstrap.scss';
1420

15-
// :root {
21+
:root {
22+
--ms-choice-border: var(--bs-border-width) solid var(--bs-border-color);
1623
// --slick-button-style-bg-color: #fff;
1724
// --slick-button-border-color: #c7c7c7;
18-
// }
25+
}
1926

2027
$button-border-color: #ababab;
2128
$button-style-bg-color: #fff;

0 commit comments

Comments
 (0)