Skip to content

Commit

Permalink
Merge pull request #244 from pagarme/box-sizing-reset
Browse files Browse the repository at this point in the history
style: add box-sizing reset
  • Loading branch information
derekstavis authored Sep 16, 2017
2 parents d87fb1e + de550d6 commit 5ddb349
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 6 deletions.
9 changes: 5 additions & 4 deletions webapp/src/components/Alert/style.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
@import "../../styles/colors.css";
@import "../../styles/typography.css";

.alert * {
box-sizing: border-box;
margin: 0;
}

.alert {
font-size: 1em;
display: flex;
Expand All @@ -16,10 +21,6 @@
margin-right: 19px;
}

.content * {
margin: 0;
}

.icon {
height: 50px;
width: 59px;
Expand Down
4 changes: 4 additions & 0 deletions webapp/src/components/Card/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
overflow: hidden;
}

.card * {
box-sizing: border-box;
}

.title {
padding: var(--card-title-padding);
}
Expand Down
4 changes: 4 additions & 0 deletions webapp/src/components/CheckboxGroup/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
margin-left: var(--checkbox-group-secondary-text-margin-left);
}

.secondaryText * {
box-sizing: border-box;
}

.error {
color: var(--color-light-error);
}
Expand Down
4 changes: 4 additions & 0 deletions webapp/src/components/CircularProgress/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
position: relative;
}

.circular * {
box-sizing: border-box;
}

.progress svg {
width: 100%;
height: 100%;
Expand Down
4 changes: 4 additions & 0 deletions webapp/src/components/LinearProgress/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
overflow: hidden;
}

.linear * {
box-sizing: border-box;
}

.back {
height: var(--progress-linear-fill-height);
}
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/components/Switch/properties.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
--switch-label-font-family: var(--title-font-family);

--switch-width: 40px;
--switch-height: 20px;
--switch-height: 21px;
--switch-radius: 10px;
--switch-bullet-width: 11px;
--switch-bullet-height: 11px;
--switch-bullet-off: 5px;
--switch-bullet-on: calc(var(--switch-width) - 15px);
--switch-bullet-on: calc(var(--switch-width) - 16px);

--switch-border-color: var(--color-light-silver-200);
--switch-bullet-on-color: #ffffff;
Expand Down
6 changes: 6 additions & 0 deletions webapp/src/components/Switch/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
font-family: var(--switch-label-font-family);
}

.switch,
.switch:before,
.switch:after {
box-sizing: border-box;
}

.switch:before,
.switch:after {
content: "";
Expand Down
4 changes: 4 additions & 0 deletions webapp/src/components/TabBar/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
padding-top: 0;
}

.tabBar * {
box-sizing: border-box;
}

.tabList {
margin: var(--tabbar-tablist-padding-fix);
}
Expand Down

0 comments on commit 5ddb349

Please sign in to comment.