Skip to content

Commit 401ccfc

Browse files
committed
Merge pull request #29 from felics/fix-margins
Fix negative margins causing horizontal-scrollbars
2 parents 6e392f2 + 337136b commit 401ccfc

File tree

6 files changed

+7
-14
lines changed

6 files changed

+7
-14
lines changed

__test__/src/jade/_tests/widths.jade

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ block content
3333
article.widths-item.three-four
3434
div.block
3535

36-
3736
// 5
3837
section.widths-container
3938
article.widths-item.one-five
@@ -72,4 +71,3 @@ block content
7271
div.block
7372
article.widths-item.one-ten
7473
div.block
75-

__test__/src/scss/test.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ $color-border: #3D051A;
1010
@import "tests/modifiers";
1111

1212
body {
13-
margin: 2em;
1413
background: $color-primary;
1514
}
1615

__test__/src/scss/tests/_widths.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
display: none;
5959
@include i(1, lg 5/6);
6060
@include bp(lg) {
61-
display: block;
61+
display: inline-block;
6262
}
6363
}
6464

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hagrid",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"authors": [
55
"felics <hi@felics.me>"
66
],

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hagrid",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"license": "MIT",
55
"repository": {
66
"type": "git",

src/hagrid/_modifiers.scss

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,14 @@
3636

3737
@if $is-not-spacing == true {
3838
margin: {
39-
left: -$gutter / 2;
40-
right: -$gutter / 2;
39+
left: -$gutter;
4140
};
4241
}
4342

4443
#{$hagrid-child-selector} {
4544
@if $is-not-spacing == true {
4645
padding: {
47-
left: $gutter / 2;
48-
right: $gutter / 2;
46+
left: $gutter;
4947
};
5048
}
5149
@if $is-y == false and $hagrid-fallback {
@@ -159,14 +157,12 @@
159157
$gutter: hagrid-gutter-get($modifier);
160158

161159
margin: {
162-
left: -$gutter / 2;
163-
right: -$gutter / 2;
160+
left: -$gutter;
164161
};
165162

166163
#{$hagrid-child-selector} {
167164
padding: {
168-
left: $gutter / 2;
169-
right: $gutter / 2;
165+
left: $gutter;
170166
};
171167
}
172168

0 commit comments

Comments
 (0)