Skip to content

Commit

Permalink
Merge pull request #46 from marcobiedermann/feature/box-sizing
Browse files Browse the repository at this point in the history
Improve box-sizing bahaviour
  • Loading branch information
matejlatin committed Jun 1, 2016
2 parents 89afc40 + b9e9757 commit c9c3434
Show file tree
Hide file tree
Showing 16 changed files with 26 additions and 61 deletions.
27 changes: 7 additions & 20 deletions assets/combined.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified assets/combined.gz.css
Binary file not shown.
2 changes: 1 addition & 1 deletion assets/combined.min.css

Large diffs are not rendered by default.

27 changes: 7 additions & 20 deletions src/style/gutenberg.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/style/gutenberg.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/style/gutenberg.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ License URL ... https://raw.githubusercontent.com/matejlatin/Gutenberg/master/li
@import 'modules/details';
@import 'modules/figure';
@import 'modules/form';
@import 'modules/headline';
@import 'modules/heading';
@import 'modules/horizontal-rule';
@import 'modules/image';
@import 'modules/list';
Expand Down
12 changes: 7 additions & 5 deletions src/style/layout/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ html {

// Font defaults
html {
box-sizing: border-box;
font-size: #{$base + 'px'};
font-size: #{$base-font-size + '%'};
font-family: $font-body;
Expand Down Expand Up @@ -50,11 +51,12 @@ html {

}

body {
box-sizing: border-box;
margin: 0;
*,
*::before,
*::after {
box-sizing: inherit;
}

div {
box-sizing: border-box;
body {
margin: 0;
}
1 change: 0 additions & 1 deletion src/style/layout/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
footer {
box-sizing: border-box;
display: block;

body > & {
Expand Down
1 change: 0 additions & 1 deletion src/style/layout/_header.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
header {
box-sizing: border-box;
display: block;
}
1 change: 0 additions & 1 deletion src/style/layout/_section.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
section {
box-sizing: border-box;
display: block;
}
1 change: 0 additions & 1 deletion src/style/modules/_article.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
article {
box-sizing: border-box;
display: block;
margin: 0 auto;
width: 80%;
Expand Down
1 change: 0 additions & 1 deletion src/style/modules/_figure.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ figcaption {
}

figure {
box-sizing: border-box;
display: block;
}

Expand Down
2 changes: 1 addition & 1 deletion src/style/modules/_form.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
input {
box-sizing: border-box;

}
4 changes: 0 additions & 4 deletions src/style/modules/_list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
ul,
ol {

article & {
box-sizing: border-box;
}

li {
margin-bottom: 0;
}
Expand Down
1 change: 0 additions & 1 deletion src/style/modules/_navigation.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
nav {
box-sizing: border-box;
display: block;
}
1 change: 0 additions & 1 deletion src/style/modules/_quote.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
blockquote {
box-sizing: border-box;
font-style: italic;
padding-left: 1.4375rem;
// font-size: 95%;
Expand Down

0 comments on commit c9c3434

Please sign in to comment.