Skip to content

Commit 4f09e35

Browse files
committed
refactor: reorder Sass imports for utilities, themes, and vendor to get imported in the correct ITCSS order
1 parent 0ea44f8 commit 4f09e35

File tree

2 files changed

+38
-57
lines changed

2 files changed

+38
-57
lines changed

packages/uikit-workshop/src/sass/pattern-lab--iframe-loader.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import 'scss/abstracts/variables';
2-
@import 'scss/abstracts/mixins';
1+
@import 'scss/01-abstracts/variables';
2+
@import 'scss/01-abstracts/mixins';
33

44
@keyframes animateIn {
55
from {

packages/uikit-workshop/src/sass/pattern-lab.scss

Lines changed: 36 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -15,32 +15,31 @@
1515
#TABLE OF CONTENTS
1616
\*------------------------------------*/
1717
/**
18-
* ABSTRACTS.................Variables
18+
* ABSTRACTS.................Variables and mixins
1919
* BASE......................Reset & Base elements
20+
* VENDOR....................Styles out of PL control
2021
* COMPONENTS................Components
22+
* THEMES....................Theming variations
2123
* UTILITIES.................Helper classes
22-
* VENDOR....................Styles out of PL control
2324
*/
2425

2526
/*------------------------------------*\
2627
#ABSTRACTS
2728
\*------------------------------------*/
28-
@import "scss/abstracts/variables";
29-
@import "scss/abstracts/mixins";
30-
31-
32-
33-
29+
@import 'scss/01-abstracts/variables';
30+
@import 'scss/01-abstracts/mixins';
3431

3532
/*------------------------------------*\
3633
#BASE
3734
\*------------------------------------*/
38-
@import "scss/base/reset";
39-
@import "scss/base/body";
40-
41-
42-
35+
@import 'scss/02-base/reset';
36+
@import 'scss/02-base/body';
4337

38+
/*------------------------------------*\
39+
#VENDOR
40+
\*------------------------------------*/
41+
@import 'scss/03-vendor/typeahead';
42+
@import 'scss/03-vendor/prism';
4443

4544
/*------------------------------------*\
4645
#COMPONENTS
@@ -49,59 +48,41 @@
4948
/**
5049
* Pattern Lab Header
5150
*/
52-
@import "scss/components/header";
53-
@import "scss/components/logo";
54-
@import "scss/components/navigation";
55-
@import "scss/components/ish-sizing";
56-
@import "scss/components/controls";
57-
@import "scss/components/tools";
51+
@import 'scss/04-components/header';
52+
@import 'scss/04-components/logo';
53+
@import 'scss/04-components/navigation';
54+
@import 'scss/04-components/ish-sizing';
55+
@import 'scss/04-components/controls';
56+
@import 'scss/04-components/tools';
5857

5958
/**
6059
* Viewport
6160
*/
62-
@import "scss/components/viewport";
61+
@import 'scss/04-components/viewport';
6362

6463
/**
6564
* Pattern Styles
6665
*/
67-
@import "scss/components/pattern";
68-
@import "scss/components/pattern-category";
69-
@import "scss/components/pattern-info";
70-
@import "scss/components/pattern-states";
71-
@import "scss/components/pattern-lineage";
72-
@import "scss/components/breadcrumbs";
73-
@import "scss/components/tabs";
74-
@import "scss/components/tools";
75-
@import "scss/components/annotations";
76-
@import "scss/components/modal";
77-
@import "scss/components/text-passage";
78-
79-
80-
81-
66+
@import 'scss/04-components/pattern';
67+
@import 'scss/04-components/pattern-category';
68+
@import 'scss/04-components/pattern-info';
69+
@import 'scss/04-components/pattern-states';
70+
@import 'scss/04-components/pattern-lineage';
71+
@import 'scss/04-components/breadcrumbs';
72+
@import 'scss/04-components/tabs';
73+
@import 'scss/04-components/tools';
74+
@import 'scss/04-components/annotations';
75+
@import 'scss/04-components/modal';
76+
@import 'scss/04-components/text-passage';
8277

8378
/*------------------------------------*\
84-
#UTILITIES
85-
\*------------------------------------*/
86-
@import "scss/utilities/visibility";
87-
88-
89-
90-
91-
92-
/*------------------------------------*\
93-
#VENDOR
79+
#THEMES
9480
\*------------------------------------*/
95-
@import "scss/vendor/typeahead";
96-
@import "scss/vendor/prism";
97-
98-
99-
100-
81+
@import 'scss/05-themes/light-theme';
82+
@import 'scss/05-themes/density-theme';
83+
@import 'scss/05-themes/sidebar-theme';
10184

10285
/*------------------------------------*\
103-
#THEMES
86+
#UTILITIES
10487
\*------------------------------------*/
105-
@import "scss/themes/light-theme";
106-
@import "scss/themes/density-theme";
107-
@import "scss/themes/sidebar-theme";
88+
@import 'scss/06-utilities/visibility';

0 commit comments

Comments
 (0)