Skip to content

Commit d5f3bef

Browse files
jcbrandjcbrand
committed
Include mixins and variables in the SCSS files.
Otherwise CSS can't be generated.
1 parent 533d980 commit d5f3bef

File tree

13 files changed

+241
-126
lines changed

13 files changed

+241
-126
lines changed

‎Makefile‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -73,50 +73,50 @@ clean::
7373

7474
all_css:: css
7575
@echo "Hang tight!"
76-
@$(SASS) src/pat/auto-scale/_auto-scale.scss src/pat/auto-scale/auto-scale.css
77-
@$(SASS) src/pat/auto-submit/_auto-submit.scss src/pat/auto-submit/auto-submit.css
78-
@$(SASS) src/pat/auto-suggest/_auto-suggest.scss src/pat/auto-suggest/auto-suggest.css
79-
@$(SASS) src/pat/autofocus/_autofocus.scss src/pat/autofocus/autofocus.css
80-
@$(SASS) src/pat/bumper/_bumper.scss src/pat/bumper/bumper.css
81-
@$(SASS) src/pat/calendar/_calendar.scss src/pat/calendar/calendar.css
82-
@$(SASS) src/pat/carousel/_carousel.scss src/pat/carousel/carousel.css
83-
@$(SASS) src/pat/checked-flag/_checked-flag.scss src/pat/checked-flag/checked-flag.css
84-
@$(SASS) src/pat/checklist/_checklist.scss src/pat/checklist/checklist.css
85-
@$(SASS) src/pat/clone/_clone.scss src/pat/clone/clone.css
86-
@$(SASS) src/pat/collapsible/_collapsible.scss src/pat/collapsible/collapsible.css
87-
@$(SASS) src/pat/date-picker/_date-picker.scss src/pat/date-picker/date-picker.css
88-
@$(SASS) src/pat/depends/_depends.scss src/pat/depends/depends.css
89-
@$(SASS) src/pat/edit-tinymce/_edit-tinymce.scss src/pat/edit-tinymce/edit-tinymce.css
90-
@$(SASS) src/pat/equaliser/_equaliser.scss src/pat/equaliser/equaliser.css
91-
@$(SASS) src/pat/expandable-tree/_expandable-tree.scss src/pat/expandable-tree/expandable-tree.css
92-
@$(SASS) src/pat/focus/_focus.scss src/pat/focus/focus.css
76+
@$(SASS) -I . -I _sass src/pat/auto-scale/_auto-scale.scss src/pat/auto-scale/auto-scale.css
77+
@$(SASS) -I . -I _sass src/pat/auto-submit/_auto-submit.scss src/pat/auto-submit/auto-submit.css
78+
@$(SASS) -I . -I _sass src/pat/auto-suggest/_auto-suggest.scss src/pat/auto-suggest/auto-suggest.css
79+
@$(SASS) -I . -I _sass src/pat/autofocus/_autofocus.scss src/pat/autofocus/autofocus.css
80+
@$(SASS) -I . -I _sass src/pat/bumper/_bumper.scss src/pat/bumper/bumper.css
81+
@$(SASS) -I . -I _sass src/pat/calendar/_calendar.scss src/pat/calendar/calendar.css
82+
@$(SASS) -I . -I _sass src/pat/carousel/_carousel.scss src/pat/carousel/carousel.css
83+
@$(SASS) -I . -I _sass src/pat/checked-flag/_checked-flag.scss src/pat/checked-flag/checked-flag.css
84+
@$(SASS) -I . -I _sass src/pat/checklist/_checklist.scss src/pat/checklist/checklist.css
85+
@$(SASS) -I . -I _sass src/pat/clone/_clone.scss src/pat/clone/clone.css
86+
@$(SASS) -I . -I _sass src/pat/collapsible/_collapsible.scss src/pat/collapsible/collapsible.css
87+
@$(SASS) -I . -I _sass src/pat/date-picker/_date-picker.scss src/pat/date-picker/date-picker.css
88+
@$(SASS) -I . -I _sass src/pat/depends/_depends.scss src/pat/depends/depends.css
89+
@$(SASS) -I . -I _sass src/pat/edit-tinymce/_edit-tinymce.scss src/pat/edit-tinymce/edit-tinymce.css
90+
@$(SASS) -I . -I _sass src/pat/equaliser/_equaliser.scss src/pat/equaliser/equaliser.css
91+
@$(SASS) -I . -I _sass src/pat/expandable-tree/_expandable-tree.scss src/pat/expandable-tree/expandable-tree.css
92+
@$(SASS) -I . -I _sass src/pat/focus/_focus.scss src/pat/focus/focus.css
9393
@echo "Almost there, don't give up!"
94-
@$(SASS) src/pat/forward/_forward.scss src/pat/forward/forward.css
95-
@$(SASS) src/pat/gallery/_gallery.scss src/pat/gallery/gallery.css
96-
@$(SASS) src/pat/grid/_grid.scss src/pat/grid/grid.css
97-
@$(SASS) src/pat/image-crop/_image-crop.scss src/pat/image-crop/image-crop.css
98-
@$(SASS) src/pat/inject-history/_inject-history.scss src/pat/inject-history/inject-history.css
99-
@$(SASS) src/pat/inject/_inject.scss src/pat/inject/inject.css
100-
@$(SASS) src/pat/markdown/_markdown.scss src/pat/markdown/markdown.css
101-
@$(SASS) src/pat/masonry/_masonry.scss src/pat/masonry/masonry.css
102-
@$(SASS) src/pat/modal/_modal.scss src/pat/modal/modal.css
103-
@$(SASS) src/pat/navigation/_navigation.scss src/pat/navigation/navigation.css
104-
@$(SASS) src/pat/notification/_notification.scss src/pat/notification/notification.css
105-
@$(SASS) src/pat/slideshow-builder/_slideshow-builder.scss src/pat/slideshow-builder/slideshow-builder.css
106-
@$(SASS) src/pat/sortable/_sortable.scss src/pat/sortable/sortable.css
107-
@$(SASS) src/pat/stacks/_stacks.scss src/pat/stacks/stacks.css
108-
@$(SASS) src/pat/switch/_switch.scss src/pat/switch/switch.css
109-
@$(SASS) src/pat/toggle/_toggle.scss src/pat/toggle/toggle.css
110-
@$(SASS) src/pat/tooltip/_tooltip.scss src/pat/tooltip/tooltip.css
111-
@$(SASS) src/pat/validate/_validate.scss src/pat/validate/validate.css
112-
@$(SASS) src/pat/zoom/_zoom.scss src/pat/zoom/zoom.css
94+
@$(SASS) -I . -I _sass src/pat/forward/_forward.scss src/pat/forward/forward.css
95+
@$(SASS) -I . -I _sass src/pat/gallery/_gallery.scss src/pat/gallery/gallery.css
96+
@$(SASS) -I . -I _sass src/pat/grid/_grid.scss src/pat/grid/grid.css
97+
@$(SASS) -I . -I _sass src/pat/image-crop/_image-crop.scss src/pat/image-crop/image-crop.css
98+
@$(SASS) -I . -I _sass src/pat/inject-history/_inject-history.scss src/pat/inject-history/inject-history.css
99+
@$(SASS) -I . -I _sass src/pat/inject/_inject.scss src/pat/inject/inject.css
100+
@$(SASS) -I . -I _sass src/pat/markdown/_markdown.scss src/pat/markdown/markdown.css
101+
@$(SASS) -I . -I _sass src/pat/masonry/_masonry.scss src/pat/masonry/masonry.css
102+
@$(SASS) -I . -I _sass src/pat/modal/_modal.scss src/pat/modal/modal.css
103+
@$(SASS) -I . -I _sass src/pat/navigation/_navigation.scss src/pat/navigation/navigation.css
104+
@$(SASS) -I . -I _sass src/pat/notification/_notification.scss src/pat/notification/notification.css
105+
@$(SASS) -I . -I _sass src/pat/slideshow-builder/_slideshow-builder.scss src/pat/slideshow-builder/slideshow-builder.css
106+
@$(SASS) -I . -I _sass src/pat/sortable/_sortable.scss src/pat/sortable/sortable.css
107+
@$(SASS) -I . -I _sass src/pat/stacks/_stacks.scss src/pat/stacks/stacks.css
108+
@$(SASS) -I . -I _sass src/pat/switch/_switch.scss src/pat/switch/switch.css
109+
@$(SASS) -I . -I _sass src/pat/toggle/_toggle.scss src/pat/toggle/toggle.css
110+
@$(SASS) -I . -I _sass src/pat/tooltip/_tooltip.scss src/pat/tooltip/tooltip.css
111+
@$(SASS) -I . -I _sass src/pat/validate/_validate.scss src/pat/validate/validate.css
112+
@$(SASS) -I . -I _sass src/pat/zoom/_zoom.scss src/pat/zoom/zoom.css
113113
@echo "Done. Each pattern now has a CSS file."
114114

