Skip to content

Commit 3ddbbcc

Browse files
denniserdmanndenniserdmann
committed
Merge branch 'release/1.1.7'
2 parents 8b2789f + f1bf642 commit 3ddbbcc

File tree

4 files changed

+68
-46
lines changed

4 files changed

+68
-46
lines changed

‎files/nutshell/scss/base/_grid.scss

+51-37
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// * BASE Contao Framework
44
// * erdmann-freunde.de/nutshell/
55
// *
6-
// * Lizenziert unter MIT OPEN SOURCE
6+
// * Lizenziert unter MIT OPEN SOURCE
77
// *
88

99
//
@@ -30,14 +30,14 @@ $grid__columns: 12 !default;
3030
grid-template-columns: repeat(var(--grid__columns), 1fr);
3131
grid-column-gap: var(--grid__gutter);
3232
grid-auto-columns: 1fr;
33-
33+
3434
@supports not (display: grid) {
3535
display: flex;
3636
flex-wrap: wrap;
3737
margin-left: calc(-1 * var(--grid__gutter) / 2);
3838
margin-right: calc(-1 * var(--grid__gutter) / 2);
3939
}
40-
40+
4141
.ie & {
4242
display: flex;
4343
flex-wrap: wrap;
@@ -49,83 +49,97 @@ $grid__columns: 12 !default;
4949
// column default floating
5050
%column-floating {
5151
grid-column: 1 / -1;
52-
52+
5353
@supports not(display: grid) {
5454
padding-left: var(--grid__gutter--half);
5555
padding-right: var(--grid__gutter--half);
5656
}
57-
57+
5858
.ie & {
5959
padding-left: var(--grid__gutter--half);
6060
padding-right: var(--grid__gutter--half);
6161
}
6262
}
6363

64+
@for $i from 1 through $grid__columns { // [3][4]
65+
.col-#{$i} { // [2][3]
66+
grid-column: span $i / span $i;
67+
68+
@supports not (display: grid) {
69+
width: percentage($i/$grid__columns);
70+
}
71+
72+
.ie & {
73+
width: percentage($i/$grid__columns);
74+
}
75+
}
76+
}
77+
6478
// [1] length($breakpoints) - go through length of available viewports (xs, sm, md, lg, xl == 5)
6579
// [2] $current - actual viewport (e.g. "xs")
6680
// [3] $i - counter, returns the actual grid-column
6781
// [4] var(--grid__columns) - go through available columns (e.g. 1 --> 12)
6882

