Browse code

reorganized css, changed typography, layout fixes

B Mathis authored on 08/11/2009 at 05:25:12
Showing 8 changed files
... ...
@@ -79,7 +79,7 @@ google_analytics: true
79 79
                 Status updating...
80 80
     #footer
81 81
       .page_width
82
-        = "Copyright © #{Time.now.strftime('%Y')} - #{page.blog_title} | "
82
+        Copyright © #{Time.now.strftime('%Y')} - #{page.blog_title} -
83 83
         %span.credit Powered by <a href="http://github.com/imathis/octopress/">Octopress</a>
84 84
     - if page.respond_to? :disqus_short_name
85 85
       //Disqus Commens code
... ...
@@ -7,8 +7,8 @@ title: Blog
7 7
     .article
8 8
       %h2= link_to(post.title, post.url, {:class=>"title"})
9 9
       = post.content
10
-      .footer
11
-        - if page.respond_to? :disqus_short_name
10
+      - if page.respond_to? :disqus_short_name
11
+        .footer
12 12
           - if post.data["comments_off"]
13 13
             %em.comments_off Comments disabled
14 14
           - else
... ...
@@ -10,10 +10,6 @@ html body
10 10
   a
11 11
     color= !link_color
12 12
 
13
-#footer a
14
-  color= #ddd
15
-  &:hover
16
-    color = #fff
17 13
 #header
18 14
   background-color= !header_bg
19 15
   border-bottom= "1px solid" !header_border
... ...
@@ -91,23 +87,10 @@ html body
91 91
       right= "1px solid" !page_border_sides
92 92
 #main
93 93
   width= !page_width - !sidebar_width - !sidebar_margin
94
-#sidebar
95
-  width= !sidebar_width
96
-  margin-left= !sidebar_margin
97 94
 
98
-#main, #sidebar
95
+#main
99 96
   float: left
100 97
 
101
-.blog
102
-  .article
103
-    padding= !base_font_size * 1.5 0 !base_font_size * 1.5
104
-    border-bottom= "1px solid" !article_border
105
-    &:first-child
106
-      padding-top: 0
107
-  .footer
108
-    padding-top= !base_font_size
109
-
110
-
111 98
 #footer
112 99
   position: relative
113 100
   z-index: 2
... ...
@@ -116,4 +99,8 @@ html body
116 116
   padding= !base_font_size * 1.5 0
117 117
   color= !footer_color
118 118
   +h-linear-gradient(darken(!body_bg, 25), !body_bg)
119
-  border-top= "14px solid" !footer_bg
120 119
\ No newline at end of file
120
+  border-top= "14px solid" !footer_bg
121
+  a
122
+    color= #ddd
123
+    &:hover
124
+      color = #fff
121 125
\ No newline at end of file
... ...
@@ -1,3 +1,4 @@
1
-@import partials/twitter.sass
1
+@import partials/blog.sass
2 2
 @import partials/search.sass
3
-@import partials/sidebar.sass
4 3
\ No newline at end of file
4
+@import partials/sidebar.sass
5
+@import partials/twitter.sass
5 6
\ No newline at end of file
... ...
@@ -10,16 +10,17 @@
10 10
   +serif-font
11 11
 
12 12
 body
13
-  font-size= !base_font_size
14
-  +sans-font
13
+  font-size= !base_font_size +2
14
+  +serif-font
15 15
   
16 16
 h1,h2,h3,h4,h5,h6
17 17
   color: #333
18 18
   font-weight: bold
19 19
   +heading-font
20
+  letter-spacing: -1px
20 21
 
21 22
 blockquote
22
-  +heading-font
23
+  +quote-font
23 24
   font-size= !base_font_size * 1.2
24 25
 .quote blockquote
25 26
   font-size= !h4
... ...
@@ -14,7 +14,7 @@
14 14
 =sans-font
15 15
   font-family: "Lucida Grande", "Lucida Sans Unicode", "Trebuchet MS", Helvetica, Arial, Verdana, sans-serif
16 16
 =serif-font
17
-  font-family: Times, "Times New Roman" Georgia, serif
17
+  font-family: Georgia, Times, "Times New Roman", serif
18 18
 =fixed-font
19 19
   font-family: "Menlo", "Bitstream Vera Sans", Monaco, "Andale Mono", "Lucida Console", monospace
20 20
 
21 21
new file mode 100644
... ...
@@ -0,0 +1,8 @@
0
+.blog
1
+  .article
2
+    padding= !base_font_size * 1.5 0 !base_font_size * 1.5
3
+    border-bottom= "1px solid" !article_border
4
+    &:first-child
5
+      padding-top: 0
6
+  .footer
7
+    padding-top= !base_font_size
0 8
\ No newline at end of file
... ...
@@ -1,7 +1,11 @@
1 1
 #sidebar
2
+  float: left
3
+  width= !sidebar_width
2 4
   padding-top: 10px
3
-h4
4
-  margin: 0
5
-  .small
6
-    +sans-font
7
-    font-size: 50%
8 5
\ No newline at end of file
6
+  margin-left= !sidebar_margin
7
+  
8
+  h4
9
+    margin: 0
10
+    .small
11
+      +sans-font
12
+      font-size: 50%
9 13
\ No newline at end of file