Skip to content

Commit

Permalink
Update margins on <p> elements
Browse files Browse the repository at this point in the history
  • Loading branch information
keenanpayne committed Jan 13, 2016
1 parent 05f00da commit c89aa3e
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 31 deletions.
16 changes: 2 additions & 14 deletions dist/concise.css
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ sub {
s {
text-decoration: line-through; }

p {
p:not(:last-child) {
margin-bottom: 20px; }

a {
Expand Down Expand Up @@ -1229,8 +1229,6 @@ address {
margin: 20px 0;
padding: 8px 1em;
position: relative; }
.alert p {
margin: 0; }
.alert a {
color: #222222; }
.alert a:hover {
Expand Down Expand Up @@ -1412,12 +1410,6 @@ a.alert-close:hover {
display: block;
margin-top: 10px; }

.card-content p {
margin-bottom: 0; }

.card-content p + p {
margin-bottom: 20px; }

.card-footer {
border-top: 1px solid #e0e0e0;
font-size: 0.875em;
Expand Down Expand Up @@ -1647,17 +1639,13 @@ ol.dropdown-content {
margin-top: 0; }

.modal-body {
padding: 32px 2.5em 8px; }
.modal-body p {
margin-bottom: 24px; }
padding: 32px 2.5em; }

.modal-footer {
border-top: 1px solid #e0e0e0;
font-size: 0.875em;
margin: 0;
padding: 24px 2.5em; }
.modal-footer p {
margin-bottom: 0; }

.modal-close {
color: white;
Expand Down
2 changes: 1 addition & 1 deletion dist/concise.min.css

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions src/addons/concise-ui/components/_alerts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
padding: unitSize(1) 1em;
position: relative;

p { margin: 0; }

a {
color: darken(getColor(text, primary), 20%);

Expand Down
6 changes: 0 additions & 6 deletions src/addons/concise-ui/components/_cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@
margin-top: unitSize(1, 2);
}

.card-content {
p { margin-bottom: 0; }

p + p { margin-bottom: unitSize(3, -4); }
}

.card-footer {
border-top: 1px solid getColor(base, lines);
font-size: pxToEm(14);
Expand Down
8 changes: 1 addition & 7 deletions src/addons/concise-ui/components/_modals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,13 @@
margin-top: 0;
}

.modal-body {
padding: unitSize(4) 2.5em unitSize(1);

p { margin-bottom: unitSize(3); }
}
.modal-body { padding: unitSize(4) 2.5em; }

.modal-footer {
border-top: 1px solid getColor(base, lines);
font-size: pxToEm(14);
margin: 0;
padding: unitSize(3) 2.5em;

p { margin-bottom: 0; }
}

.modal-close {
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/_type.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ s { text-decoration: line-through; }
// Paragraphs
// --------

p { margin-bottom: unitSize(3, -4); }
p:not(:last-child) { margin-bottom: unitSize(3, -4); }


//
Expand Down

0 comments on commit c89aa3e

Please sign in to comment.