Skip to content

Commit

Permalink
Merge pull request #11 from gavinhenderson/patch-1
Browse files Browse the repository at this point in the history
Added table styles
  • Loading branch information
kognise authored Apr 6, 2019
2 parents d32ee2d + d2f8e02 commit 2691918
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 3 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ You can also only import parts you want, but this is not recommended. See the `s

## Todos

- [Tables](https://github.com/kognise/water.css/issues/5)
- Blockquotes
- Add a screenshot
- Jekyll theme
2 changes: 1 addition & 1 deletion dist/dark.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/light.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,34 @@ <h3>Other</h3>
<img src='http://placekitten.com/408/287' alt='Example kitten'>
<hr>

<p>And here's a nicely marked up table!</p>
<table>
<thead>
<tr>
<th>Name</th>
<th>Quantity</th>
<th>Price</th>
</tr>
</thead>
<tbody>
<tr>
<td>Godzilla</td>
<td>2</td>
<td>$299.99</td>
</tr>
<tr>
<td>Mozilla</td>
<td>10</td>
<td>$100,000.00</td>
</tr>
<tr>
<td>Quesadilla</td>
<td>1</td>
<td>$2.22</td>
</tr>
</tbody>
</table>

<h3>Typography</h3>
<p>
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque dictum hendrerit velit, quis ullamcorper sem congue ac. Quisque id magna rhoncus, sodales massa vel, vestibulum elit. Duis ornare accumsan egestas. Proin maximus lacus interdum leo molestie convallis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Ut iaculis risus eu felis feugiat, eu mollis neque elementum. Donec interdum, nisl id dignissim iaculis, felis dui aliquet dui, non fermentum velit lectus ac quam. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
Expand Down
14 changes: 14 additions & 0 deletions src/parts/_misc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,18 @@ img {
hr {
border: none;
border-top: 1px solid $border;
}

table {
border-collapse: collapse;
margin-bottom: 10px;
width: 100%;
}

td, th {
padding: 6px;
}

table, th, td {
border: 1px solid $border;
}

0 comments on commit 2691918

Please sign in to comment.