Permalink
Browse files

modified: static/css/styles.css

	modified:   templates/base.html
	modified:   templates/index.html
  • Loading branch information...
1 parent 09469cb commit 54c159e8735cfd81411df5a176897f435adca63b David committed Mar 4, 2010
Showing with 50 additions and 216 deletions.
  1. +40 −190 static/css/styles.css
  2. +8 −22 templates/base.html
  3. +2 −4 templates/index.html
View
230 static/css/styles.css
@@ -1,3 +1,4 @@
+/** CSS Reset **/
* {padding:0; margin:0;}
a {text-decoration:none;}
img {border:none;}
@@ -11,207 +12,56 @@ a:hover {
.clearfloat {
clear:both;
}
-body { font-family:"Dajavu Sans MONO, Arial"}
-#page {
- width:960px;
- margin:0 auto;
-}
-#head {
- margin:20px 0;
-}
-#logo {
- padding:20px 0;
-}
-#logo h1 {
- font-size:34px;
- margin:5px 0 5px 30px;
- letter-spacing:5px;
- width:340px;
- text-shadow: 1px 1px #bbb;
- font-family:"Microsoft YaHei" !important;
-}
-#logo h1 span {
- color:red;
- float:right;
- font-size:12px;
- letter-spacing:0;
-}
-#logo p {
- font-size:14px;
- margin-left:30px;
- font-style:italic;
- text-shadow: 0px -1px #bbb,0 1px #fff;
- color:#e3e1e1;
-}
-#menu {
- border-bottom:1px solid #CCC;
- padding-bottom:5px;
- font-size:14px;
- padding-left:20px;
-}
-#menu ul li {
- display:inline;
- padding:5px 10px;
-}
-#menu ul li:hover {
- border-top:1px solid red;
-}
-#foot {
- border-top:1px solid #ccc;
- text-align:center;
- margin:20px;
+
+/** body **/
+body {
+ background-color:#333;
}
-#foot p {
- margin-top:10px;
- font-size:12px;
- color:#333;
+#side_bar {
+ width:200px;
+ float:left;
+ color:#9FC671;
}
-/** index page **/
-#blog_list {
- float:left;
- width:700px;
- padding:0 30px 0 30px;
+#main {
+ width:740px;
+ float:left;
+ background-color:#FBF8EF;
+ padding:10px;
+ margin:20px 0;
}
.blog_each {
- margin-bottom:100px;
-}
-.blog_each h1 {
- font-size:26px;
- padding:5px 0;
+ padding:10px;
+ margin:10px 0;
+ border-top:1px dashed #FF9595;
+ border-top-width:70%;
}
-.blog_each h1 a:link,
-.blog_each h1 a:visited {
- color:black;
- font-family:"Microsoft YaHei" !important;
- text-shadow:0 1px 0 #FFFFFF;
-}
-.blog_each h1 a:hover {
- color:#D90000;
+.blog_each > h1 {
+ font-size:22px;
+ padding:5px 0;
}
-.blog_each h2,
-.blog_each h3 {
- font-size:12px;
- color:#ccc;
- font-style:italic;
+.blog_each > h1 > a {
+ padding:3px;
+ display:block;
}
-.blog_each h3 a {
- text-decoration:underline;
- color:#444;
+.blog_each > h1 > a:link,
+.blog_each > h1 > a:visited {
+ color:#3177C1;
}
-.blog_each h3 a:link,
-.blog_each h3 a:visited {
- color:#444;
+.blog_each > h1 > a:hover {
+ color:white;
+ background-color:#3177C1;
}
-.blog_each h3 a:hover {
- color:red;
+.blog_each > h3 {
+ font-size:12px;
}
.blog_each > div {
- font-size:12px;
- margin:50px 0;
-}
-.blog_each > div p {
- margin:15px 0;
- line-height:1.5em;
-}
-
-#side_bar {
- float:left;
- width:199px;
- border-left:1px solid #ccc;
-}
-.side_bar_component {
- margin:22px;
-}
-.side_bar_component span a:link,
-.side_bar_component span a:visited {
- color:red;
-}
-.side_bar_component a {
- font-size:14px;
-}
-.side_bar_component h2 {
- font-size:16px;
- color:#333;
-}
-.side_bar_component ul {
- margin:5px 0 0 20px;
-}
-.side_bar_component ul li span {
- color:red;
-}
-#page_link { font-size:12px;padding:5px; }
-#page_link a { text-decoration:underline; }
-#pre_page { float:left; }
-#pre_page a:link,
-#pre_page a:visited,
-#next_page a:link,
-#next_page a:visited {
- color:#004B91;
-}
-#next_page { float:right; }
-#cur_page { margin:0 auto;display:block;width:100px;text-align:center; }
-
-/** Entry page **/
-#comments > h2 {
- font-size:16px;
- margin:10px 0;
-}
-.comment {
- border:1px solid #ccc;
- padding:10px;
- margin-bottom:10px;
-}
-.comment h1 {
- float:left;
- height:50px;
- margin:5px;
- width:50px;
-}
-.comment h2 {
- font-size:14px;
- float:left;
- margin:7px 7px;
- width:550px;
-}
-.comment h2 a:link,
-.comment h2 a:visited {
- color:#004B91;
-}
-.comment h3 {
- font-size:11px;
- color:#666;
- float:left;
- margin:5px;
- width:500px;
-}
-.comment p {
- margin:10px 0;
- clear:both;
- padding:10px;
- font-size:12px;
-}
-.comment span {
- font-size:12px;
-}
-#comment_form > h2 {
- font-size:16px;
-}
-#comment_form tr {
- padding:10px 0;
-}
-#comment_form td {
- width:180px;
- padding:5px 0;
- vertical-align:top;
- font-size:12px;
+ font-size:14px;
}
-#comment_form input {
- width:510px;
- font-size:12px;
+.blog_each > div > p {
+ margin:15px 0;
}
-#comment_form textarea {
- width:510px;
- height:150px;
- font-size:12px;
+.blog_each > div a:link,
+.blog_each > div a:visited {
+ text-decoration:underline;
+ color:#A76B2E;
}
-label.error {color:red;}
View
30 templates/base.html
@@ -6,28 +6,14 @@
<meta content="text/html;charset=utf-8" http-equiv="Content-Type" />
<link rel="stylesheet" type="text/css" href="/static/css/styles.css" />
<link rel="SHORTCUT ICON" href="/static/favicon.ico" />
- <script type="text/javascript" src="http://jqueryjs.googlecode.com/files/jquery-1.3.2.min.js"></script>
+ <script type="text/javascript" src="/static/js/jquery-1.3.2.min.js"></script>
</head>
<body>
- <div id="page">
- <div id="head">
- <div id="logo">
- <h1><a href="/">泥泞的沼泽</a><span>David-Blog 0.2beta</span></h1>
- <p>技术改变生活</p>
- </div>
- <div id="menu">
- <ul>
- <li><a href="/">博客</a></li>
- <li><a href="/page/about/">关于</a></li>
- <li><a href="/page/projects/">项目管理</a></li>
- <li><a href="http://davidpaste.com/" target="_blank">大卫粘贴</a></li>
- <li style="font-size:16px;"><a href="/rss.xml">RSS2.0</a></li>
- </ul>
- </div>
- </div>
- <div id="main">{% block content %}{% endblock %}</div>
- <div id="foot">
- <p>版权所有©2009 <a href="http://davidx.me/">David Xie</a> | 如有转贴, 请注明出处. @转自<a href="http://davidx.me/">&lt;泥泞的沼泽:http://davidx.me/&gt;</a> | Powered by <a href="http://webpy.org/" target="_blank">web.py</a> | 页面加载耗时 {{ "%.3f" % usedTime }}s</p>
- </div>
- </body>
+ {% include "_leftbar.html" %}
+ <div id="main">{% block content %}{% endblock %}</div>
+ <br class="clearfloat" />
+ <div id="foot">
+ <p>版权所有©2009 <a href="http://davidx.me/">David Xie</a> | 如有转贴, 请注明出处. @转自<a href="http://davidx.me/">&lt;泥泞的沼泽:http://davidx.me/&gt;</a> | Powered by <a href="http://webpy.org/" target="_blank">web.py</a> | 页面加载耗时 {{ "%.3f" % usedTime }}s</p>
+ </div>
+ </body>
</html>
View
6 templates/index.html
@@ -9,14 +9,12 @@
{% endif %}
<div id="page_link">
{% if p.page > 1 %}
- <span id="pre_page"><a href="/?page={{ p.prev_page }}">上一页</a></span>
+ <span id="pre_page"><a href="/?page={{ p.prevPage }}">上一页</a></span>
{% endif %}
{% if p.page < p.pages %}
- <span id="next_page"><a href="/?page={{ p.next_page }}">下一页</a></span>
+ <span id="next_page"><a href="/?page={{ p.nextPage }}">下一页</a></span>
{% endif %}
<span id="cur_page">{{ p.page }}/{{ p.pages }}</span>
</div>
</div>
-{% include '_leftbar.html' %}
-<br class="clearfloat" />
{% endblock %}

0 comments on commit 54c159e

Please sign in to comment.