aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbnewbold <bnewbold@manus.(none)>2007-02-20 17:39:19 -0800
committerbnewbold <bnewbold@manus.(none)>2007-02-20 17:39:19 -0800
commit855f0613ed1c0fe28f62f105c1433d29cec7fa86 (patch)
tree87cab403eb13075711539d059d8072b232cb5ab9
parent3d203c153301d4dd9c3285e7dea86ee09eb3b0c5 (diff)
downloadbnewnet-855f0613ed1c0fe28f62f105c1433d29cec7fa86.tar.gz
bnewnet-855f0613ed1c0fe28f62f105c1433d29cec7fa86.zip
moved git_browse style to seperate file, added style options
TODO: wire style options
-rw-r--r--bn_django/git_browse/templates/git_browse/base.html8
-rw-r--r--bn_django/templates/base.html26
-rw-r--r--static/style/default.css32
-rw-r--r--static/style/git_browse.css35
4 files changed, 67 insertions, 34 deletions
diff --git a/bn_django/git_browse/templates/git_browse/base.html b/bn_django/git_browse/templates/git_browse/base.html
index 0edb5a7..93814c1 100644
--- a/bn_django/git_browse/templates/git_browse/base.html
+++ b/bn_django/git_browse/templates/git_browse/base.html
@@ -1,5 +1,13 @@
{% extends "base.html" %}
+{% block stylesheets %}
+{{ block.super }}
+<link rel="STYLESHEET" type="text/css" href="style/git_browse.css">
+<link rel="STYLESHEET" type="text/css" href="/style/git_browse.css">
+<!--<link rel="STYLESHEET" type="text/css" href="http://static.bryannewbold.com/style/git_browse.css">-->
+
+{% endblock %}
+
{% block path %}
<a href="/code/">code</a> &raquo;
{% if object %}
diff --git a/bn_django/templates/base.html b/bn_django/templates/base.html
index 9375027..e40c27e 100644
--- a/bn_django/templates/base.html
+++ b/bn_django/templates/base.html
@@ -2,10 +2,15 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
+{% block stylesheets %}
<link rel="STYLESHEET" type="text/css" href="style/default.css">
<link rel="STYLESHEET" type="text/css" href="/style/default.css">
<!--<link rel="STYLESHEET" type="text/css" href="http://static.bryannewbold.com/style/default.css">-->
-<title>bryannewbold.com</title>
+{% endblock %}
+{% block externaljs %}
+
+{% endblock %}
+<title>{% block windowtitle %}bryannewbold.com{% endblock %}</title>
</head>
<body>
<div id="top_bar">
@@ -13,7 +18,7 @@
<span class="lefty"><a href="/">bryannewbold.com</a></span>
<span class="righty"><a href="/knowledge">knowledge</a>&nbsp;
<a href="/photos">photos</a>&nbsp;
- <a href="/code">code</a>
+ <a href="/code">code</a></span>
<!-- <a href="/projects">projects</a> -->
</div>
</div>
@@ -22,7 +27,15 @@
<form name="search">
<br/>
<input class="search_box" type="text" size="21" value="&nbsp;search!" name="search_text" id="search_text" onFocus="if (this.value == this.defaultValue) this.value=''; return;" />
-<br />style options # # # #
+<br />&nbsp;&nbsp;style: &nbsp;
+ <a onclick="swapstyle('font');return;" href="#"
+ id="style_font" class="subtle">
+ <span class="style_font_first">a</span><span class="style_font_second">A
+ </span></a>
+ &nbsp;<a onclick="swapstyle('font');return;" href="#"
+ id="style_width" class="subtle">fixed</a>
+ &nbsp;<a onclick="swapstyle('font');return;" href="#"
+ id="style_sheet" class="subtle">sane</a>
<span class="righty"></span>
</form>
</div>
@@ -44,11 +57,14 @@ Here lies content!
</div>
<div class="content_footer" id="footer" name="footer">
<b>
+&nbsp;
<a href="/">home</a> &nbsp;&nbsp;
<a href="/about">about</a> &nbsp;&nbsp;
<a href="/credits">credits</a> &nbsp;&nbsp;
-<a href="mailto:webmeisterATbryannewbold.com">email the webmaster</a> &nbsp;&nbsp;
-<a href="http://web.mit.edu/">hosted by MIT</a> &nbsp;
+<a href="mailto:webmeisterATbryannewbold.com">email the webmaster</a>
+<!--
+&nbsp;&nbsp;
+<a href="http://web.mit.edu/">hosted by MIT</a> &nbsp; -->
</b>
<br />
produced in 2007 by <a href="/k/BryanNewbold">bryan newbold</a>, <a href="/copyright">all rights ignored</a>
diff --git a/static/style/default.css b/static/style/default.css
index 27915a9..8c0cd7e 100644
--- a/static/style/default.css
+++ b/static/style/default.css
@@ -185,34 +185,6 @@ pre.large {
width: 160px;
height: 180px; }
-table.gitbrowser {
- width: 100%;
- border-spacing: 0px;
-}
-table.gitbrowser tr {
- width: 100%;
- margin-bottom: 2px;
-}
-table.gitbrowser td {
- margin: 0px;
- border: 1px solid black;
- margin: 0px;
-}
-td.head {
- font-weight: bold;
- width: 130px;
- overflow: hidden;
-}
-
-td.hash {
- width: 100px;
- overflow: hidden;
- text-align: right;
-}
-span.hash {
- font-family: courier;
-}
-
#top_bar {
height: 22px;
background-color: #993333;
@@ -223,7 +195,9 @@ span.hash {
background-color: #993333;
height: 20px;
font-family: courier;
- font-size: smaller;
+ font: courier;
+ font-weight: normal;
+ font-size: 14px;
color: #EEEEEE;
float: center;
width: 684px;
diff --git a/static/style/git_browse.css b/static/style/git_browse.css
new file mode 100644
index 0000000..a88147d
--- /dev/null
+++ b/static/style/git_browse.css
@@ -0,0 +1,35 @@
+pre.large {
+ font-family: courier;
+ margin: 10px;
+ padding: 6px;
+ border: 1px solid black;
+ background-color: #F2D1D1;
+ overflow: auto; }
+
+table.gitbrowser {
+ width: 100%;
+ border-spacing: 2px;
+}
+table.gitbrowser tr {
+ width: 100%;
+ background-color: #EEEEEE;
+}
+table.gitbrowser td {
+ margin: 0px;
+ margin-bottom: 2px;
+}
+td.head {
+ font-weight: bold;
+ width: 130px;
+ overflow: hidden;
+}
+
+td.hash {
+ width: 100px;
+ overflow: hidden;
+ text-align: right;
+}
+span.hash {
+ font-family: courier;
+}
+