Skip to content

[UI] Sass Deprecation Warnings #29910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ui/app/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: BUSL-1.1
*/

@import './reset';
@import 'ember-basic-dropdown';
@import 'ember-power-select';
@import './core';
@import './docs';
@use 'reset';
@use 'ember-basic-dropdown';
@use 'ember-power-select';
@use 'core';
@use 'docs';

@mixin font-face($name) {
@font-face {
Expand Down
28 changes: 16 additions & 12 deletions ui/app/styles/components/action-block.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@use '../utils/font_variables';
@use '../utils/mixins';
@use '../utils/size_variables';

/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
Expand All @@ -8,7 +12,7 @@
grid-row: 1/1;
}
@mixin stacked-content {
margin-bottom: $spacing-24;
margin-bottom: size_variables.$spacing-24;
}

.action-block-width {
Expand All @@ -18,17 +22,17 @@
.action-block {
grid-template-columns: 2fr 1fr;
display: grid;
padding: $spacing-16 $spacing-24;
padding: size_variables.$spacing-16 size_variables.$spacing-24;
line-height: inherit;
grid-gap: $spacing-16;
grid-gap: size_variables.$spacing-16;

@include until($mobile) {
@include mixins.until(size_variables.$mobile) {
@include stacked-grid();
}
}

.action-block-info {
@include until($mobile) {
@include mixins.until(size_variables.$mobile) {
@include stacked-content();
}
}
Expand All @@ -41,12 +45,12 @@
}

.action-block-title {
font-size: $size-5;
font-weight: $font-weight-bold;
font-size: size_variables.$size-5;
font-weight: font_variables.$font-weight-bold;
}
.action-block-action {
text-align: right;
@include until($mobile) {
@include mixins.until(size_variables.$mobile) {
text-align: left;
}
}
Expand All @@ -55,22 +59,22 @@
.replication-actions-grid-layout {
display: flex;
flex-wrap: wrap;
margin: $spacing-16 0;
@include until($mobile) {
margin: size_variables.$spacing-16 0;
@include mixins.until(size_variables.$mobile) {
display: block;
}
}

.replication-actions-grid-item {
flex-basis: 50%;
padding: $spacing-12;
padding: size_variables.$spacing-12;
display: flex;
width: 100%;
}

.replication-actions-grid-item .action-block {
width: 100%;
@include until($mobile) {
@include mixins.until(size_variables.$mobile) {
height: inherit;
}
}
8 changes: 6 additions & 2 deletions ui/app/styles/components/auth-form.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@use '../utils/size_variables';
@use '../core/box.scss';
@use '../helper-classes/general.scss';

/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
Expand Down Expand Up @@ -25,14 +29,14 @@
}

.toolbar-namespace-picker {
padding: 0 $spacing-12;
padding: 0 size_variables.$spacing-12;

.field {
width: 100%;
}

.field-label {
margin-right: $spacing-12;
margin-right: size_variables.$spacing-12;
align-self: center;
}

Expand Down
8 changes: 5 additions & 3 deletions ui/app/styles/components/autocomplete-input.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
@use '../utils/color_variables';

/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
*/

.autocomplete-input {
background: $white !important;
border: 1px solid $grey-light;
background: color_variables.$white !important;
border: 1px solid color_variables.$grey-light;
box-sizing: border-box;
border-radius: 3px;
width: 99%;
Expand All @@ -17,7 +19,7 @@
.autocomplete-input-option {
padding: 12px;
&:hover {
background-color: $grey-lightest;
background-color: color_variables.$grey-lightest;
cursor: pointer;
}
}
5 changes: 4 additions & 1 deletion ui/app/styles/components/b64-toggle.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
@use '../utils/size_variables';
@use '../core/buttons.scss';

/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
*/

.b64-toggle {
padding: 0.75rem;
font-size: $size-9;
font-size: size_variables.$size-9;
}
.b64-toggle.is-input {
box-shadow: none;
Expand Down
31 changes: 19 additions & 12 deletions ui/app/styles/components/box-label.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
@use '../utils/box-shadow_variables';
@use '../utils/color_variables';
@use '../utils/size_variables';
@use '../core/box.scss';
@use '../core/columns.scss';
@use '../helper-classes/flexbox-and-grid.scss';

/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
Expand All @@ -11,11 +18,11 @@ label.box-label {
@extend .box;
@extend .is-centered;

border-color: $grey-light;
border-color: color_variables.$grey-light;
border-radius: 3px;
box-shadow: $box-link-shadow;
box-shadow: box-shadow_variables.$box-link-shadow;
text-decoration: none;
transition: box-shadow $speed;
transition: box-shadow size_variables.$speed;
width: 100%;

> div:first-child {
Expand All @@ -27,23 +34,23 @@ label.box-label {
}

&.is-selected {
box-shadow: $box-link-hover-shadow, $box-shadow-middle;
box-shadow: box-shadow_variables.$box-link-hover-shadow, box-shadow_variables.$box-shadow-middle;

.icon {
color: $grey;
color: color_variables.$grey;
}
}

.icon {
color: $grey-light;
color: color_variables.$grey-light;
}

input[type='radio'] {
display: none;
}

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

input[type='radio']:checked + label {
background: $blue;
border: 1px solid $blue;
box-shadow: inset 0 0 0 0.15rem $white;
background: color_variables.$blue;
border: 1px solid color_variables.$blue;
box-shadow: inset 0 0 0 0.15rem color_variables.$white;
}
}

.box-label-header {
color: $grey;
color: color_variables.$grey;

.is-selected & {
color: $grey-darkest;
color: color_variables.$grey-darkest;
}
}
15 changes: 10 additions & 5 deletions ui/app/styles/components/calendar-widget.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
@use '../utils/box-shadow_variables';
@use '../utils/color_variables';
@use '../utils/font_variables';
@use '../utils/size_variables';

/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
Expand All @@ -18,13 +23,13 @@ $dark-gray: #535f73;
}
}
.calendar-title {
padding: $spacing-10 $spacing-12;
padding: size_variables.$spacing-10 size_variables.$spacing-12;
}

.select-year {
grid-area: select-year;
margin: 10px 24px;
font-weight: $font-weight-bold;
font-weight: font_variables.$font-weight-bold;
display: flex;
justify-content: space-between;
align-items: first baseline;
Expand All @@ -36,7 +41,7 @@ $dark-gray: #535f73;

.border-col {
grid-area: border-col;
background-color: $ui-gray-200;
background-color: color_variables.$ui-gray-200;
}

.calendar-widget-container {
Expand All @@ -46,9 +51,9 @@ $dark-gray: #535f73;
'calendar-widget';
grid-template-columns: 1fr;
grid-template-rows: 0.7fr 3fr;
box-shadow: $box-shadow, $box-shadow-middle;
box-shadow: box-shadow_variables.$box-shadow, box-shadow_variables.$box-shadow-middle;
background-color: white;
border-radius: $radius;
border-radius: size_variables.$radius;
}

.calendar-widget-grid {
Expand Down
Loading
Loading