Skip to content

Commit

Permalink
Merge pull request #712 from 18F/style-cleanup
Browse files Browse the repository at this point in the history
Minor style updates
  • Loading branch information
cmc333333 authored Dec 1, 2017
2 parents e482acf + a99fa9b commit b793b3e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 8 deletions.
18 changes: 11 additions & 7 deletions ui/css/module/_footnotes.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ $triangle-border-vertical-offset: ($triangle-dimensions-value + $footnote-vertic
border: 1px solid $color-cool-blue-lighter;
border-radius: 4px;
padding: 2px 4px;
font-size: 0.7em;
font-size: 0.7rem;
margin-left: .3em;
background-color: $color-white; // override any highlighting
position: relative;
Expand All @@ -48,6 +48,10 @@ $triangle-border-vertical-offset: ($triangle-dimensions-value + $footnote-vertic
}

.inline-footnote {
> cite {
line-height: 1em; // Maintain paragraph line height
}

.node-footnote-content {
display: block;
width: 100%;
Expand All @@ -72,7 +76,7 @@ $triangle-border-vertical-offset: ($triangle-dimensions-value + $footnote-vertic
}

.node-footnote {
font-size: 0.9em;
font-size: 0.9rem;
display: block;
}

Expand All @@ -81,8 +85,8 @@ $triangle-border-vertical-offset: ($triangle-dimensions-value + $footnote-vertic
@extend .col;
@extend .col-1;
width: 2.5em;
font-size: .9em;
line-height: 1.5em;
font-size: .9rem;
line-height: 1.5rem;
text-align: right;
padding-right: .5em;
}
Expand Down Expand Up @@ -128,8 +132,8 @@ $triangle-border-vertical-offset: ($triangle-dimensions-value + $footnote-vertic
.citation-marker {
@include font-san-serif-bold();
@include paragraph-marker();
font-size: .875em;
line-height: 1em; // like font-text, except adjusting for bold
font-size: .875rem;
line-height: 1rem; // like font-text, except adjusting for bold
}

.footnote-text,
Expand All @@ -138,7 +142,7 @@ $triangle-border-vertical-offset: ($triangle-dimensions-value + $footnote-vertic
@extend .m0;
color: $color-gray-medium;
font-size: .875em;
line-height: 1.125em;
line-height: 1.125rem;
}
}

Expand Down
3 changes: 2 additions & 1 deletion ui/css/module/_tables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ tfoot {
}

.basic-table {
margin-top: 2rem;
font-size: .9rem;
margin-bottom: 40px;
margin-bottom: 3rem;

th,
td {
Expand Down

0 comments on commit b793b3e

Please sign in to comment.