Skip to content

chore: migrate SCSS from deprecated @import usage #10066

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.

Sign up for GitHub

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
paulbalandan merged 1 commit into from
Mar 24, 2026
+107 −86
Merged

chore: migrate SCSS from deprecated @import usage #10066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions .github/workflows/test-scss.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
with:
# node version based on dart-sass test workflow
node-version: 16
node-version: '24'

- name: Install Dart Sass
run: |
Expand Down
66 changes: 33 additions & 33 deletions admin/css/debug-toolbar/_theme-dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
// ========================================================================== */

// The "box-shadow" mixin uses colors
@import '_mixins';
@use '_mixins';

// Graphic charter
@import '_graphic-charter';
@use '_graphic-charter';


// DEBUG ICON
// ========================================================================== */

#debug-icon {
background-color: $t-dark;
@include box-shadow(0, 0, 4px, $m-gray);
background-color: graphic-charter.$t-dark;
@include mixins.box-shadow(0, 0, 4px, graphic-charter.$m-gray);

a:active,
a:link,
a:visited {
color: $g-orange;
color: graphic-charter.$g-orange;
}
}

Expand All @@ -27,8 +27,8 @@
// ========================================================================== */

#debug-bar {
background-color: $t-dark;
color: $m-gray;
background-color: graphic-charter.$t-dark;
color: graphic-charter.$m-gray;

// Reset to prevent conflict with other CSS files
h1,
Expand All @@ -44,44 +44,44 @@
button,
.toolbar {
background-color: transparent;
color: $m-gray;
color: graphic-charter.$m-gray;
}

// Buttons
button {
background-color: $t-dark;
background-color: graphic-charter.$t-dark;
}

// Tables
table {
strong {
color: $g-orange;
color: graphic-charter.$g-orange;
}

tbody tr {
&:hover {
background-color: $g-gray;
background-color: graphic-charter.$g-gray;
}

&.current {
background-color: $m-orange;
background-color: graphic-charter.$m-orange;

td {
color: $t-dark;
color: graphic-charter.$t-dark;
}

&:hover td {
background-color: $g-red;
color: $t-light;
background-color: graphic-charter.$g-red;
color: graphic-charter.$t-light;
}
}
}
}

// The toolbar
.toolbar {
background-color: $g-gray;
@include box-shadow(0, 0, 4px, $g-gray);
background-color: graphic-charter.$g-gray;
@include mixins.box-shadow(0, 0, 4px, graphic-charter.$g-gray);

img {
filter: brightness(0) invert(1);
Expand All @@ -91,24 +91,24 @@
// Fixed top
&.fixed-top {
.toolbar {
@include box-shadow(0, 0, 4px, $g-gray);
@include mixins.box-shadow(0, 0, 4px, graphic-charter.$g-gray);
}

.tab {
@include box-shadow(0, 1px, 4px, $g-gray);
@include mixins.box-shadow(0, 1px, 4px, graphic-charter.$g-gray);
}
}

// "Muted" elements
.muted {
color: $m-gray;
color: graphic-charter.$m-gray;

td {
color: $g-gray;
color: graphic-charter.$g-gray;
}

&:hover td {
color: $m-gray;
color: graphic-charter.$m-gray;
}
}

Expand All @@ -121,34 +121,34 @@
// The toolbar menus
.ci-label {
&.active {
background-color: $t-dark;
background-color: graphic-charter.$t-dark;
}

&:hover {
background-color: $t-dark;
background-color: graphic-charter.$t-dark;
}

.badge {
background-color: $g-red;
color: $t-light;
background-color: graphic-charter.$g-red;
color: graphic-charter.$t-light;
}
}

// The tabs container
.tab {
background-color: $t-dark;
@include box-shadow(0, -1px, 4px, $g-gray);
background-color: graphic-charter.$t-dark;
@include mixins.box-shadow(0, -1px, 4px, graphic-charter.$g-gray);
}

// The "Timeline" tab
.timeline {
th,
td {
border-color: $g-gray;
border-color: graphic-charter.$g-gray;
}

.timer {
background-color: $g-orange;
background-color: graphic-charter.$g-orange;
}
}
}
Expand All @@ -158,10 +158,10 @@
// ========================================================================== */

.debug-view.show-view {
border-color: $g-orange;
border-color: graphic-charter.$g-orange;
}

.debug-view-path {
background-color: $m-orange;
color: $g-gray;
background-color: graphic-charter.$m-orange;
color: graphic-charter.$g-gray;
}
64 changes: 32 additions & 32 deletions admin/css/debug-toolbar/_theme-light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
// ========================================================================== */

// The "box-shadow" mixin uses colors
@import '_mixins';
@use '_mixins';

// Graphic charter
@import '_graphic-charter';
@use '_graphic-charter';


// DEBUG ICON
// ========================================================================== */

#debug-icon {
background-color: $t-light;
@include box-shadow(0, 0, 4px, $m-gray);
background-color: graphic-charter.$t-light;
@include mixins.box-shadow(0, 0, 4px, graphic-charter.$m-gray);

a:active,
a:link,
a:visited {
color: $g-orange;
color: graphic-charter.$g-orange;
}
}

