Skip to content

Commit c4dc26b

Browse files
zofskeezzofskeez
authored
runs sass-migrate to fix deprecation warnings (#29910)
1 parent 5a85639 commit c4dc26b

Some content is hidden

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

82 files changed

+1314
-980
lines changed

‎ui/app/styles/app.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* SPDX-License-Identifier: BUSL-1.1
44
*/
55

6-
@import './reset';
7-
@import 'ember-basic-dropdown';
8-
@import 'ember-power-select';
9-
@import './core';
10-
@import './docs';
6+
@use 'reset';
7+
@use 'ember-basic-dropdown';
8+
@use 'ember-power-select';
9+
@use 'core';
10+
@use 'docs';
1111

1212
@mixin font-face($name) {
1313
@font-face {

‎ui/app/styles/components/action-block.scss

+16-12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
@use '../utils/font_variables';
2+
@use '../utils/mixins';
3+
@use '../utils/size_variables';
4+
15
/**
26
* Copyright (c) HashiCorp, Inc.
37
* SPDX-License-Identifier: BUSL-1.1
@@ -8,7 +12,7 @@
812
grid-row: 1/1;
913
}
1014
@mixin stacked-content {
11-
margin-bottom: $spacing-24;
15+
margin-bottom: size_variables.$spacing-24;
1216
}
1317

1418
.action-block-width {
@@ -18,17 +22,17 @@
1822
.action-block {
1923
grid-template-columns: 2fr 1fr;
2024
display: grid;
21-
padding: $spacing-16 $spacing-24;
25+
padding: size_variables.$spacing-16 size_variables.$spacing-24;
2226
line-height: inherit;
23-
grid-gap: $spacing-16;
27+
grid-gap: size_variables.$spacing-16;
2428

25-
@include until($mobile) {
29+
@include mixins.until(size_variables.$mobile) {
2630
@include stacked-grid();
2731
}
2832
}
2933

3034
.action-block-info {
31-
@include until($mobile) {
35+
@include mixins.until(size_variables.$mobile) {
3236
@include stacked-content();
3337
}
3438
}
@@ -41,12 +45,12 @@
4145
}
4246

4347
.action-block-title {
44-
font-size: $size-5;
45-
font-weight: $font-weight-bold;
48+
font-size: size_variables.$size-5;
49+
font-weight: font_variables.$font-weight-bold;
4650
}
4751
.action-block-action {
4852
text-align: right;
49-
@include until($mobile) {
53+
@include mixins.until(size_variables.$mobile) {
5054
text-align: left;
5155
}
5256
}
@@ -55,22 +59,22 @@
5559
.replication-actions-grid-layout {
5660
display: flex;
5761
flex-wrap: wrap;
58-
margin: $spacing-16 0;
59-
@include until($mobile) {
62+
margin: size_variables.$spacing-16 0;
63+
@include mixins.until(size_variables.$mobile) {
6064
display: block;
6165
}
6266
}
6367

6468
.replication-actions-grid-item {
6569
flex-basis: 50%;
66-
padding: $spacing-12;
70+
padding: size_variables.$spacing-12;
6771
display: flex;
6872
width: 100%;
6973
}
7074

7175
.replication-actions-grid-item .action-block {
7276
width: 100%;
73-
@include until($mobile) {
77+
@include mixins.until(size_variables.$mobile) {
7478
height: inherit;
7579
}
7680
}

‎ui/app/styles/components/auth-form.scss

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
@use '../utils/size_variables';
2+
@use '../core/box.scss';
3+
@use '../helper-classes/general.scss';
4+
15
/**
26
* Copyright (c) HashiCorp, Inc.
37
* SPDX-License-Identifier: BUSL-1.1
@@ -25,14 +29,14 @@
2529
}
2630

2731
.toolbar-namespace-picker {
28-
padding: 0 $spacing-12;
32+
padding: 0 size_variables.$spacing-12;
2933

3034
.field {
3135
width: 100%;
3236
}
3337

3438
.field-label {
35-
margin-right: $spacing-12;
39+
margin-right: size_variables.$spacing-12;
3640
align-self: center;
3741
}
3842

‎ui/app/styles/components/autocomplete-input.scss

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
@use '../utils/color_variables';
2+
13
/**
24
* Copyright (c) HashiCorp, Inc.
35
* SPDX-License-Identifier: BUSL-1.1
46
*/
57

68
.autocomplete-input {
7-
background: $white !important;
8-
border: 1px solid $grey-light;
9+
background: color_variables.$white !important;
10+
border: 1px solid color_variables.$grey-light;
911
box-sizing: border-box;
1012
border-radius: 3px;
1113
width: 99%;
@@ -17,7 +19,7 @@
1719
.autocomplete-input-option {
1820
padding: 12px;
1921
&:hover {
20-
background-color: $grey-lightest;
22+
background-color: color_variables.$grey-lightest;
2123
cursor: pointer;
2224
}
2325
}

‎ui/app/styles/components/b64-toggle.scss

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
@use '../utils/size_variables';
2+
@use '../core/buttons.scss';
3+
14
/**
25
* Copyright (c) HashiCorp, Inc.
36
* SPDX-License-Identifier: BUSL-1.1
47
*/
58

69
.b64-toggle {
710
padding: 0.75rem;
8-
font-size: $size-9;
11+
font-size: size_variables.$size-9;
912
}
1013
.b64-toggle.is-input {
1114
box-shadow: none;

‎ui/app/styles/components/box-label.scss

+19-12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
@use '../utils/box-shadow_variables';
2+
@use '../utils/color_variables';
3+
@use '../utils/size_variables';
4+
@use '../core/box.scss';
5+
@use '../core/columns.scss';
6+
@use '../helper-classes/flexbox-and-grid.scss';
7+
18
/**
29
* Copyright (c) HashiCorp, Inc.
310
* SPDX-License-Identifier: BUSL-1.1
@@ -11,11 +18,11 @@ label.box-label {
1118
@extend .box;
1219
@extend .is-centered;
1320

14-
border-color: $grey-light;
21+
border-color: color_variables.$grey-light;
1522
border-radius: 3px;
16-
box-shadow: $box-link-shadow;
23+
box-shadow: box-shadow_variables.$box-link-shadow;
1724
text-decoration: none;
18-
transition: box-shadow $speed;
25+
transition: box-shadow size_variables.$speed;
1926
width: 100%;
2027

2128
> div:first-child {
@@ -27,23 +34,23 @@ label.box-label {
2734
}
2835

2936
&.is-selected {
30-
box-shadow: $box-link-hover-shadow, $box-shadow-middle;
37+
box-shadow: box-shadow_variables.$box-link-hover-shadow, box-shadow_variables.$box-shadow-middle;
3138

3239
.icon {
33-
color: $grey;
40+
color: color_variables.$grey;
3441
}
3542
}
3643

3744
.icon {
38-
color: $grey-light;
45+
color: color_variables.$grey-light;
3946
}
4047

4148
input[type='radio'] {
4249
display: none;
4350
}
4451

4552
input[type='radio'] + label {
46-
border: 1px solid $grey-light;
53+
border: 1px solid color_variables.$grey-light;
4754
border-radius: 50%;
4855
cursor: pointer;
4956
display: block;
@@ -53,16 +60,16 @@ label.box-label {
5360
}
5461

5562
input[type='radio']:checked + label {
56-
background: $blue;
57-
border: 1px solid $blue;
58-
box-shadow: inset 0 0 0 0.15rem $white;
63+
background: color_variables.$blue;
64+
border: 1px solid color_variables.$blue;
65+
box-shadow: inset 0 0 0 0.15rem color_variables.$white;
5966
}
6067
}
6168

6269
.box-label-header {
63-
color: $grey;
70+
color: color_variables.$grey;
6471

6572
.is-selected & {
66-
color: $grey-darkest;
73+
color: color_variables.$grey-darkest;
6774
}
6875
}

‎ui/app/styles/components/calendar-widget.scss

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
@use '../utils/box-shadow_variables';
2+
@use '../utils/color_variables';
3+
@use '../utils/font_variables';
4+
@use '../utils/size_variables';
5+
16
/**
27
* Copyright (c) HashiCorp, Inc.
38
* SPDX-License-Identifier: BUSL-1.1
@@ -18,13 +23,13 @@ $dark-gray: #535f73;
1823
}
1924
}
2025
.calendar-title {
21-
padding: $spacing-10 $spacing-12;
26+
padding: size_variables.$spacing-10 size_variables.$spacing-12;
2227
}
2328

2429
.select-year {
2530
grid-area: select-year;
2631
margin: 10px 24px;
27-
font-weight: $font-weight-bold;
32+
font-weight: font_variables.$font-weight-bold;
2833
display: flex;
2934
justify-content: space-between;
3035
align-items: first baseline;
@@ -36,7 +41,7 @@ $dark-gray: #535f73;
3641

3742
.border-col {
3843
grid-area: border-col;
39-
background-color: $ui-gray-200;
44+
background-color: color_variables.$ui-gray-200;
4045
}
4146

4247
.calendar-widget-container {
@@ -46,9 +51,9 @@ $dark-gray: #535f73;
4651
'calendar-widget';
4752
grid-template-columns: 1fr;
4853
grid-template-rows: 0.7fr 3fr;
49-
box-shadow: $box-shadow, $box-shadow-middle;
54+
box-shadow: box-shadow_variables.$box-shadow, box-shadow_variables.$box-shadow-middle;
5055
background-color: white;
51-
border-radius: $radius;
56+
border-radius: size_variables.$radius;
5257
}
5358

5459
.calendar-widget-grid {

0 commit comments

Comments
 (0)