Skip to content

Commit 60163cb

Browse files
sirbeagleartf
andauthored
Remove deprecated @import commands from SASS files (#6426)
* Remove the use of @import statements in sass files and remove nested calls that assume a parent style is available and instead reference shared parent items with @use * Update @uses with single quotes per Prettier * fix: Add height CSS for Safari not showing layer icons (#6394) (#6424) * Add height CSS for Safari not showing layer icons (#6394) * Missed the drag icon --------- Co-authored-by: Chris Benjamin <cbenjamin@stormseed.com> * Add options for zoom change event (#6429) * change order uses to match existing files * couple of fixes to incorrect SASS references --------- Co-authored-by: Chris Benjamin <cbenjamin@stormseed.com> Co-authored-by: Artur Arseniev <artur.catch@hotmail.it>
1 parent 5c23871 commit 60163cb

22 files changed

+808
-746
lines changed

packages/core/src/styles/scss/_gjs_assets.scss

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
.#{$app-prefix}dropzone {
1+
@use 'gjs_main_mixins';
2+
@use 'gjs_vars';
3+
@use 'gjs_category_general';
4+
5+
.#{gjs_vars.$app-prefix}dropzone {
26
display: none;
37
opacity: 0;
48
position: absolute;
@@ -11,14 +15,14 @@
1115
pointer-events: none;
1216
}
1317

14-
.#{$app-prefix}dropzone-active {
15-
.#{$app-prefix}dropzone {
18+
.#{gjs_vars.$app-prefix}dropzone-active {
19+
.#{gjs_vars.$app-prefix}dropzone {
1620
display: block;
1721
opacity: 1;
1822
}
1923
}
2024

21-
.#{$am-prefix}assets {
25+
.#{gjs_vars.$am-prefix}assets {
2226
height: 290px;
2327
overflow: auto;
2428
clear: both;
@@ -28,12 +32,12 @@
2832
align-content: flex-start;
2933
}
3034

31-
.#{$am-prefix}assets-header {
35+
.#{gjs_vars.$am-prefix}assets-header {
3236
padding: 5px;
3337
}
3438

35-
.#{$am-prefix}add-asset {
36-
.#{$am-prefix}add-field {
39+
.#{gjs_vars.$am-prefix}add-asset {
40+
.#{gjs_vars.$am-prefix}add-field {
3741
width: 70%;
3842
float: left;
3943
}
@@ -44,7 +48,7 @@
4448
}
4549
}
4650

47-
.#{$am-prefix}preview-cont {
51+
.#{gjs_vars.$am-prefix}preview-cont {
4852
position: relative;
4953
height: 70px;
5054
width: 30%;
@@ -54,7 +58,7 @@
5458
overflow: hidden;
5559
}
5660

57-
.#{$am-prefix}preview {
61+
.#{gjs_vars.$am-prefix}preview {
5862
position: absolute;
5963
background-position: center center;
6064
background-size: cover;
@@ -64,22 +68,22 @@
6468
z-index: 1;
6569
}
6670

67-
.#{$am-prefix}preview-bg {
68-
@include opacity(0.5);
71+
.#{gjs_vars.$am-prefix}preview-bg {
72+
@include gjs_main_mixins.opacity(0.5);
6973

7074
position: absolute;
7175
height: 100%;
7276
width: 100%;
7377
z-index: 0;
7478
}
7579

76-
.#{$am-prefix}dimensions {
77-
@include opacity(0.5);
80+
.#{gjs_vars.$am-prefix}dimensions {
81+
@include gjs_main_mixins.opacity(0.5);
7882

7983
font-size: 10px;
8084
}
8185

82-
.#{$am-prefix}meta {
86+
.#{gjs_vars.$am-prefix}meta {
8387
width: 70%;
8488
float: left;
8589
font-size: 12px;
@@ -91,7 +95,7 @@
9195
}
9296
}
9397

94-
.#{$am-prefix}close {
98+
.#{gjs_vars.$am-prefix}close {
9599
@extend .btn-cl;
96100

