Skip to content

Commit

Permalink
Stop prefixing CSS calc with -webkit- (jekyll#445)
Browse files Browse the repository at this point in the history
Merge pull request 445
  • Loading branch information
ashmaroli authored and jekyllbot committed Jan 20, 2020
1 parent aeab391 commit f8f834b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
6 changes: 2 additions & 4 deletions _sass/minima/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -187,17 +187,15 @@ pre {
* Wrapper
*/
.wrapper {
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit}));
max-width: calc(#{$content-width} - (#{$spacing-unit}));
max-width: calc(#{$content-width} - (#{$spacing-unit}));
margin-right: auto;
margin-left: auto;
padding-right: $spacing-unit / 2;
padding-left: $spacing-unit / 2;
@extend %clearfix;

@media screen and (min-width: $on-large) {
max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2));
max-width: calc(#{$content-width} - (#{$spacing-unit} * 2));
max-width: calc(#{$content-width} - (#{$spacing-unit} * 2));
padding-right: $spacing-unit;
padding-left: $spacing-unit;
}
Expand Down
21 changes: 7 additions & 14 deletions _sass/minima/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -145,37 +145,31 @@
}

.footer-col {
width: -webkit-calc(100% - (#{$spacing-unit} / 2));
width: calc(100% - (#{$spacing-unit} / 2));
width: calc(100% - (#{$spacing-unit} / 2));
margin-bottom: $spacing-unit / 2;
padding-left: $spacing-unit / 2;
}

.footer-col-1,
.footer-col-2 {
width: -webkit-calc(50% - (#{$spacing-unit} / 2));
width: calc(50% - (#{$spacing-unit} / 2));
width: calc(50% - (#{$spacing-unit} / 2));
}

.footer-col-3 {
width: -webkit-calc(100% - (#{$spacing-unit} / 2));
width: calc(100% - (#{$spacing-unit} / 2));
width: calc(100% - (#{$spacing-unit} / 2));
}

@media screen and (min-width: $on-large) {
.footer-col-1 {
width: -webkit-calc(35% - (#{$spacing-unit} / 2));
width: calc(35% - (#{$spacing-unit} / 2));
width: calc(35% - (#{$spacing-unit} / 2));
}

.footer-col-2 {
width: -webkit-calc(20% - (#{$spacing-unit} / 2));
width: calc(20% - (#{$spacing-unit} / 2));
width: calc(20% - (#{$spacing-unit} / 2));
}

.footer-col-3 {
width: -webkit-calc(45% - (#{$spacing-unit} / 2));
width: calc(45% - (#{$spacing-unit} / 2));
width: calc(45% - (#{$spacing-unit} / 2));
}
}

Expand Down Expand Up @@ -297,7 +291,6 @@
*/
@media screen and (min-width: $on-large) {
.one-half {
width: -webkit-calc(50% - (#{$spacing-unit} / 2));
width: calc(50% - (#{$spacing-unit} / 2));
width: calc(50% - (#{$spacing-unit} / 2));
}
}

0 comments on commit f8f834b

Please sign in to comment.