Expand All @@ -27,8 +27,8 @@
// ========================================================================== */

#debug-bar {
background-color: $t-light;
color: $g-gray;
background-color: graphic-charter.$t-light;
color: graphic-charter.$g-gray;

// Reset to prevent conflict with other CSS files
h1,
Expand All @@ -44,40 +44,40 @@
button,
.toolbar {
background-color: transparent;
color: $g-gray;
color: graphic-charter.$g-gray;
}

// Buttons
button {
background-color: $t-light;
background-color: graphic-charter.$t-light;
}

// Tables
table {
strong {
color: $g-orange;
color: graphic-charter.$g-orange;
}

tbody tr {
&:hover {
background-color: $m-gray;
background-color: graphic-charter.$m-gray;
}

&.current {
background-color: $m-orange;
background-color: graphic-charter.$m-orange;

&:hover td {
background-color: $g-red;
color: $t-light;
background-color: graphic-charter.$g-red;
color: graphic-charter.$t-light;
}
}
}
}

// The toolbar
.toolbar {
background-color: $t-light;
@include box-shadow(0, 0, 4px, $m-gray);
background-color: graphic-charter.$t-light;
@include mixins.box-shadow(0, 0, 4px, graphic-charter.$m-gray);

img {
filter: brightness(0) invert(0.4);
Expand All @@ -87,24 +87,24 @@
// Fixed top
&.fixed-top {
.toolbar {
@include box-shadow(0, 0, 4px, $m-gray);
@include mixins.box-shadow(0, 0, 4px, graphic-charter.$m-gray);
}

.tab {
@include box-shadow(0, 1px, 4px, $m-gray);
@include mixins.box-shadow(0, 1px, 4px, graphic-charter.$m-gray);
}
}

// "Muted" elements
.muted {
color: $g-gray;
color: graphic-charter.$g-gray;

td {
color: $m-gray;
color: graphic-charter.$m-gray;
}

&:hover td {
color: $g-gray;
color: graphic-charter.$g-gray;
}
}

Expand All @@ -117,34 +117,34 @@
// The toolbar menus
.ci-label {
&.active {
background-color: $m-gray;
background-color: graphic-charter.$m-gray;
}

&:hover {
background-color: $m-gray;
background-color: graphic-charter.$m-gray;
}

.badge {
background-color: $g-red;
color: $t-light;
background-color: graphic-charter.$g-red;
color: graphic-charter.$t-light;
}
}

// The tabs container
.tab {
background-color: $t-light;
@include box-shadow(0, -1px, 4px, $m-gray);
background-color: graphic-charter.$t-light;
@include mixins.box-shadow(0, -1px, 4px, graphic-charter.$m-gray);
}

// The "Timeline" tab
.timeline {
th,
td {
border-color: $m-gray;
border-color: graphic-charter.$m-gray;
}

.timer {
background-color: $g-orange;
background-color: graphic-charter.$g-orange;
}
}
}
Expand All @@ -154,10 +154,10 @@
// ========================================================================== */

.debug-view.show-view {
border-color: $g-orange;
border-color: graphic-charter.$g-orange;
}

.debug-view-path {
background-color: $m-orange;
color: $g-gray;
background-color: graphic-charter.$m-orange;
color: graphic-charter.$g-gray;
}
Loading