Skip to content

Release v3.2.0 #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keenanpayne merged 4 commits into from
Dec 15, 2015
Merged

Release v3.2.0 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4be43c2
Style sub, sup, samp, and s tags
Nov 12, 2015
d34ee94
Add styles for table footers
Nov 12, 2015
d31dfd4
Merge changes from release-v3.2.0
keenanpayne Dec 15, 2015
b349752
Fix merge conflicts
keenanpayne Dec 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions dist/concise.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,9 @@ table {
table thead {
background-color: #f5f5f5;
text-align: left; }
table tfoot {
background-color: #fbfbfb;
border-top: 1px solid #e0e0e0; }
table th,
table td {
border-right: 1px solid #e0e0e0;
Expand Down Expand Up @@ -860,6 +863,22 @@ small,
font-size: 75%;
vertical-align: text-bottom; }

sup,
sub {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline; }

sup {
top: -0.5em; }

sub {
bottom: -0.25em; }

s {
text-decoration: line-through; }

p {
margin-bottom: 20px; }

Expand Down Expand Up @@ -934,6 +953,9 @@ kbd {
padding: 2px 6px 0;
white-space: nowrap; }

samp {
vertical-align: bottom; }

address {
font-style: normal; }

Expand Down
1 change: 0 additions & 1 deletion dist/concise.min.css
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion src/core/layout/_tables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ table {
text-align: left;
}

tfoot {
background-color: lighten(getColor(background, light), 2.5%);
border-top: 1px solid getColor(base, lines);
}

th,
td {
border-right: 1px solid getColor(base, lines);
Expand Down Expand Up @@ -71,7 +76,7 @@ table {
border: 3px solid white;
border-radius: 8px;
}

table { margin-bottom: 0; }
}

Expand Down
20 changes: 18 additions & 2 deletions src/core/layout/_type.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,25 @@ strong,
.bold { font-weight: bold; }

small,
.small {
font-size: 75%;
.small {
font-size: 75%;
vertical-align: text-bottom;
}

sup,
sub {
font-size: 75%;
line-height: 0;
position: relative;
vertical-align: baseline;
}

sup { top: -0.5em; }

sub { bottom: -0.25em; }

s { text-decoration: line-through; }


//
// Paragraphs
Expand Down Expand Up @@ -124,6 +138,8 @@ kbd {
white-space: nowrap;
}

samp { vertical-align: bottom; }


//
// Addresses
Expand Down
10 changes: 9 additions & 1 deletion test/test.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h6>Heading 6 <small>Helper text</small></h6>

<p>Lorem <strong>ipsum</strong> <em>dolor</em> sit <abbr title="Abbreviation">amet</abbr>, <code>sadipscing</code> <kbd>elitr</kbd>, sed diam <a href="">nonumy</a> eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>

<p class="text--justify">At <b>vero</b> <i>eos</i> et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>
<p class="text--justify">At <b>vero</b> <i>eos</i> et accusam <sub>et</sub> justo <sup>duo</sup> dolores et ea rebum. <s>Stet clita</s> kasd gubergren, no sea <var>takimata</var> sanctus <samp>est Lorem ipsum dolor sit amet</samp>. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.</p>

<p class="text--left">Left text</p>

Expand Down Expand Up @@ -167,6 +167,14 @@ <h6>Heading 6 <small>Helper text</small></h6>
</tr>
</thead>

<tfoot>
<tr>
<td><strong>Total Users:</strong></td>
<td>2</td>
<td></td>
</tr>
</tfoot>

<tbody>
<tr>
<td>1</td>
Expand Down