Skip to content

Commit 47a8075

Browse files
committed
optimized for dev and span
1 parent 18003be commit 47a8075

File tree

5 files changed

+66
-33
lines changed

5 files changed

+66
-33
lines changed

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@firestitch/style",
33
"title": "Style",
44
"description": "@firestitch/style",
5-
"version": "18.0.42",
5+
"version": "18.0.43",
66
"repository": {
77
"type": "git",
88
"url": "https://github.com/Firestitch/ngx-style"
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
1+
<h3>
2+
Delimit: Comma
3+
</h3>
14
<div class="fs-delimit">
25
<ng-container *ngFor="let item of items">
3-
<span>{{item.name}}</span>
6+
<span>
7+
{{ item.name }}
8+
</span>
9+
</ng-container>
10+
</div>
11+
<br>
12+
<h3>
13+
Delimit: Middot
14+
</h3>
15+
<div class="fs-delimit.middot">
16+
<ng-container *ngFor="let item of items">
17+
<span>
18+
{{ item.name }}
19+
</span>
420
</ng-container>
521
</div>

src/styles/_helpers.scss

+10-11
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@
1010
}
1111
}
1212

13-
.fs-delimit {
13+
div[class*='fs-delimit'] {
14+
&:not([class*='.middot']) > :not(:last-child):after {
15+
content: ',\00a0';
16+
}
17+
18+
&[class*='.middot'] > :not(:last-child):after {
19+
content: '\00a0·\00a0';
20+
}
21+
1422
> * {
1523
display: inline-flex;
16-
flex-wrap: wrap;
17-
18-
&:not(.middot):not(:last-child):after {
19-
content: ',\00a0';
20-
}
21-
22-
&.middot:not(:last-child):after {
23-
content: '\00a0·\00a0';
24-
}
2524
}
26-
}
25+
}

src/styles/_layout.scss

+36-18
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@
22

33
@mixin layout() {
44
.fs-row,
5-
[class*='fs-row'] {
5+
span[class*='fs-row'],
6+
div[class*='fs-row'] {
67
display: flex;
78
align-items: center;
89

910
@include attributeMixin('class');
1011
}
1112

1213
.fs-column,
13-
[class*='fs-column'] {
14+
div[class*='fs-column'],
15+
span[class*='fs-column'] {
1416
display: flex;
1517
flex-direction: column;
1618
align-items: unset;
@@ -26,45 +28,53 @@
2628
* Greater than breakpoints
2729
*/
2830
@media (min-width: #{variables.$break-xsmall + 1px}) {
29-
[fs\.gt-xs*='fs-row'] {
31+
div[fs\.gt-xs*='fs-row'],
32+
span[fs\.gt-xs*='fs-row'] {
3033
@include attributeMixin('fs\\.gt-xs');
3134
}
3235

33-
[fs\.gt-xs*='fs-column'] {
36+
div[fs\.gt-xs*='fs-column'],
37+
span[fs\.gt-xs*='fs-column'] {
3438
@include attributeMixin('fs\\.gt-xs', false);
3539
}
3640
}
3741

3842
@media (min-width: #{variables.$break-small + 1px}) {
39-
[fs\.gt-sm*='fs-row'] {
43+
div[fs\.gt-sm*='fs-row'],
44+
span[fs\.gt-sm*='fs-row'] {
4045
@include attributeMixin('fs\\.gt-sm');
4146
}
4247

43-
[fs\.gt-sm*='fs-column'] {
48+
div[fs\.gt-sm*='fs-column'],
49+
span[fs\.gt-sm*='fs-column'] {
4450
@include attributeMixin('fs\\.gt-sm', false);
4551
}
4652
}
4753

4854
@media (min-width: #{variables.$break-medium + 1px}) {
49-
[fs\.gt-md*='fs-row'] {
55+
div[fs\.gt-md*='fs-row'],
56+
span[fs\.gt-md*='fs-row'] {
5057
@include attributeMixin('fs\\.gt-md');
5158
}
5259

53-
[fs\.gt-md*='fs-column'] {
60+
div[fs\.gt-md*='fs-column'],
61+
span[fs\.gt-md*='fs-column'] {
5462
@include attributeMixin('fs\\.gt-md', false);
5563
}
5664
}
5765

5866
@media (min-width: #{variables.$break-large + 1px}) {
59-
[fs\.gt-lg*='fs-row'] {
67+
div[fs\.gt-lg*='fs-row'],
68+
span[fs\.gt-lg*='fs-row'] {
6069
& {
6170
flex-direction: row;
6271
}
6372

6473
@include attributeMixin('fs\\.gt-lg');
6574
}
6675

67-
[fs\.gt-lg*='fs-column'] {
76+
div[fs\.gt-lg*='fs-column'],
77+
span[fs\.gt-lg*='fs-column'] {
6878
@include attributeMixin('fs\\.gt-lg', false);
6979
}
7080
}
@@ -73,41 +83,49 @@
7383
* Less than breakpoints
7484
*/
7585
@media (max-width: variables.$break-xsmall) {
76-
[fs\.lt-xs*='fs-row'] {
86+
div[fs\.lt-xs*='fs-row'],
87+
span[fs\.lt-xs*='fs-row'] {
7788
@include attributeMixin('fs\\.lt-xs');
7889
}
7990

80-
[fs\.lt-xs*='fs-column'] {
91+
div[fs\.lt-xs*='fs-column'],
92+
span[fs\.lt-xs*='fs-column'] {
8193
@include attributeMixin('fs\\.lt-xs', false);
8294
}
8395
}
8496

8597
@media (max-width: variables.$break-small) {
86-
[fs\.lt-sm*='fs-row'] {
98+
div[fs\.lt-sm*='fs-row'],
99+
span[fs\.lt-sm*='fs-row'] {
87100
@include attributeMixin('fs\\.lt-sm');
88101
}
89102

90-
[fs\.lt-sm*='fs-column'] {
103+
div[fs\.lt-sm*='fs-column'],
104+
span[fs\.lt-sm*='fs-column'] {
91105
@include attributeMixin('fs\\.lt-sm', false);
92106
}
93107
}
94108

95109
@media (max-width: variables.$break-medium) {
96-
[fs\.lt-md*='fs-row'] {
110+
div[fs\.lt-md*='fs-row'],
111+
span[fs\.lt-md*='fs-row'] {
97112
@include attributeMixin('fs\\.lt-md');
98113
}
99114

100-
[fs\.lt-md*='fs-column'] {
115+
div[fs\.lt-md*='fs-column'],
116+
span[fs\.lt-md*='fs-column'] {
101117
@include attributeMixin('fs\\.lt-md', false);
102118
}
103119
}
104120

105121
@media (max-width: variables.$break-large) {
106-
[fs\.lt-lg*='fs-row'] {
122+
div[fs\.lt-lg*='fs-row'],
123+
span[fs\.lt-lg*='fs-row'] {
107124
@include attributeMixin('fs\\.lt-lg');
108125
}
109126

110-
[fs\.lt-lg*='fs-column'] {
127+
div[fs\.lt-lg*='fs-column'],
128+
span[fs\.lt-lg*='fs-column'] {
111129
@include attributeMixin('fs\\.lt-lg', false);
112130
}
113131
}

0 commit comments

Comments
 (0)