Skip to content

Commit e1d25d4

Browse files
Merge pull request #934 from sghoweri/feature/uikit-refactor--reorganize-sass-imports-plus-bug-fixes
UIKit Refactor Part 3: Bug Fixes + ITCSS Folder Reorganization
2 parents f2824af + e0b2fd9 commit e1d25d4

Some content is hidden

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

52 files changed

+1969
-1969
lines changed

packages/uikit-workshop/dist/index.html

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

packages/uikit-workshop/dist/styleguide/css/pattern-lab.5251243c.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/uikit-workshop/dist/styleguide/css/pattern-lab.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/uikit-workshop/dist/styleguide/css/pattern-lab.fade4ea7.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/uikit-workshop/dist/styleguide/js/patternlab-pattern.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/uikit-workshop/dist/styleguide/js/patternlab-viewer.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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';
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
/*------------------------------------*\
2+
#VARIABLES
3+
\*------------------------------------*/
4+
5+
/**
6+
* List Reset
7+
*/
8+
@mixin listReset() {
9+
list-style: none;
10+
margin: 0;
11+
padding: 0;
12+
}
13+
14+
/**
15+
* Hide scrollbar
16+
* 1) This hides scrollbars on Windows devices
17+
*/
18+
@mixin hideScrollBar() {
19+
-ms-overflow-style: -ms-autohiding-scrollbar;
20+
21+
&::-webkit-scrollbar {
22+
width: 0 !important;
23+
}
24+
}
25+
26+
/**
27+
* Header Link Style
28+
*/
29+
@mixin linkStyle() {
30+
background: $pl-color-black;
31+
color: $pl-color-gray-50;
32+
text-decoration: none;
33+
line-height: 1;
34+
padding: 0.7rem 0.5rem;
35+
border: 0;
36+
text-align: left;
37+
transition: background $pl-animate-quick ease-out,
38+
color $pl-animate-quick ease-out;
39+
40+
&:hover {
41+
color: $pl-color-white;
42+
background: $pl-color-gray-87;
43+
}
44+
45+
&:focus,
46+
&.active {
47+
color: $pl-color-white;
48+
background: $pl-color-gray-87;
49+
outline: 1px dotted $pl-color-gray-50;
50+
outline-offset: -1px;
51+
}
52+
53+
/**
54+
* Header link styles inside light theme
55+
*/
56+
.pl-c-body--theme-light & {
57+
background: $pl-color-white;
58+
color: $pl-color-gray-70;
59+
}
60+
61+
/**
62+
* Header link styles inside cozy theme
63+
*/
64+
.pl-c-body--theme-density-cozy & {
65+
font-size: $pl-font-size-sm-2;
66+
padding: 1.2rem 0.8rem;
67+
}
68+
69+
/**
70+
* Header link styles inside comfortable theme
71+
*/
72+
.pl-c-body--theme-density-comfortable & {
73+
font-size: $pl-font-size-sm-2;
74+
padding: 1.5rem 1rem;
75+
}
76+
}
77+
78+
/**
79+
* Accordion panel
80+
*/
81+
@mixin accordionPanel() {
82+
overflow: hidden;
83+
max-height: 0;
84+
transition: max-height $pl-animate-quick ease-out;
85+
86+
/**
87+
* Active is when accordion panel is open
88+
*/
89+
&.pl-is-active {
90+
max-height: none;
91+
overflow: auto;
92+
@include hideScrollBar();
93+
94+
@media all and (min-width: $pl-bp-med) {
95+
max-height: 120rem;
96+
}
97+
}
98+
}

packages/uikit-workshop/src/sass/scss/abstracts/_variables.scss renamed to packages/uikit-workshop/src/sass/scss/01-abstracts/_variables.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ $pl-color-gray-70: #4d4c4c;
1818
$pl-color-gray-87: #222;
1919
$pl-color-black: #000;
2020

21-
$pl-color-trans-white-25: rgba(255,255,255,0.25);
21+
$pl-color-trans-white-25: rgba(255, 255, 255, 0.25);
2222

23-
$pl-color-state-info: #02A4D5;
24-
$pl-color-state-complete: #03790F;
25-
$pl-color-state-inreview: #C7A118;
26-
$pl-color-state-deprecated: #B00B02;
23+
$pl-color-state-info: #02a4d5;
24+
$pl-color-state-complete: #03790f;
25+
$pl-color-state-inreview: #c7a118;
26+
$pl-color-state-deprecated: #b00b02;
2727

2828
// Font Family
29-
$pl-font: "HelveticaNeue", "Helvetica", "Arial", sans-serif;
29+
$pl-font: 'HelveticaNeue', 'Helvetica', 'Arial', sans-serif;
3030

3131
// Font sizes
3232
$pl-font-size-sm: 0.7rem;
@@ -36,7 +36,7 @@ $pl-font-size-large: 1.2rem;
3636

3737
// Spacing & Padding
3838
$pl-space: 1rem;
39-
$pl-doublespace: $pl-space*2;
39+
$pl-doublespace: $pl-space * 2;
4040
$pl-pad: 1rem;
4141
$pl-pad-half: $pl-pad/2;
4242
$offset-top: 2rem;
@@ -51,4 +51,4 @@ $pl-animate-quick: 0.1s;
5151

5252
// Borders
5353
$pl-border-radius: 3px;
54-
$pl-border-radius-med: 6px;
54+
$pl-border-radius-med: 6px;

0 commit comments

Comments
 (0)