97101
cursor: pointer;
@@ -101,24 +105,24 @@
101105
display: none;
102106
}
103107

104-
.#{$am-prefix}asset {
105-
border-bottom: 1px solid darken-color(var(--gjs-main-dark-color), 3%);
108+
.#{gjs_vars.$am-prefix}asset {
109+
border-bottom: 1px solid gjs_main_mixins.darken-color(var(--gjs-main-dark-color), 3%);
106110
padding: 5px;
107111
cursor: pointer;
108112
position: relative;
109113
box-sizing: border-box;
110114
width: 100%;
111115

112-
&:hover .#{$am-prefix}close {
116+
&:hover .#{gjs_vars.$am-prefix}close {
113117
display: block;
114118
}
115119
}
116120

117-
.#{$am-prefix}highlight {
121+
.#{gjs_vars.$am-prefix}highlight {
118122
background-color: var(--gjs-main-light-color);
119123
}
120124

121-
.#{$am-prefix}assets-cont {
125+
.#{gjs_vars.$am-prefix}assets-cont {
122126
background-color: var(--gjs-secondary-dark-color);
123127
border-radius: 3px;
124128
box-sizing: border-box;

packages/core/src/styles/scss/_gjs_blocks.scss

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
1-
.#{$app-prefix}blocks-c {
1+
@use 'gjs_main_mixins';
2+
@use 'gjs_vars';
3+
@use 'gjs_category_general';
4+
5+
.#{gjs_vars.$app-prefix}blocks-c {
26
display: flex;
37
flex-wrap: wrap;
48
justify-content: flex-start;
59
}
610

7-
.#{$app-prefix}block-categories {
11+
.#{gjs_vars.$app-prefix}block-categories {
812
display: flex;
913
flex-direction: column;
1014
}
1115

12-
.#{$app-prefix}block-category {
16+
.#{gjs_vars.$app-prefix}block-category {
1317
width: 100%;
1418

15-
&.#{$app-prefix}open {
16-
@extend .#{$app-prefix}category-open;
19+
&.#{gjs_vars.$app-prefix}open {
20+
@extend .#{gjs_vars.$app-prefix}category-open;
1721
}
1822

19-
.#{$app-prefix}title {
20-
@extend .#{$app-prefix}category-title;
23+
.#{gjs_vars.$app-prefix}title {
24+
@extend .#{gjs_vars.$app-prefix}category-title;
2125
}
2226

23-
.#{$app-prefix}caret-icon {
27+
.#{gjs_vars.$app-prefix}caret-icon {
2428
margin-right: 5px;
2529
}
2630
}
2731

28-
.#{$app-prefix}block {
29-
@include user-select(none);
32+
.#{gjs_vars.$app-prefix}block {
33+
@include gjs_main_mixins.user-select(none);
3034

3135
width: 45%;
3236
min-width: 45px;
@@ -61,22 +65,22 @@
6165
}
6266
}
6367

64-
.#{$app-prefix}block-svg {
68+
.#{gjs_vars.$app-prefix}block-svg {
6569
width: 54px;
6670
fill: currentColor;
6771
}
6872

69-
.#{$app-prefix}block-svg-path {
73+
.#{gjs_vars.$app-prefix}block-svg-path {
7074
fill: currentColor;
7175
}
7276

73-
.#{$app-prefix}block.fa {
77+
.#{gjs_vars.$app-prefix}block.fa {
7478
font-size: 2em;
7579
line-height: 2em;
7680
padding: 11px;
7781
}
7882

79-
.#{$app-prefix}block-label {
83+
.#{gjs_vars.$app-prefix}block-label {
8084
line-height: normal;
8185
font-size: 0.65rem;
8286
font-weight: normal;
@@ -86,7 +90,7 @@
8690
pointer-events: none;
8791
}
8892

89-
.#{$app-prefix}block.#{$app-prefix}bdrag {
93+
.#{gjs_vars.$app-prefix}block.#{gjs_vars.$app-prefix}bdrag {
9094
width: auto;
9195
padding: 0;
9296
}

0 commit comments

Comments
 (0)