Skip to content

Commit

Permalink
Merge pull request #21 from broccolini/brocs/link_styles
Browse files Browse the repository at this point in the history
Link style updates & other tweaks
  • Loading branch information
broccolini authored Jun 2, 2018
2 parents 42ce52c + a86bdc4 commit 4c34da3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# :construction: WIP :construction: Swiss Jekyll Theme
# Swiss Jekyll Theme

Swiss is a bold Jekyll theme inspired by Swiss design and the works of Massimo Vignelli. This theme lends itself well to sites heavy on written content.

Expand Down
12 changes: 3 additions & 9 deletions _posts/2016-09-04-markdown-sample.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ date: 2016-09-04

### Markdown test document

Text can be **bold**, _italic_, or ~~strikethrough~~. [Links](https://github.com) should be blue with no underlines (unless hovered over).
Text can be **bold**, _italic_, or ~~strikethrough~~. [Links](https://github.com) should be have dotted underlines and solid underlines on hover.

There should be whitespace between paragraphs. There should be whitespace between paragraphs. There should be whitespace between paragraphs. There should be whitespace between paragraphs.

There should be whitespace between paragraphs. There should be whitespace between paragraphs. There should be whitespace between paragraphs. There should be whitespace between paragraphs.

> There should be no margin above this first sentence.
>
> Blockquotes should be a lighter gray with a gray border along the left side.
> Blockquotes should be a italicized with a gray border along the left side.
>
> There should be no margin below this final sentence.
Expand Down Expand Up @@ -169,10 +169,4 @@ This is the final element on the page and there should be no margin below this.

## License

[MIT](./LICENSE) © [GitHub](https://github.com/)

[primer-css]: https://github.com/primer/primer
[docs]: http://primercss.io/
[npm]: https://www.npmjs.com/
[install-npm]: https://docs.npmjs.com/getting-started/installing-node
[sass]: http://sass-lang.com/
[MIT](./LICENSE)
8 changes: 8 additions & 0 deletions _sass/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,14 @@ code {

.prose {

a {
text-decoration: underline dotted;

&:hover {
text-decoration: underline;
}
}

p, ol, ul {
font-size: $prose-font-size;
margin-bottom: 1em;
Expand Down
6 changes: 3 additions & 3 deletions _sass/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
text-decoration: none !important;

&:hover {
text-decoration: no-underline !important;
text-decoration: none !important;
}
}

Expand Down Expand Up @@ -173,10 +173,10 @@
// Link styles for navigation
.link-primary {
font-weight: bold;
text-decoration: none;
text-decoration: none !important;

&:hover {
color: $color-primary-link;
text-decoration: none;
text-decoration: none !important;
}
}
2 changes: 1 addition & 1 deletion jekyll-swiss.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Gem::Specification.new do |spec|
spec.name = "jekyll-swiss"
spec.version = "0.4.0"
spec.version = "1.0.0"
spec.authors = ["broccolini"]
spec.email = ["diana.mounter@gmail.com"]

Expand Down

0 comments on commit 4c34da3

Please sign in to comment.