Skip to content

Commit df49854

Browse files
b224
1 parent 4575e4c commit df49854

4 files changed

Lines changed: 30 additions & 7 deletions

File tree

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414
"multi-theme"
1515
],
1616
"scripts": {
17-
"prod" : "sass src/punica.scss dist/punica.min.css --no-source-map --style compressed",
18-
"unminify": "sass src/punica.scss dist/punica.css --no-source-map",
19-
"watch" : "npm run prod -- -w"
17+
"prod" : "sass src/punica.scss dist/punica.min.css --no-source-map --style compressed",
18+
"unminify" : "sass src/punica.scss dist/punica.css --no-source-map",
19+
"unminify-watch": "npm run unminify -- -w",
20+
"watch" : "npm run prod -- -w"
2021
},
2122
"dependencies": {
2223
"sass": "1.82.0"

src/Core/Global/Mixins.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@mixin breakpoints(
1515
$size, $width: 'min-width'
1616
) {
17-
@media only screen and ($width: $size) {
17+
@media ($width: $size) {
1818
@content;
1919
}
2020
}

src/Modules/Elements/Grid/Grid.scss

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,28 @@
1010
@if enabled('elements', 'grid') {
1111
$column-size: elements('grid', 'columns', 'size');
1212

13-
.#{class('grid', 'container')} {
13+
// Containers
14+
.#{class('grid', 'container')},
15+
[class^="#{class('grid', 'container')}-"] {
1416
width : elements('grid', 'container', 'width');
1517
margin : elements('grid', 'container', 'margin');
1618
padding: 0 elements('grid', 'container', 'padding');
1719
}
1820
@include breakpoints(elements('grid', 'breakpoints', 'medium'), 'max-width') {
19-
.#{class('grid', 'container')} {
21+
.#{class('grid', 'container')},
22+
[class^="#{class('grid', 'container')}-"] {
2023
padding: 0 calc(elements('grid', 'container', 'padding') / 3);
2124
}
2225
}
26+
@each $label, $breakpoint in elements('grid', 'container', 'viewports') {
27+
@include breakpoints($breakpoint) {
28+
.#{class('grid', 'container')}-#{$label} {
29+
max-width: calc(#{$breakpoint} - 1.7%);
30+
}
31+
}
32+
}
33+
34+
// Row
2335
.#{class('grid', 'row')} {
2436
display : grid;
2537
grid-gap : elements('grid', 'gap');
@@ -36,12 +48,14 @@
3648
}
3749
}
3850
}
51+
3952
// Default Grid System
4053
@for $id from 1 through $column-size {
4154
.#{class('grid', 'column')}-#{$id} {
4255
grid-column: span #{$id};
4356
}
4457
}
58+
4559
// Breakpoints
4660
@each $label, $breakpoint in elements('grid', 'viewports') {
4761
@include breakpoints($breakpoint) {
@@ -52,6 +66,7 @@
5266
}
5367
}
5468
}
69+
5570
// Offset
5671
@if features('elements', 'grid', 'offset') {
5772
@each $label, $breakpoint in elements('grid', 'viewports') {

src/options.scss

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1204,7 +1204,14 @@ $options: (
12041204
'container': (
12051205
'width' : 100%,
12061206
'padding': 40px, // for left and right sides
1207-
'margin' : 0 auto
1207+
'margin' : 0 auto,
1208+
'viewports': ( // only for containers
1209+
('sm', 500px),
1210+
('md', 768px),
1211+
('lg', 992px),
1212+
('xl', 1260px),
1213+
('xxl', 1400px)
1214+
)
12081215
),
12091216
'breakpoints': (
12101217
'extra-small' : 0,

0 commit comments

Comments
 (0)