Skip to content
Browse files

simplify css

  • Loading branch information...
1 parent 88dafe0 commit f92a1a42b78b134af48a537147fc22dd5c992d99 @kjk committed
Showing with 91 additions and 133 deletions.
  1. +1 −1 main.py
  2. +56 −62 tmpl/archive.html
  3. +1 −3 tmpl/article.html
  4. +31 −65 tmpl/inline_css.html
  5. +2 −2 tmpl/page.html
View
2 main.py
@@ -501,7 +501,7 @@ def get_login_logut_url(url):
return users.create_login_url(url)
def url_for_tag(tag):
- return '<a href="/tag/%s">%s</a>' % (urllib.quote(tag), tag)
+ return '<a href="/tag/%s" class="taglink">%s</a>' % (urllib.quote(tag), tag)
def render_article(response, article):
full_permalink = g_root_url + "/" + article.permalink
View
118 tmpl/archive.html
@@ -60,9 +60,9 @@ <h1 style="padding-left:12px">
<span style="float:right; font-size:80%; font-weight:normal; margin-right: 12px;">
<a class="hdrlink" href="/">Blog</a>
<span style="color:gray">&nbsp;&bull;&nbsp;</span>
- <a class="hdrlink" href="/static/krzysztof.html">Software</a>
+ <a class="hdrlink" href="/static/software.html">My Software</a>
<span style="color:gray">&nbsp;&bull;&nbsp;</span>
- <a class="hdrlink" href="/static/krzysztof.html">Documents</a>
+ <a class="hdrlink" href="/static/documents.html">My Documents</a>
<span style="color:gray">&nbsp;&bull;&nbsp;</span>
<a class="hdrlink" href="/static/krzysztof.html">About Me</a>
</span>
@@ -71,67 +71,61 @@ <h1 style="padding-left:12px">
<div id="content" style="line-height:1.50; margin-top: 18px; margin-left: 12px; margin-right: 12px;">
-{% if is_admin %}
-<center style="font-size: 90%; background: #ddd">
-<a href="{{ login_out_url }}">Log out</a>&nbsp;
-<a href="/app/edit">New Post</a>&nbsp;
-<a href="/app/showprivate">Show private</a>&nbsp;
-</center>
-{% endif %}
-
-{% if posts_count %}
- <h1 style="display:inline;">
- {% if tag %}
- {{ posts_count }} posts tagged as '{{ tag }}':
- {% else %}
- All posts:
- {% endif %}
- </h1>
-{% endif %}
-
-{% if not is_admign %}
-<a id="login" class="invisible" onMouseOver="showById('login');" onMouseOut="hideById('login');" href="{{ login_out_url }}">login</a>
-{% endif %}
-
-{% if posts_count %}
-<table id=arc>
- {% for year in years %}
- <tr class=year><th colspan="2" style="text-align: left; padding-left: 5px;">{{ year.name }}</th></tr>
- {% for month in year.months %}
- <tr><th>{{ month.name }}</th><td></td></tr>
- {% for article in month.articles %}
- <tr>
- <th>{{ article.day }}</th>
- <td>
- <a href="/{{ article.permalink }}">{{ article.title }}</a>
- {% if article.tags_display %}
- ({{ article.tags_display }})
- {% endif %}
-
- {% if article.is_deleted %}
- &nbsp;<font color="red">deleted</font>
- {% endif %}
- {% if not article.is_public %}
- &nbsp;<font color="red">private</font>
- {% endif %}
- {% if is_admin %}&nbsp;
- <a id="article_edit" href="/app/edit?article_permalink={{ article.permalink }}">edit</a>
- {% endif %}
- </td></tr>
+ {% if is_admin %}
+ <center style="font-size: 90%; background: #ddd">
+ <a href="{{ login_out_url }}">Log out</a>&nbsp;
+ <a href="/app/edit">New Post</a>&nbsp;
+ <a href="/app/showprivate">Show private</a>&nbsp;
+ </center>
+ {% endif %}
+
+ {% if posts_count %}
+ <div style="font-size: 110%; font-weight: bold;">
+ {% if tag %}
+ {{ posts_count }} posts tagged as '{{ tag }}':
+ {% else %}
+ All {{ posts_count }} posts:
+ {% endif %}
+ {% if not is_admign %}
+ <a id="login" class="invisible" onMouseOver="showById('login');" onMouseOut="hideById('login');" href="{{ login_out_url }}">login</a>
+ {% endif %}
+ </div>
+
+ <table id=arc>
+ {% for year in years %}
+ <tr class=year><th colspan="2" style="text-align: left; padding-left: 5px;">{{ year.name }}</th></tr>
+ {% for month in year.months %}
+ <tr><th>{{ month.name }}</th><td></td></tr>
+ {% for article in month.articles %}
+ <tr>
+ <th>{{ article.day }}</th>
+ <td>
+ <a href="/{{ article.permalink }}">{{ article.title }}</a>
+ {% if article.tags_display %}
+ ({{ article.tags_display }})
+ {% endif %}
+
+ {% if article.is_deleted %}
+ &nbsp;<font color="red">deleted</font>
+ {% endif %}
+ {% if not article.is_public %}
+ &nbsp;<font color="red">private</font>
+ {% endif %}
+ {% if is_admin %}&nbsp;
+ <a id="article_edit" href="/app/edit?article_permalink={{ article.permalink }}">edit</a>
+ {% endif %}
+ </td></tr>
+ {% endfor %}
+ {% endfor %}
{% endfor %}
- {% endfor %}
- {% endfor %}
-</table>
-<br>
-{% endif %}
-
-<h1 style="display:inline;">
- Tags:
-</h1>
-<div id="tagCloud" style="margin-left:20px; margin-right:20px; text-align: center;"></div>
-
-<br>
-<div class="line"></div>
+ </table>
+ <br>
+ {% endif %}
+
+ <div style="font-size:110%; font-weight:bold;">Tags:</div>
+ <div id="tagCloud" style="margin-left:22px; margin-right:22px;"></div>
+ <br>
+ <hr>
</div>
{% include "analytics.html" %}
View
4 tmpl/article.html
@@ -81,9 +81,7 @@ <h1 style="display:inline;">
</span>
</h1>
{% if tags_display %}
- <div class="postmeta" style="margin-right: 8px;">
- <span class="tag"><a href="/tag/">Tags</a>: {{ tags_display }}</span>
- </div>
+ <div><a href="/tag/" class="taglink">Tags</a>: {{ tags_display }}</div>
{% endif %}
</td>
</tr>
View
96 tmpl/inline_css.html
@@ -5,7 +5,7 @@
font-family: arial, sans-serif;
}
-h1,h2,h3 {
+h1, h2, h3 {
font-size: medium;
}
@@ -14,20 +14,10 @@
padding: 0;
}
-.postmeta {
- color: grey;
- margin-top: 0;
- padding-top: 1px;
-}
-
img {
border: 0;
}
-div#navarea {
-
-}
-
div#tophdr {
margin: 0px;
padding: 0px;
@@ -36,6 +26,14 @@
background-color: #4D5456;
}
+div#content {
+ max-width: 1140px;
+}
+
+div#post {
+ min-width: 400px;
+ max-width: 768px;
+}
.namelink {
color: #aedc31;
@@ -56,42 +54,7 @@
text-decoration: underline;
}
-div#head {
- margin: 0;
- width: 100%;
- font-size: small;
- background: #7f7f7f;
- color: #fff;
- padding-top: 6px;
- padding-bottom: 6px;
- font-weight: bold;
-}
-
-div#head div#inner {
- margin: 0 auto;
- width: 720px;
-}
-
-div#head a {color: #fff;}
-div#head span.right {
- float: right;
- color: #b9b9b9;
-}
-
-.invisible { color: #fff }
-.visible { color: #000 }
-
-div#content {
- max-width: 1140px;
-}
-
-div#post {
- min-width: 400px;
- max-width: 768px;
-}
-
.title, .title:visited {
- color: #87979E;
color: #008ac0;
font-weight: bold;
font-size: 130%;
@@ -102,32 +65,19 @@
text-decoration: underline;
}
-.light {
- color: #999999;
-}
-
-.tag a:link, .tag a:visited {
- color: grey;
+.taglink {
+ color: gray;
text-decoration: none;
}
-.tag a:hover {
+a.taglink:hover {
text-decoration: underline;
}
-.line {
- border-top: 1px solid #ccc;
- padding-bottom: 8px;
-}
-
-.nowrap {
- white-space: nowrap;
-}
-
-.inactiveSearch {
+.postmeta {
color: gray;
- font-size: 85%;
- font-style: italic;
+ margin-top: 0;
+ padding-top: 1px;
}
.ad {
@@ -141,4 +91,20 @@
color: green;
}
+.light {
+ color: #999999;
+}
+
+.invisible { color: #fff }
+.visible { color: #000 }
+
+.nowrap {
+ white-space: nowrap;
+}
+
+.inactiveSearch {
+ color: gray;
+ font-size: 85%;
+ font-style: italic;
+}
</style>
View
4 tmpl/page.html
@@ -146,7 +146,7 @@ <h1 style="padding-left:12px">
<td style="background: lightgray; width=4px"></td>
<td>
<div onMouseOver="showById('article_{{ article.no }}');" onMouseOut="hideById('article_{{ article.no }}');">
- <a class="title" href="/{{ article.permalink }}">{{ article.title|escape }}</a>
+ <a href="/{{ article.permalink }}" class="title">{{ article.title|escape }}</a>
{% if not article.is_public %} &nbsp;<font style="color: red;">private</font> {% endif %}
{% if is_admin %}&nbsp;
<a id="article_{{ article.no }}" class="invisible" href="/app/edit?article_permalink={{ article.permalink }}">edit</a>
@@ -155,7 +155,7 @@ <h1 style="padding-left:12px">
<div class="postmeta nowrap">
{{ article.published_on|date:"M d Y" }}
{% if article.tags_display %}
- &bull; <span class="tag"><a href="/tag/">Tags</a>: {{ article.tags_display }}</span>
+ &bull; <a href="/tag/" class="taglink">Tags</a>: {{ article.tags_display }}
{% endif %}
</div>
</td>

0 comments on commit f92a1a4

Please sign in to comment.
Something went wrong with that request. Please try again.