Skip to content

Commit

Permalink
Use scss & theme changes
Browse files Browse the repository at this point in the history
  • Loading branch information
muan committed May 20, 2013
1 parent 5d5d2bf commit 1175b54
Show file tree
Hide file tree
Showing 7 changed files with 101 additions and 68 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
.sass-cache/
_site/
_scss/
build/
server/
.rvmrc
.DS_Store
.DS_Store
Rakefile
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ url: http://wardrobe.muan.co/
signoff: Mu-An
facebook_appid:
google_analytics:
theme: /themes/b
theme: b
owner:
name: Mu-An Chiou
avatar: 'https://secure.gravatar.com/avatar/afd3cc3e385d754183336c859d9e694a?s=420&d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png'
Expand Down
5 changes: 2 additions & 3 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
<link rel="stylesheet" href="/css/lib/syntax.css">
<link rel="stylesheet" href="/css/lib/boilerplate.css">
<link rel="stylesheet" href="/css/lib/basics.css">
<link rel="stylesheet" href="{{ site.theme }}/style.css">
<link href="http://fonts.googleapis.com/css?family=Viga" rel="stylesheet" type="text/css">
<link href='http://fonts.googleapis.com/css?family=Noto+Sans' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/themes/{{ site.theme }}/style.css">
<script src="/themes/{{ site.theme }}/custom.js"></script>

<script src="/js/lib/modernizr-2.6.2.min.js"></script>
<script src="/js/lib/jquery-1.9.1.min.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions categories.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
layout: default
---

<ul class="posts">
<ul class="posts categories">
{% for category in site.categories %}
<h3 class="muted">{{ category[0]|upcase }} ({{ category[1].size }}) </h3>
<h3 class="muted">{{ category[0] }} ({{ category[1].size }}) </h3>
{% for post in category[1] %}
<li>
<a href="{{ post.url }}">
Expand Down
12 changes: 12 additions & 0 deletions themes/a/custom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
WebFontConfig = {
google: { families: [ 'Viga', 'Noto Sans' ] }
};
(function() {
var wf = document.createElement('script');
wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
'://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
wf.type = 'text/javascript';
wf.async = 'true';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(wf, s);
})();
12 changes: 12 additions & 0 deletions themes/b/custom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
WebFontConfig = {
google: { families: [ 'Open Sans' ] }
};
(function() {
var wf = document.createElement('script');
wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
'://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
wf.type = 'text/javascript';
wf.async = 'true';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(wf, s);
})();
129 changes: 68 additions & 61 deletions themes/b/style.css
Original file line number Diff line number Diff line change
@@ -1,77 +1,84 @@
*, h1, h2, h3, h4, h5 { font-family: "Proxima Nova"; }
*, h1, h2, h3, h4, h5 {
font-family: "Open Sans";
font-weight: normal;
margin-top: 0; }

body {
background: #dbe6ee;
padding: 20px;
font-size: 14px;
}

body > header, section.content, footer {
background: #fff;
margin: 0 auto;
width: 100%;
padding: 30px;
text-align: center;
}

body > header {
border-top-right-radius: 2px;
border-top-left-radius: 2px;
}
body > footer {
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px;
}

nav a {
background: #dbe6ee;
padding: 8px 13px;
border-radius: 2px;
margin-right: 10px;
line-height: 1em;
text-transform: uppercase;
letter-spacing: 1px;
font-size: 11px;
font-weight: bold;
white-space: nowrap;
text-shadow: 0 0 3px white, 0 0 3px white, 0 0 3px white, 0 0 3px white,0 0 3px white;
}
nav a:last-child {
margin-right: 0;
}
font-size: 14px; }
body > header, body .content, body footer {
background: #fff;
margin: 0 auto;
width: 100%;
padding: 30px;
text-align: center; }
body .content {
margin: 1px auto; }
body > header {
border-top-left-radius: 2px;
border-top-right-radius: 2px; }
body > footer {
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px; }

nav {
margin-top: 30px;
}
margin-top: 30px; }
nav a {
padding: 8px 13px;
border-radius: 2px;
margin-right: 10px;
line-height: 1em;
text-transform: uppercase;
letter-spacing: 1px;
font-size: 11px;
white-space: nowrap; }
nav a:last-child {
margin-right: 0; }

section.content {
margin: 1px auto;
}
.description {
color: #999; }

.description { color: #999; }
time { color: #999; font-size: 11px; }
time {
color: #999;
font-size: 11px; }

.posts a:after {
content: "------";
display: block;
color: #d0d0d0;
}
.posts li {
margin-bottom: 10px; }
.posts h2 {
margin: 6px 0;
}
margin: 0 0 6px 0; }

.posts, article, aside {
width: 100%;
max-width: 520px;
max-width: 500px;
margin: auto;
text-align: left;
}
text-align: left; }

aside {
background: #f9f9f9;
padding: 30px;
margin: 30px auto;
}
.categories {
position: relative; }
.categories h3 {
font-size: 14px;
margin: 0 0 6px;
text-transform: capitalize; }
.categories h3:not(:first-of-type):before {
content: "------";
display: block;
color: #d0d0d0;
margin: 10px 0;
font-weight: normal; }

aside p { margin: 0; }
article header h2 {
margin-bottom: 5px; }
article header .category {
font-size: 11px; }

.avatar { display: none; }
aside {
border-top: 1px solid #ddd;
padding-top: 30px;
margin: 30px auto 0; }
aside .avatar {
width: 90px;
float: left;
margin: 0 15px 0 0; }
aside p {
margin: 0; }

0 comments on commit 1175b54

Please sign in to comment.