From 01f4d90290391358d5078a27bdb961c06413a315 Mon Sep 17 00:00:00 2001 From: bnewbold Date: Mon, 5 Oct 2009 22:28:22 -0400 Subject: purged old sytle system, fixing up some reset akchun --- bn_django/templates/base.html | 1 + static/style/default.css | 29 +++++------ static/style/fixed-nuts-sans.css | 36 -------------- static/style/fixed-nuts-serif.css | 35 ------------- static/style/fixed-sane-sans.css | 48 ------------------ static/style/fixed-sane-serif.css | 19 ------- static/style/flexy-nuts-sans.css | 41 ---------------- static/style/flexy-nuts-serif.css | 39 --------------- static/style/flexy-sane-sans.css | 38 -------------- static/style/flexy-sane-serif.css | 37 -------------- static/style/fractal.gif | Bin 22418 -> 0 bytes static/style/reset.css | 52 ++++++++++++++++++++ static/style/styleswitcher.js | 101 -------------------------------------- 13 files changed, 64 insertions(+), 412 deletions(-) delete mode 100644 static/style/fixed-nuts-sans.css delete mode 100644 static/style/fixed-nuts-serif.css delete mode 100644 static/style/fixed-sane-sans.css delete mode 100644 static/style/fixed-sane-serif.css delete mode 100644 static/style/flexy-nuts-sans.css delete mode 100644 static/style/flexy-nuts-serif.css delete mode 100644 static/style/flexy-sane-sans.css delete mode 100644 static/style/flexy-sane-serif.css delete mode 100644 static/style/fractal.gif create mode 100644 static/style/reset.css delete mode 100644 static/style/styleswitcher.js diff --git a/bn_django/templates/base.html b/bn_django/templates/base.html index 159c6c6..76e3c50 100644 --- a/bn_django/templates/base.html +++ b/bn_django/templates/base.html @@ -3,6 +3,7 @@ {% block stylesheets %} + {% endblock %} diff --git a/static/style/default.css b/static/style/default.css index acdd415..f8ec391 100644 --- a/static/style/default.css +++ b/static/style/default.css @@ -1,11 +1,7 @@ -html { - margin: 0px; - padding: 0px; - font-size: 16px; } body { - font-family: serif; - margin: 0px; - padding: 0px; + font-family: helvetica, arial, verdana, sans-serif; + font-size: 90%; + line-height: 1.25; background-color: #E3E3E3; } a { text-decoration: none; } @@ -21,17 +17,16 @@ a.subtle { color: black; text-decoration: none; } h1 { - font-size: 16pt; - font-weight: bold; - text-align: center; } + font-size: 200%; + margin: 10px 10px 20px 8px; + font-weight: bold; } h2.pagesubtitle { - font-size: 12pt; + font-size: 140%; font-weight: bold; font-style: italic; text-align: center; border-bottom: none; } h3 { - margin: 0px; padding-top: 8px; padding-bottom: 4px; padding-left: 0px; @@ -73,8 +68,7 @@ pre.large { font-size: 12px; color: #555555; font-weight: bold; - font-size: 12px; - margin-left: 8px; } + margin-left: 2px; } .path a { color: #6666DD; } .path a:visited { @@ -107,7 +101,7 @@ pre.large { text-align: center; font-weight: bold; font-family: serif; - font-size: 14px; + font-size: 120%; } .col_left { width: 24%; @@ -140,7 +134,7 @@ pre.large { text-align: center; font-style: italic; width: 100%; - font-size: small; + font-size: 70%; font-family: courier; } .notice { padding: 8px; @@ -156,7 +150,6 @@ pre.large { .centerize { text-align: center; } .content { - font-size: small; background-color: #FFFFFF; margin-left: 4%; width: 680px; @@ -169,7 +162,7 @@ pre.large { border: 1px solid black; } .content_footer { margin-left: 4%; - font-size: 10px; + font-size: 90%; font-style: italic; font-family: sans-serif; text-align: center; diff --git a/static/style/fixed-nuts-sans.css b/static/style/fixed-nuts-sans.css deleted file mode 100644 index 3ee7c8d..0000000 --- a/static/style/fixed-nuts-sans.css +++ /dev/null @@ -1,36 +0,0 @@ -.content { - margin-left: 4%; - width: 680px; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - padding-left: 5px; - padding-right: 5px; - padding-bottom: 5px; } -.content_footer { - margin-left: 4%; - width: 680px; - margin-bottom: 5px; - margin-right: 0px; - margin-top: 0px; - border-top: 2px solid #000000; - padding-top: 6px; - padding-left: 5px; - padding-right: 5px; } -body { - background-image: url("/static/style/fractal.gif"); - background-color: green; } - -a { color: magenta; } -a:visited { color: orange; } -a:hover { color: yellow; } - -.content { background-color: purple; } - -#top_bar { background-color: #FF00FF; } - -#top_bar_content { - background-color: #FF00FF; - border-right: 200px solid #FF00FF; -} -body { font-family: sans; } diff --git a/static/style/fixed-nuts-serif.css b/static/style/fixed-nuts-serif.css deleted file mode 100644 index 11142d7..0000000 --- a/static/style/fixed-nuts-serif.css +++ /dev/null @@ -1,35 +0,0 @@ -.content { - margin-left: 4%; - width: 680px; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - padding-left: 5px; - padding-right: 5px; - padding-bottom: 5px; } -.content_footer { - margin-left: 4%; - width: 680px; - margin-bottom: 5px; - margin-right: 0px; - margin-top: 0px; - border-top: 2px solid #000000; - padding-top: 6px; - padding-left: 5px; - padding-right: 5px; } -body { - background-image: url("/static/style/fractal.gif"); - background-color: green; } - -a { color: magenta; } -a:visited { color: orange; } -a:hover { color: yellow; } - -.content { background-color: purple; } - -#top_bar { background-color: #FF00FF; } - -#top_bar_content { - background-color: #FF00FF; - border-right: 200px solid #FF00FF; -} diff --git a/static/style/fixed-sane-sans.css b/static/style/fixed-sane-sans.css deleted file mode 100644 index 52d7a65..0000000 --- a/static/style/fixed-sane-sans.css +++ /dev/null @@ -1,48 +0,0 @@ -.content { - margin-left: 4%; - width: 680px; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - padding-left: 5px; - padding-right: 5px; - padding-bottom: 5px; } -.content_footer { - margin-left: 4%; - width: 680px; - margin-bottom: 5px; - margin-right: 0px; - margin-top: 0px; - border-top: 2px solid #000000; - padding-top: 6px; - padding-left: 5px; - padding-right: 5px; } -body { - background-image: none; - background-color: #E3E3E3; } - -a { color: blue; } -a:visited { color: blue; } -a:hover { color: blue; } - -.content { background-color: #FFFFFF; } - -#top_bar { background-color: #993333; } -#top_bar_content { - background-color: #993333; - border-right: 200px solid #993333; } -body { - background-image: none; - background-color: #E3E3E3; } - -a { color: blue; } -a:visited { color: blue; } -a:hover { color: blue; } - -.content { background-color: #FFFFFF; } - -#top_bar { background-color: #993333; } -#top_bar_content { - background-color: #993333; - border-right: 200px solid #993333; } -body { font-family: sans; } diff --git a/static/style/fixed-sane-serif.css b/static/style/fixed-sane-serif.css deleted file mode 100644 index 757afff..0000000 --- a/static/style/fixed-sane-serif.css +++ /dev/null @@ -1,19 +0,0 @@ -.content { - margin-left: 4%; - width: 680px; - margin-top: 0px; - margin-right: 0px; - margin-bottom: 0px; - padding-left: 5px; - padding-right: 5px; - padding-bottom: 5px; } -.content_footer { - margin-left: 4%; - width: 680px; - margin-bottom: 5px; - margin-right: 0px; - margin-top: 0px; - border-top: 2px solid #000000; - padding-top: 6px; - padding-left: 5px; - padding-right: 5px; } diff --git a/static/style/flexy-nuts-sans.css b/static/style/flexy-nuts-sans.css deleted file mode 100644 index 5fd55e4..0000000 --- a/static/style/flexy-nuts-sans.css +++ /dev/null @@ -1,41 +0,0 @@ -.content { - margin-left: 0px; - width: 75%; - margin-top: 0px; - margin-bottom: 0px; - margin-right: 250px; - margin-left: 15px; - padding-left: 15px; - padding-right: 5px; - padding-bottom: 5px; } -.content_footer { - margin-left: 0px; - width: 75%; - margin-bottom: 5px; - margin-right: 250px; - margin-top: 0px; - margin-left: 15px; - border-top: 2px solid #000000; - padding-top: 6px; - padding-left: 15px; - padding-right: 5px; } - -body { - background-image: url("/static/style/fractal.gif"); - background-color: green; } - -a { color: magenta; } -a:visited { color: orange; } -a:hover { color: yellow; } - -.content { background-color: purple; } - -#top_bar { background-color: #FF00FF; } - -#top_bar_content { - margin-left: 15px; - background-color: #FF00FF; - border-right: 200px solid #FF00FF; -} -body { font-family: sans; } -body { font-family: sans; } diff --git a/static/style/flexy-nuts-serif.css b/static/style/flexy-nuts-serif.css deleted file mode 100644 index b11bc81..0000000 --- a/static/style/flexy-nuts-serif.css +++ /dev/null @@ -1,39 +0,0 @@ -.content { - margin-left: 0px; - width: 75%; - margin-top: 0px; - margin-bottom: 0px; - margin-right: 250px; - margin-left: 15px; - padding-left: 15px; - padding-right: 5px; - padding-bottom: 5px; } -.content_footer { - margin-left: 0px; - width: 75%; - margin-bottom: 5px; - margin-right: 250px; - margin-top: 0px; - margin-left: 15px; - border-top: 2px solid #000000; - padding-top: 6px; - padding-left: 15px; - padding-right: 5px; } - -body { - background-image: url("/static/style/fractal.gif"); - background-color: green; } - -a { color: magenta; } -a:visited { color: orange; } -a:hover { color: yellow; } - -.content { background-color: purple; } - -#top_bar { background-color: #FF00FF; } - -#top_bar_content { - margin-left: 15px; - background-color: #FF00FF; - border-right: 200px solid #FF00FF; -} diff --git a/static/style/flexy-sane-sans.css b/static/style/flexy-sane-sans.css deleted file mode 100644 index 45e3e2c..0000000 --- a/static/style/flexy-sane-sans.css +++ /dev/null @@ -1,38 +0,0 @@ -.content { - margin-left: 0px; - width: 75%; - margin-top: 0px; - margin-bottom: 0px; - margin-right: 250px; - margin-left: 15px; - padding-left: 15px; - padding-right: 5px; - padding-bottom: 5px; } -.content_footer { - margin-left: 0px; - width: 75%; - margin-bottom: 5px; - margin-right: 250px; - margin-top: 0px; - margin-left: 15px; - border-top: 2px solid #000000; - padding-top: 6px; - padding-left: 15px; - padding-right: 5px; } - -body { - background-image: none; - background-color: #E3E3E3; } - -a { color: blue; } -a:visited { color: blue; } -a:hover { color: blue; } - -.content { background-color: #FFFFFF; } - -#top_bar { background-color: #993333; } -#top_bar_content { - margin-left: 15px; - background-color: #993333; - border-right: 200px solid #993333; } -body { font-family: sans; } diff --git a/static/style/flexy-sane-serif.css b/static/style/flexy-sane-serif.css deleted file mode 100644 index ae77ddf..0000000 --- a/static/style/flexy-sane-serif.css +++ /dev/null @@ -1,37 +0,0 @@ -.content { - margin-left: 0px; - width: 75%; - margin-top: 0px; - margin-bottom: 0px; - margin-right: 250px; - margin-left: 15px; - padding-left: 15px; - padding-right: 5px; - padding-bottom: 5px; } -.content_footer { - margin-left: 0px; - width: 75%; - margin-bottom: 5px; - margin-right: 250px; - margin-top: 0px; - margin-left: 15px; - border-top: 2px solid #000000; - padding-top: 6px; - padding-left: 15px; - padding-right: 5px; } - -body { - background-image: none; - background-color: #E3E3E3; } - -a { color: blue; } -a:visited { color: blue; } -a:hover { color: blue; } - -.content { background-color: #FFFFFF; } - -#top_bar { background-color: #993333; } -#top_bar_content { - margin-left: 15px; - background-color: #993333; - border-right: 200px solid #993333; } diff --git a/static/style/fractal.gif b/static/style/fractal.gif deleted file mode 100644 index b008702..0000000 Binary files a/static/style/fractal.gif and /dev/null differ diff --git a/static/style/reset.css b/static/style/reset.css new file mode 100644 index 0000000..22d3827 --- /dev/null +++ b/static/style/reset.css @@ -0,0 +1,52 @@ +/* v1.0 | 20080212 */ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, font, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td { + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-size: 100%; + vertical-align: baseline; + background: transparent; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} + +/* remember to define focus styles! */ +:focus { + outline: 0; +} + +/* remember to highlight inserts somehow! */ +ins { + text-decoration: none; +} +del { + text-decoration: line-through; +} + +/* tables still need 'cellspacing="0"' in the markup */ +table { + border-collapse: collapse; + border-spacing: 0; +} diff --git a/static/style/styleswitcher.js b/static/style/styleswitcher.js deleted file mode 100644 index 71a5dff..0000000 --- a/static/style/styleswitcher.js +++ /dev/null @@ -1,101 +0,0 @@ -var fontStyle = 'serif'; -var siteStyle = 'sane'; -var widthStyle = 'fixed'; - -function setStyleSheet() { - var i, a; - var styleName = '' + widthStyle + '-' + siteStyle + '-' + fontStyle - for(i=0; (a = document.getElementsByTagName("link")[i]); i++) { - if(a.getAttribute("rel").indexOf("style") != -1 && a.getAttribute("title")) - { - if(a.getAttribute("title").indexOf(styleName) != -1) a.disabled = false; - else a.disabled = true; - } - } - createCookie("style", styleName, 100); -} - -function parseStyleCookie(cookie) { - names = cookie.split('-') - widthStyle = names[0] - if(widthStyle == 'flexy') { - document.getElementById('style_width').innerHTML = 'flexy' - } - siteStyle = names[1] - if(siteStyle == 'nuts') { - document.getElementById('style_site').innerHTML = 'nuts' - } - fontStyle = names[2] - if(fontStyle == 'sans') { - document.getElementById('style_font_first').innerHTML = 'A' - document.getElementById('style_font_second').innerHTML = 'a' - } - setStyleSheet() -} - -function createCookie(name,value,days) { - if (days) { - var date = new Date(); - date.setTime(date.getTime()+(days*24*60*60*1000)); - var expires = "; expires="+date.toGMTString(); - } - else expires = ""; - document.cookie = name+"="+value+expires+"; path=/"; -} - -function readCookie(name) { - var nameEQ = name + "="; - var ca = document.cookie.split(';'); - for(var i=0;i < ca.length;i++) { - var c = ca[i]; - while (c.charAt(0)==' ') c = c.substring(1,c.length); - if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length); - } - return null; -} - -window.onload = function(e) { - var cookie = readCookie("style"); - if(cookie) parseStyleCookie(cookie); -} - -function swapstyle(thing) { - stuffset = true; - switch(thing){ - case 'font': - if(document.getElementById('style_font_first').innerHTML.indexOf('a') != -1){ - document.getElementById('style_font_first').innerHTML = 'A' - document.getElementById('style_font_second').innerHTML = 'a' - fontStyle = 'sans' - setStyleSheet() - } else { - document.getElementById('style_font_first').innerHTML = 'a' - document.getElementById('style_font_second').innerHTML = 'A' - fontStyle = 'serif' - setStyleSheet() - } - break; - case 'site': - if(document.getElementById('style_site').innerHTML.indexOf('sane') != -1){ - document.getElementById('style_site').innerHTML = 'nuts' - siteStyle = 'nuts' - setStyleSheet() - } else { - document.getElementById('style_site').innerHTML = 'sane' - siteStyle = 'sane' - setStyleSheet() - } - break; - case 'width': - if(document.getElementById('style_width').innerHTML.indexOf('fixed') != -1){ - document.getElementById('style_width').innerHTML = 'flexy' - widthStyle = 'flexy' - setStyleSheet() - } else { - document.getElementById('style_width').innerHTML = 'fixed' - widthStyle = 'fixed' - setStyleSheet() - } - break; - } -} -- cgit v1.2.3