Skip to content

Commit bdc66ea

Browse files
imathisimathis
committed
reorganized stylesheets
1 parent fe3590b commit bdc66ea

8 files changed

Lines changed: 117 additions & 112 deletions

File tree

‎source/_layouts/default.haml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ google_analytics: true
3737
%script(src="/javascripts/twitter.js" type="text/javascript")
3838
- if page.respond_to? :google_analytics
3939
%script(src="http://www.google-analytics.com/ga.js" type="text/javascript")
40-
%body
40+
%body(id="#{(page.respond_to?(:body_id) ? page.body_id : nil)}")
4141
#header
4242
.page_width
4343
%a.title(href="/")=page.blog_title
@@ -60,11 +60,13 @@ google_analytics: true
6060
.page_width
6161
#main
6262
- if page.respond_to? :date
63-
%h2= page.title
64-
= preserve rp(content)
65-
%p.pubdate
66-
Published:
67-
=page.date.strftime("%d %b, %Y")
63+
.blog
64+
.article
65+
%h2= page.title
66+
= preserve rp(content)
67+
%p.pubdate
68+
Published:
69+
=page.date.strftime("%d %b, %Y")
6870
- if page.respond_to? :disqus_short_name
6971
#disqus_thread
7072
:javascript

‎stylesheets/_layout.sass‎

Lines changed: 1 addition & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -12,112 +12,9 @@ html body
1212
a
1313
color= !link_color
1414