115115
css:: stamp-bundler
116-
@$(SASS) -I style -I . _sass/_patterns.scss style/patterns.css
116+
@$(SASS) -I style -I _sass -I . _sass/_patterns.scss style/patterns.css
117117

118118
watch::
119-
$(SASS) --watch -I style -I . _sass/_patterns.scss:style/patterns.css
119+
$(SASS) --watch -I style -I . -I _sass _sass/_patterns.scss:style/patterns.css
120120

121121
########################################################################
122122

‎_sass/_mixins.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,4 +224,4 @@
224224
background-color: $colour-warning;
225225
color: white;
226226
}
227-
}
227+
}

‎src/pat/auto-suggest/_auto-suggest.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@charset "UTF-8";
2+
@import "settings";
23

34
/* @group Auto suggest */
45

@@ -678,4 +679,4 @@ disabled look for disabled choices in the results dropdown
678679
}
679680
}
680681

681-
/* @end */
682+
/* @end */

‎src/pat/auto-suggest/auto-suggest.css‎

Lines changed: 49 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/pat/bumper/_bumper.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* @group Bumper */
2+
@import "../../../_sass/_settings.scss";
23

34
.pat-bumper {
45
z-index: 99;

‎src/pat/calendar/_calendar.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "src/pat/calendar/_fullcalendar.scss";
1+
@import "./_fullcalendar.scss";
22

33
.calendar-container {
44
overflow-y: scroll;

‎src/pat/checklist/_checklist.scss‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
@charset "UTF-8";
2+
@import "settings";
23

34
.pat-checklist {
45

@@ -46,4 +47,4 @@
4647
margin-bottom: 0;
4748
position: relative;
4849
}
49-
}
50+
}

‎src/pat/collapsible/_collapsible.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
@import "_sass/settings";
2-
@import "_sass/components/button";
1+
@import "settings";
2+
@import "components/button";
33

44
.pat-collapsible {
55
margin-bottom: 0.5em;

‎src/pat/focus/_focus.scss‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "settings";
2+
13
fieldset.focus > .legend,
24
label.focus {
35
color: $colour-accent;

0 commit comments

Comments
 (0)