Skip to content

Commit

Permalink
v0.1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
ungoldman committed Dec 28, 2014
1 parent 1bc557f commit 5e6a76b
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 15 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# style changelog

## v0.1.6
* add `.site-link` class for nav links
* style tweaks

## v0.1.5
* rename `.current` to `.current-page`
* remove `html,body` margin reset (a little margin is fine with this style)
Expand Down
1 change: 0 additions & 1 deletion build.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ function buildGuide () {
}

function buildStyle (result) {
console.log(result.css);
var normalize = fs.readFileSync('./node_modules/normalize.css/normalize.css', { encoding: 'utf8' });
var gfm = fs.readFileSync('./node_modules/github-markdown-css/github-markdown.css', { encoding: 'utf8' });
var style = new CleanCSS().minify(normalize + gfm + result.css).styles;
Expand Down
2 changes: 1 addition & 1 deletion guide.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<header>
<nav>
<a class="site-title" href="./">style.css</a>
<a class="current-page" href="./guide.html">guide</a>
<a class="site-link current-page" href="./guide.html">guide</a>
</nav>
</header>
<main>
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<header>
<nav>
<a class="site-title current-page" href="./">style.css</a>
<a href="./guide.html">guide</a>
<a class="site-link" href="./guide.html">guide</a>
</nav>
</header>
<main>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "style.css",
"version": "0.1.5",
"version": "0.1.6",
"description": "One style is all that is needed.",
"files": [
"style.css"
Expand Down
25 changes: 17 additions & 8 deletions source/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,15 @@ body {
// header

> header {
margin: 2rem 0 3rem;
margin: 2rem 0;

> nav {
overflow: auto;

> a,
> a.site-title {
color: #aaa;
.site-link,
.site-title {
float: left;
font-size: 1rem;
font-weight: 200;
margin-right: 10px;

&:hover {
color: #f3c;
Expand All @@ -102,9 +101,19 @@ body {
color: #f3c;
cursor: default;
}

&.right {
float: right;
}
}

.site-link {
color: #aaa;
font-weight: 200;
margin-left: 1rem;
}

> a.site-title {
.site-title {
color: #555;
font-weight: 600;
}
Expand All @@ -128,7 +137,7 @@ body {
font-size: $base-font-size;
color: #333;

margin: 3rem 0;
margin: 0 0 3rem;

table {
font-family: $code-family;
Expand Down
2 changes: 1 addition & 1 deletion source/site/partials/_header.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<header>
<nav>
<a class="site-title" href="./">style.css</a>
<a class="current-page" href="./guide.html">guide</a>
<a class="site-link current-page" href="./guide.html">guide</a>
</nav>
</header>
<main>
Expand Down
4 changes: 2 additions & 2 deletions style.css

Large diffs are not rendered by default.

0 comments on commit 5e6a76b

Please sign in to comment.