6983
// [5] override clear- class for the next viewport by default
70-
// this means, you can add a clear-xs class to an element, but the clear will only affect the current viewport.
84+
// this means, you can add a clear-xs class to an element, but the clear will only affect the current viewport.
7185
@for $size from 1 through length($breakpoints) { // [1]
7286
$x: nth($breakpoints, $size); // [2]
7387
$current: nth($x, 1); // [2]
74-
88+
7589
// column creation
7690
@for $i from 1 through $grid__columns { // [3][4]
7791
.col-#{$current}-#{$i} { // [2][3]
7892
@extend %column-floating;
7993
}
8094
}
81-
95+
8296
// width creation for every col- class
8397
@include media-query(screen-#{$current}) { // [2]
8498

85-
@for $i from 1 through $grid__columns { // [3][4]
86-
.col-#{$current}-#{$i} { // [2][3]
87-
grid-column: span $i / span $i;
88-
89-
@supports not (display: grid) {
99+
@for $i from 1 through $grid__columns { // [3][4]
100+
.col-#{$current}-#{$i} { // [2][3]
101+
grid-column: span $i / span $i;
102+
103+
@supports not (display: grid) {
90104
width: percentage($i/$grid__columns);
91105
}
92-
106+
93107
.ie & {
94108
width: percentage($i/$grid__columns);
95109
}
96-
}
97-
}
110+
}
111+
}
98112
}
99-
113+
100114
// height creation for every row-span- class
101115
@include media-query(screen-#{$current}) { // [2]
102116

103-
@for $i from 1 through $grid__columns { // [3][4]
104-
.row-span-#{$current}-#{$i} { // [2][3]
105-
grid-row: span $i / span $i;
106-
}
107-
}
117+
@for $i from 1 through $grid__columns { // [3][4]
118+
.row-span-#{$current}-#{$i} { // [2][3]
119+
grid-row: span $i / span $i;
120+
}
121+
}
108122
}
109-
123+
110124
// .col-start and .row-start creation
111125
@include media-query(screen-#{$current}) { // [2]
112-
113-
@for $i from 1 through $grid__columns { // [3]
114-
.col-start-#{$current}-#{$i} { // [2][3]
115-
grid-column-start: $i;
116-
}
117-
.row-start-#{$current}-#{$i} { // [2][3]
118-
grid-row-start: $i;
119-
}
120-
}
126+
127+
@for $i from 1 through $grid__columns { // [3]
128+
.col-start-#{$current}-#{$i} { // [2][3]
129+
grid-column-start: $i;
130+
}
131+
.row-start-#{$current}-#{$i} { // [2][3]
132+
grid-row-start: $i;
133+
}
134+
}
121135
}
122-
136+
123137
//pull-left & -right creation
124138
@include media-query(screen-#{$current}) { // [2]
125139
.pull-right-#{$current} { // [2]
126140
grid-column-end: -1;
127141
}
128-
142+
129143
.pull-left-#{$current} { // [2]
130144
grid-row-start: 1;
131145
grid-column-end: inherit;
@@ -214,10 +228,10 @@ $grid__columns: 12 !default;
214228
// row-span-1-12
215229
@for $i from 1 through $grid__columns { // [1]
216230
.row-start-#{$i} { // [2][3]
217-
grid-row-start: $i;
231+
grid-row-start: $i;
218232
}
219-
233+
220234
.row-span-#{$i} { // [2][3]
221-
grid-row: span $i / span $i;
235+
grid-row: span $i / span $i;
222236
}
223237
}

‎files/nutshell/scss/base/_page.scss

+14-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// * BASE Contao Framework
44
// * erdmann-freunde.de/nutshell/
55
// *
6-
// * Lizenziert unter MIT OPEN SOURCE
6+
// * Lizenziert unter MIT OPEN SOURCE
77
// *
88

99
//
@@ -28,7 +28,7 @@
2828
// render text using sub-pixel anti-aliasing.
2929
html {
3030
font-family: var(--base-font-family, sans-serif);
31-
font-size: var(--base-font-size); // [1]
31+
font-size: var(--base-font-size--xs); // [1]
3232
line-height: var(--base-line-height); //[1]
3333
font-weight: var(--base-font-weight);
3434
background-color: var(--color-page-background);
@@ -39,13 +39,20 @@ html {
3939
-ms-text-size-adjust: 100%; // [4]
4040
-moz-osx-font-smoothing: grayscale; // [5]
4141
-webkit-font-smoothing: antialiased; // [6]
42-
43-
@include media-query(screen-xs-max) {
44-
font-size: var(--base-font-size--xs);
42+
43+
@include media-query(screen-sm) {
44+
font-size: var(--base-font-size--sm, var(--base-font-size));
45+
}
46+
47+
@include media-query(screen-md) {
48+
font-size: var(--base-font-size);
4549
}
46-
50+
51+
@include media-query(screen-lg) {
52+
font-size: var(--base-font-size--lg, var(--base-font-size));
53+
}
54+
4755
@include media-query(screen-xl) {
48-
//font-size: calc(var(--base-font-size--xl) / 1rem * 1em);
4956
font-size: var(--base-font-size--xl);
5057
}
5158
}

‎files/nutshell/scss/components/_forms.scss

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ textarea.textarea {
6767
}
6868

6969
.widget-text,
70-
.widget-textarea {
70+
.widget-textarea,
71+
.widget-password {
7172
margin-bottom: var(--base-spacing-unit);
7273
}
7374

‎files/nutshell/scss/components/_links.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ div.btn--primary,
9191
}
9292
}
9393

94-
.div.btn--left {
94+
div.btn--left {
9595
text-align: left;
9696
}
9797

0 commit comments

Comments
 (0)