15-
#header
16-
background-color= !header_bg
17-
border-bottom= "1px solid" !header_border
18-
padding: 30px 0
19-
.page_width
20-
position: relative
21-
a.title
22-
font-size= !h1
23-
+heading-font
24-
display: inline-block
25-
color= !title_color
26-
text-decoration: none
27-
28-
#nav
29-
+clearfix
30-
position: relative
31-
z-index: 1
32-
padding: 6px 0
33-
background:
34-
color= !nav_bg
35-
image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#ddd), color-stop(0.3, #f4f4f4))
36-
image: -moz-linear-gradient(left top, left bottom, from(#fcfcfc), to(#ddd), color-stop(0.3, #f4f4f4))
37-
border:
38-
top= "1px solid" !nav_border_top
39-
bottom= "1px solid" !nav_border_bottom
40-
ul
41-
position: relative
42-
+horizontal-list
43-
margin: 0 auto
44-
overflow: visible
45-
li
46-
padding: 0 15px
47-
border-left= "1px solid" !nav_border_left
48-
border-right= "1px solid" !nav_border_right
49-
&.alpha
50-
border-left: none
51-
padding-left: 0
52-
&.omega
53-
border-right: 0
54-
&.subscribe
55-
position: absolute
56-
left= !page_width - !sidebar_width - !sidebar_margin/2
57-
border: none
58-
a
59-
display: inline-block
60-
padding-left: 28px
61-
background: url("/images/rss.png") left top no-repeat
62-
a
63-
display: inline-block
64-
color= !nav_color
65-
line-height: 150%
66-
text-decoration: none
67-
&:hover
68-
color= !nav_color_hover
69-
7015
.page_width
7116
width= !page_width
7217
margin: 0 auto
7318
padding:
7419
left= !page_pad
75-
right= !page_pad
76-
77-
#page
78-
+clearfix
79-
background-color= !page_bg
80-
.page_width
81-
+clearfix
82-
position: relative
83-
padding:
84-
top: 25px
85-
bottom: 25px
86-
background-color= !blog_bg
87-
+easy-box-shadow(#ccc)
88-
border:
89-
left= "1px solid" !page_border_sides
90-
right= "1px solid" !page_border_sides
91-
#main
92-
width= !main_width
93-
float: left
94-
&.expanded
95-
width: 100%
96-
97-
#sidebar
98-
float: left
99-
width= !sidebar_width
100-
margin-left= !sidebar_margin
101-
font-size: 80%
102-
line-height: 1.625em
103-
h4
104-
margin: 20px 0 0
105-
&:first-child
106-
margin-top: 10px
107-
.small
108-
+sans-font
109-
font-size: 50%
110-
111-
#footer
112-
position: relative
113-
z-index: 2
114-
font-size= !base_font_size_small
115-
clear: both
116-
padding= !base_font_size * 1.5 0
117-
color= !footer_color
118-
+h-linear-gradient(darken(!body_bg, 25), !body_bg)
119-
border-top= "14px solid" !footer_bg
120-
a
121-
color= #ddd
122-
&:hover
123-
color = #fff
20+
right= !page_pad

‎stylesheets/_partials.sass‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
@import partials/shared.sass
2-
@import partials/blog.sass
32
@import partials/syntax.sass
43
@import partials/search.sass
54
@import partials/sidebar.sass
6-
@import partials/twitter.sass
5+
@import partials/twitter.sass
6+
7+
/* layout partials */
8+
@import partials/header.sass
9+
@import partials/navigation.sass
10+
@import partials/page.sass
11+
@import partials/sidebar.sass
12+
@import partials/blog.sass
13+
@import partials/footer.sass

‎stylesheets/partials/_footer.sass‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#footer
2+
position: relative
3+
z-index: 2
4+
font-size= !base_font_size_small
5+
clear: both
6+
padding= !base_font_size * 1.5 0
7+
color= !footer_color
8+
+h-linear-gradient(darken(!body_bg, 25), !body_bg)
9+
border-top= "14px solid" !footer_bg
10+
a
11+
color= #ddd
12+
&:hover
13+
color = #fff

‎stylesheets/partials/_header.sass‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#header
2+
background-color= !header_bg
3+
border-bottom= "1px solid" !header_border
4+
padding: 30px 0
5+
.page_width
6+
position: relative
7+
a.title
8+
font-size= !h1
9+
+heading-font
10+
display: inline-block
11+
color= !title_color
12+
text-decoration: none

‎stylesheets/partials/_navigation.sass‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#nav
2+
+clearfix
3+
position: relative
4+
z-index: 1
5+
padding: 6px 0
6+
background:
7+
color= !nav_bg
8+
image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#ddd), color-stop(0.3, #f4f4f4))
9+
image: -moz-linear-gradient(left top, left bottom, from(#fcfcfc), to(#ddd), color-stop(0.3, #f4f4f4))
10+
border:
11+
top= "1px solid" !nav_border_top
12+
bottom= "1px solid" !nav_border_bottom
13+
ul
14+
position: relative
15+
+horizontal-list
16+
margin: 0 auto
17+
overflow: visible
18+
li
19+
padding: 0 15px
20+
border-left= "1px solid" !nav_border_left
21+
border-right= "1px solid" !nav_border_right
22+
&.alpha
23+
border-left: none
24+
padding-left: 0
25+
&.omega
26+
border-right: 0
27+
&.subscribe
28+
position: absolute
29+
left= !page_width - !sidebar_width - !sidebar_margin/2
30+
border: none
31+
a
32+
display: inline-block
33+
padding-left: 28px
34+
background: url("/images/rss.png") left top no-repeat
35+
a
36+
display: inline-block
37+
color= !nav_color
38+
line-height: 150%
39+
text-decoration: none
40+
&:hover
41+
color= !nav_color_hover

‎stylesheets/partials/_page.sass‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#page
2+
+clearfix
3+
background-color= !page_bg
4+
.page_width
5+
+clearfix
6+
position: relative
7+
padding:
8+
top: 25px
9+
bottom: 25px
10+
background-color= !blog_bg
11+
+easy-box-shadow(#ccc)
12+
border:
13+
left= "1px solid" !page_border_sides
14+
right= "1px solid" !page_border_sides
15+
#main
16+
width= !main_width
17+
float: left
18+
&.expanded
19+
width: 100%

‎stylesheets/partials/_sidebar.sass‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
#sidebar
2+
float: left
3+
width= !sidebar_width
4+
margin-left= !sidebar_margin
5+
font-size: 80%
6+
line-height: 1.625em
7+
h4
8+
margin: 20px 0 0
9+
&:first-child
10+
margin-top: 10px
11+
.small
12+
+sans-font
13+
font-size: 50%
14+
115
#twitter, #delicious
216
+border-radius
317
background: #f8f8f8

0 commit comments

Comments
 (0)