Mercurial > public > madeira

changeset 12:d771b81e927e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Incorporate blueprints css into the site design.
author Brian Neal <bgneal@gmail.com>
date Tue, 11 May 2010 23:18:32 +0000
parents 89978c135246
children 37384c648602
files media/css/blueprint/ie.css media/css/blueprint/print.css media/css/blueprint/screen.css media/css/theme.css mysite/templates/band/base.html mysite/templates/band/bio.html mysite/templates/band/buy.html mysite/templates/band/gigs.html mysite/templates/band/index.html
diffstat 9 files changed, 369 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media/css/blueprint/ie.css	Tue May 11 23:18:32 2010 +0000
@@ -0,0 +1,35 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 0.9
+ http://blueprintcss.org
+
+   * Copyright (c) 2007-Present. See LICENSE for more info.
+   * See README for instructions on how to use Blueprint.
+   * For credits and origins, see AUTHORS.
+   * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* ie.css */
+body {text-align:center;}
+.container {text-align:left;}
+* html .column, * html div.span-1, * html div.span-2, * html div.span-3, * html div.span-4, * html div.span-5, * html div.span-6, * html div.span-7, * html div.span-8, * html div.span-9, * html div.span-10, * html div.span-11, * html div.span-12, * html div.span-13, * html div.span-14, * html div.span-15, * html div.span-16, * html div.span-17, * html div.span-18, * html div.span-19, * html div.span-20, * html div.span-21, * html div.span-22, * html div.span-23, * html div.span-24 {overflow-x:hidden;}
+* html legend {margin:0px -8px 16px 0;padding:0;}
+ol {margin-left:2em;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+html>body p code {*white-space:normal;}
+hr {margin:-8px auto 11px;}
+img {-ms-interpolation-mode:bicubic;}
+.clearfix, .container {display:inline-block;}
+* html .clearfix, * html .container {height:1%;}
+fieldset {padding-top:0;}
+input.text, input.title {background-color:#fff;border:1px solid #bbb;}
+input.text:focus, input.title:focus {border-color:#666;}
+input.text, input.title, textarea, select {margin:0.5em 0;}
+input.checkbox, input.radio {position:relative;top:.25em;}
+form.inline div, form.inline p {vertical-align:middle;}
+form.inline label {position:relative;top:-0.25em;}
+form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
+button, input.button {position:relative;top:0.25em;}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media/css/blueprint/print.css	Tue May 11 23:18:32 2010 +0000
@@ -0,0 +1,30 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 0.9
+ http://blueprintcss.org
+
+   * Copyright (c) 2007-Present. See LICENSE for more info.
+   * See README for instructions on how to use Blueprint.
+   * For credits and origins, see AUTHORS.
+   * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* print.css */
+body {line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#000;background:none;font-size:10pt;}
+.container {background:none;}
+hr {background:#ccc;color:#ccc;width:100%;height:2px;margin:2em 0;padding:0;border:none;}
+hr.space {background:#fff;color:#fff;}
+h1, h2, h3, h4, h5, h6 {font-family:"Helvetica Neue", Arial, "Lucida Grande", sans-serif;}
+code {font:.9em "Courier New", Monaco, Courier, monospace;}
+img {float:left;margin:1.5em 1.5em 1.5em 0;}
+a img {border:none;}
+p img.top {margin-top:0;}
+blockquote {margin:1.5em;padding:1em;font-style:italic;font-size:.9em;}
+.small {font-size:.9em;}
+.large {font-size:1.1em;}
+.quiet {color:#999;}
+.hide {display:none;}
+a:link, a:visited {background:transparent;font-weight:700;text-decoration:underline;}
+a:link:after, a:visited:after {content:" (" attr(href) ")";font-size:90%;}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/media/css/blueprint/screen.css	Tue May 11 23:18:32 2010 +0000
@@ -0,0 +1,256 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 0.9
+ http://blueprintcss.org
+
+   * Copyright (c) 2007-Present. See LICENSE for more info.
+   * See README for instructions on how to use Blueprint.
+   * For credits and origins, see AUTHORS.
+   * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* reset.css */
+html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td {margin:0;padding:0;border:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline;}
+body {line-height:1.5;}
+table {border-collapse:separate;border-spacing:0;}
+caption, th, td {text-align:left;font-weight:normal;}
+table, td, th {vertical-align:middle;}
+blockquote:before, blockquote:after, q:before, q:after {content:"";}
+blockquote, q {quotes:"" "";}
+a img {border:none;}
+
+/* typography.css */
+body {font-size:75%;color:#222;background:#fff;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;}
+h1, h2, h3, h4, h5, h6 {font-weight:normal;color:#111;}
+h1 {font-size:3em;line-height:1;margin-bottom:0.5em;}
+h2 {font-size:2em;margin-bottom:0.75em;}
+h3 {font-size:1.5em;line-height:1;margin-bottom:1em;}
+h4 {font-size:1.2em;line-height:1.25;margin-bottom:1.25em;}
+h5 {font-size:1em;font-weight:bold;margin-bottom:1.5em;}
+h6 {font-size:1em;font-weight:bold;}
+h1 img, h2 img, h3 img, h4 img, h5 img, h6 img {margin:0;}
+p {margin:0 0 1.5em;}
+p img.left {float:left;margin:1.5em 1.5em 1.5em 0;padding:0;}
+p img.right {float:right;margin:1.5em 0 1.5em 1.5em;}
+a:focus, a:hover {color:#000;}
+a {color:#009;text-decoration:underline;}
+blockquote {margin:1.5em;color:#666;font-style:italic;}
+strong {font-weight:bold;}
+em, dfn {font-style:italic;}
+dfn {font-weight:bold;}
+sup, sub {line-height:0;}
+abbr, acronym {border-bottom:1px dotted #666;}
+address {margin:0 0 1.5em;font-style:italic;}
+del {color:#666;}
+pre {margin:1.5em 0;white-space:pre;}
+pre, code, tt {font:1em 'andale mono', 'lucida console', monospace;line-height:1.5;}
+li ul, li ol {margin:0 1.5em;}
+ul, ol {margin:0 1.5em 1.5em 1.5em;}
+ul {list-style-type:disc;}
+ol {list-style-type:decimal;}
+dl {margin:0 0 1.5em 0;}
+dl dt {font-weight:bold;}
+dd {margin-left:1.5em;}
+table {margin-bottom:1.4em;width:100%;}
+th {font-weight:bold;}
+thead th {background:#c3d9ff;}
+th, td, caption {padding:4px 10px 4px 5px;}
+tr.even td {background:#e5ecf9;}
+tfoot {font-style:italic;}
+caption {background:#eee;}
+.small {font-size:.8em;margin-bottom:1.875em;line-height:1.875em;}
+.large {font-size:1.2em;line-height:2.5em;margin-bottom:1.25em;}
+.hide {display:none;}
+.quiet {color:#666;}
+.loud {color:#000;}
+.highlight {background:#ff0;}
+.added {background:#060;color:#fff;}
+.removed {background:#900;color:#fff;}
+.first {margin-left:0;padding-left:0;}
+.last {margin-right:0;padding-right:0;}
+.top {margin-top:0;padding-top:0;}
+.bottom {margin-bottom:0;padding-bottom:0;}
+
+/* forms.css */
+label {font-weight:bold;}
+fieldset {padding:1.4em;margin:0 0 1.5em 0;border:1px solid #ccc;}
+legend {font-weight:bold;font-size:1.2em;}
+input[type=text], input[type=password], input.text, input.title, textarea, select {background-color:#fff;border:1px solid #bbb;}
+input[type=text]:focus, input[type=password]:focus, input.text:focus, input.title:focus, textarea:focus, select:focus {border-color:#666;}
+input[type=text], input[type=password], input.text, input.title, textarea, select {margin:0.5em 0;}
+input.text, input.title {width:300px;padding:5px;}
+input.title {font-size:1.5em;}
+textarea {width:390px;height:250px;padding:5px;}
+input[type=checkbox], input[type=radio], input.checkbox, input.radio {position:relative;top:.25em;}
+form.inline {line-height:3;}
+form.inline p {margin-bottom:0;}
+.error, .notice, .success {padding:.8em;margin-bottom:1em;border:2px solid #ddd;}
+.error {background:#FBE3E4;color:#8a1f11;border-color:#FBC2C4;}
+.notice {background:#FFF6BF;color:#514721;border-color:#FFD324;}
+.success {background:#E6EFC2;color:#264409;border-color:#C6D880;}
+.error a {color:#8a1f11;}
+.notice a {color:#514721;}
+.success a {color:#264409;}
+
+/* grid.css */
+.container {width:950px;margin:0 auto;}
+.showgrid {background:url(src/grid.png);}
+.column, div.span-1, div.span-2, div.span-3, div.span-4, div.span-5, div.span-6, div.span-7, div.span-8, div.span-9, div.span-10, div.span-11, div.span-12, div.span-13, div.span-14, div.span-15, div.span-16, div.span-17, div.span-18, div.span-19, div.span-20, div.span-21, div.span-22, div.span-23, div.span-24 {float:left;margin-right:10px;}
+.last, div.last {margin-right:0;}
+.span-1 {width:30px;}
+.span-2 {width:70px;}
+.span-3 {width:110px;}
+.span-4 {width:150px;}
+.span-5 {width:190px;}
+.span-6 {width:230px;}
+.span-7 {width:270px;}
+.span-8 {width:310px;}
+.span-9 {width:350px;}
+.span-10 {width:390px;}
+.span-11 {width:430px;}
+.span-12 {width:470px;}
+.span-13 {width:510px;}
+.span-14 {width:550px;}
+.span-15 {width:590px;}
+.span-16 {width:630px;}
+.span-17 {width:670px;}
+.span-18 {width:710px;}
+.span-19 {width:750px;}
+.span-20 {width:790px;}
+.span-21 {width:830px;}
+.span-22 {width:870px;}
+.span-23 {width:910px;}
+.span-24, div.span-24 {width:950px;margin:0;}
+input.span-1, textarea.span-1, input.span-2, textarea.span-2, input.span-3, textarea.span-3, input.span-4, textarea.span-4, input.span-5, textarea.span-5, input.span-6, textarea.span-6, input.span-7, textarea.span-7, input.span-8, textarea.span-8, input.span-9, textarea.span-9, input.span-10, textarea.span-10, input.span-11, textarea.span-11, input.span-12, textarea.span-12, input.span-13, textarea.span-13, input.span-14, textarea.span-14, input.span-15, textarea.span-15, input.span-16, textarea.span-16, input.span-17, textarea.span-17, input.span-18, textarea.span-18, input.span-19, textarea.span-19, input.span-20, textarea.span-20, input.span-21, textarea.span-21, input.span-22, textarea.span-22, input.span-23, textarea.span-23, input.span-24, textarea.span-24 {border-left-width:1px!important;border-right-width:1px!important;padding-left:5px!important;padding-right:5px!important;}
+input.span-1, textarea.span-1 {width:18px!important;}
+input.span-2, textarea.span-2 {width:58px!important;}
+input.span-3, textarea.span-3 {width:98px!important;}
+input.span-4, textarea.span-4 {width:138px!important;}
+input.span-5, textarea.span-5 {width:178px!important;}
+input.span-6, textarea.span-6 {width:218px!important;}
+input.span-7, textarea.span-7 {width:258px!important;}
+input.span-8, textarea.span-8 {width:298px!important;}
+input.span-9, textarea.span-9 {width:338px!important;}
+input.span-10, textarea.span-10 {width:378px!important;}
+input.span-11, textarea.span-11 {width:418px!important;}
+input.span-12, textarea.span-12 {width:458px!important;}
+input.span-13, textarea.span-13 {width:498px!important;}
+input.span-14, textarea.span-14 {width:538px!important;}
+input.span-15, textarea.span-15 {width:578px!important;}
+input.span-16, textarea.span-16 {width:618px!important;}
+input.span-17, textarea.span-17 {width:658px!important;}
+input.span-18, textarea.span-18 {width:698px!important;}
+input.span-19, textarea.span-19 {width:738px!important;}
+input.span-20, textarea.span-20 {width:778px!important;}
+input.span-21, textarea.span-21 {width:818px!important;}
+input.span-22, textarea.span-22 {width:858px!important;}
+input.span-23, textarea.span-23 {width:898px!important;}
+input.span-24, textarea.span-24 {width:938px!important;}
+.append-1 {padding-right:40px;}
+.append-2 {padding-right:80px;}
+.append-3 {padding-right:120px;}
+.append-4 {padding-right:160px;}
+.append-5 {padding-right:200px;}
+.append-6 {padding-right:240px;}
+.append-7 {padding-right:280px;}
+.append-8 {padding-right:320px;}
+.append-9 {padding-right:360px;}
+.append-10 {padding-right:400px;}
+.append-11 {padding-right:440px;}
+.append-12 {padding-right:480px;}
+.append-13 {padding-right:520px;}
+.append-14 {padding-right:560px;}
+.append-15 {padding-right:600px;}
+.append-16 {padding-right:640px;}
+.append-17 {padding-right:680px;}
+.append-18 {padding-right:720px;}
+.append-19 {padding-right:760px;}
+.append-20 {padding-right:800px;}
+.append-21 {padding-right:840px;}
+.append-22 {padding-right:880px;}
+.append-23 {padding-right:920px;}
+.prepend-1 {padding-left:40px;}
+.prepend-2 {padding-left:80px;}
+.prepend-3 {padding-left:120px;}
+.prepend-4 {padding-left:160px;}
+.prepend-5 {padding-left:200px;}
+.prepend-6 {padding-left:240px;}
+.prepend-7 {padding-left:280px;}
+.prepend-8 {padding-left:320px;}
+.prepend-9 {padding-left:360px;}
+.prepend-10 {padding-left:400px;}
+.prepend-11 {padding-left:440px;}
+.prepend-12 {padding-left:480px;}
+.prepend-13 {padding-left:520px;}
+.prepend-14 {padding-left:560px;}
+.prepend-15 {padding-left:600px;}
+.prepend-16 {padding-left:640px;}
+.prepend-17 {padding-left:680px;}
+.prepend-18 {padding-left:720px;}
+.prepend-19 {padding-left:760px;}
+.prepend-20 {padding-left:800px;}
+.prepend-21 {padding-left:840px;}
+.prepend-22 {padding-left:880px;}
+.prepend-23 {padding-left:920px;}
+div.border {padding-right:4px;margin-right:5px;border-right:1px solid #eee;}
+div.colborder {padding-right:24px;margin-right:25px;border-right:1px solid #eee;}
+.pull-1 {margin-left:-40px;}
+.pull-2 {margin-left:-80px;}
+.pull-3 {margin-left:-120px;}
+.pull-4 {margin-left:-160px;}
+.pull-5 {margin-left:-200px;}
+.pull-6 {margin-left:-240px;}
+.pull-7 {margin-left:-280px;}
+.pull-8 {margin-left:-320px;}
+.pull-9 {margin-left:-360px;}
+.pull-10 {margin-left:-400px;}
+.pull-11 {margin-left:-440px;}
+.pull-12 {margin-left:-480px;}
+.pull-13 {margin-left:-520px;}
+.pull-14 {margin-left:-560px;}
+.pull-15 {margin-left:-600px;}
+.pull-16 {margin-left:-640px;}
+.pull-17 {margin-left:-680px;}
+.pull-18 {margin-left:-720px;}
+.pull-19 {margin-left:-760px;}
+.pull-20 {margin-left:-800px;}
+.pull-21 {margin-left:-840px;}
+.pull-22 {margin-left:-880px;}
+.pull-23 {margin-left:-920px;}
+.pull-24 {margin-left:-960px;}
+.pull-1, .pull-2, .pull-3, .pull-4, .pull-5, .pull-6, .pull-7, .pull-8, .pull-9, .pull-10, .pull-11, .pull-12, .pull-13, .pull-14, .pull-15, .pull-16, .pull-17, .pull-18, .pull-19, .pull-20, .pull-21, .pull-22, .pull-23, .pull-24 {float:left;position:relative;}
+.push-1 {margin:0 -40px 1.5em 40px;}
+.push-2 {margin:0 -80px 1.5em 80px;}
+.push-3 {margin:0 -120px 1.5em 120px;}
+.push-4 {margin:0 -160px 1.5em 160px;}
+.push-5 {margin:0 -200px 1.5em 200px;}
+.push-6 {margin:0 -240px 1.5em 240px;}
+.push-7 {margin:0 -280px 1.5em 280px;}
+.push-8 {margin:0 -320px 1.5em 320px;}
+.push-9 {margin:0 -360px 1.5em 360px;}
+.push-10 {margin:0 -400px 1.5em 400px;}
+.push-11 {margin:0 -440px 1.5em 440px;}
+.push-12 {margin:0 -480px 1.5em 480px;}
+.push-13 {margin:0 -520px 1.5em 520px;}
+.push-14 {margin:0 -560px 1.5em 560px;}
+.push-15 {margin:0 -600px 1.5em 600px;}
+.push-16 {margin:0 -640px 1.5em 640px;}
+.push-17 {margin:0 -680px 1.5em 680px;}
+.push-18 {margin:0 -720px 1.5em 720px;}
+.push-19 {margin:0 -760px 1.5em 760px;}
+.push-20 {margin:0 -800px 1.5em 800px;}
+.push-21 {margin:0 -840px 1.5em 840px;}
+.push-22 {margin:0 -880px 1.5em 880px;}
+.push-23 {margin:0 -920px 1.5em 920px;}
+.push-24 {margin:0 -960px 1.5em 960px;}
+.push-1, .push-2, .push-3, .push-4, .push-5, .push-6, .push-7, .push-8, .push-9, .push-10, .push-11, .push-12, .push-13, .push-14, .push-15, .push-16, .push-17, .push-18, .push-19, .push-20, .push-21, .push-22, .push-23, .push-24 {float:right;position:relative;}
+.prepend-top {margin-top:1.5em;}
+.append-bottom {margin-bottom:1.5em;}
+.box {padding:1.5em;margin-bottom:1.5em;background:#E5ECF9;}
+hr {background:#ddd;color:#ddd;clear:both;float:none;width:100%;height:.1em;margin:0 0 1.45em;border:none;}
+hr.space {background:#fff;color:#fff;}
+.clearfix:after, .container:after {content:"\0020";display:block;height:0;clear:both;visibility:hidden;overflow:hidden;}
+.clearfix, .container {display:block;}
+.clear {clear:both;}
\ No newline at end of file
--- a/media/css/theme.css	Sun May 02 18:21:38 2010 +0000
+++ b/media/css/theme.css	Tue May 11 23:18:32 2010 +0000
@@ -2,24 +2,29 @@
    font-family: arial, helvetica, sans-serif;
    color: #EF7D21;
    background-color: #213442;
+   font-size: 1.0em;
 }
 
 .centered { text-align: center; }
 
-A:link {
+a:link {
    color:  #6B969C;
    text-decoration: none;
 }
 
-A:visited {
+a:visited {
    color:  #6B969C;
    text-decoration: none;
 }
 
-A:hover { 
+a:hover { 
    text-decoration: underline;
 }
 
+h1, h3 {
+   color: #EF7D21;
+}
+
 h1 {
    font: italic 32px georgia, 'times new roman', sans-serif;
    margin: 0px;
@@ -59,13 +64,6 @@
    margin-left: 5px;
 }
 
-.content {
-   margin: 20px 1em 1em 150px;
-   max-width: 840px;
-   z-index: 3;
-   padding: 5px;
-}
-
 .photobkgnd {
    margin: 3em;
    z-index: 3;
@@ -180,14 +178,6 @@
    text-align: right;
 }
 
-#navleft {
-   position: absolute;
-   top: 343px;
-   left: 10px;
-   width: 130px;
-   height: auto;
-}
-
 #navleft ul {
    margin: 0 0 0 0;
    padding: 0 0 0 0;
@@ -204,11 +194,8 @@
 
 #navleft a {
    display: block;
-   width: 118px;
    padding: 2px 2px 2px 10px;
    border: 1px solid #000000;
-   /* background: #EF7D21; */
-   /* color: #213442; */
    background:  #6B969C;
    color: #EF7D21;
    text-decoration: none;
@@ -220,12 +207,7 @@
 
 #navleft a:hover {
    border: 1px solid #000000;
-   background: #213442;
-   background: #EF7D21;
-   color: #EF7D21;
    background: #213442 url(../images/brick.gif);
-   color: #ffffff;
-   color: #6B969C;
    color: #213442;
 }
 
@@ -273,12 +255,18 @@
    text-align: center;
 }
 
+table {width:auto;}
+
+table.flyers { width: 100% }
+
 table.image-table {
-   float: left;
+   display: inline;
    margin: 0 5px 20px 0;
 }
 
 table.image-table caption {
    font-size: x-small;
    caption-side: top;
+   text-align: center;
+   background-color: #213442;
 }
--- a/mysite/templates/band/base.html	Sun May 02 18:21:38 2010 +0000
+++ b/mysite/templates/band/base.html	Tue May 11 23:18:32 2010 +0000
@@ -10,18 +10,24 @@
 <meta name="copyright" content="&copy; 2007-2010 Brian Neal" />
 <meta name="keywords" lang="en-us" content="instrumental surf, surf, guitar, musician, instro, surf music, Dick Dale, Atlantics, Surf Coasters, Fender, Strat, Stratocaster, Destination Earth, Destination: Earth!,Space Cossacks, Troubadours, reverb" />
 <meta name="description" lang="en-us" content="Home page for the instrumental surf band The Madeira. The Madeira combine high energy performances reminiscent of The Atlantics and Dick Dale with exotic melodies and an unusually high level of musicianship. This page contains show dates, photos, videos, and news about the band." />
+<link rel="stylesheet" href="{{ MEDIA_URL }}css/blueprint/screen.css" type="text/css" media="screen, projection" />
+<link rel="stylesheet" href="{{ MEDIA_URL }}css/blueprint/print.css" type="text/css" media="print" /> 
+<!--[if lt IE 8]>
+<link rel="stylesheet" href="{{ MEDIA_URL }}css/blueprint/ie.css" type="text/css" media="screen, projection" />
+<![endif]-->
+<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/theme.css" />
 {% block custom_css %}{% endblock %}
-<link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/theme.css" />
 {% block custom_js %}{% endblock %}
 <link rel="shortcut icon" type="image/vnd.microsoft.com" href="{{ MEDIA_URL }}images/favicon.ico" />
 </head>
 <body>
+<div class="container">
 
-<div class="header">
-   <img src="{{ MEDIA_URL }}images/madeira-p10-logo.jpg" border="0" alt="Madeira Logo" />
+<div id="header" class="span-24 last">
+   <img src="{{ MEDIA_URL }}images/header-logo.jpg" border="0" alt="Madeira Logo" />
 </div>
 
-<div id="navleft">
+<div id="navleft" class="span-4 append-1">
    <ul>
       <li><a href="{% url mysite.band.views.index %}">Home</a></li>
       <li><a href="{% url mysite.band.views.news %}">News</a></li>
@@ -40,15 +46,17 @@
    </ul>
 </div>
 
-<div class="content">
+<div id="xxx-content" class="span-19 last">
    {% block content %}
    {% endblock %}
-   <div id="footer">
-   Website &copy; 2008 - 2010 by The Madeira <br />
-   Visit <a href="http://myspace.com/themadeira">The Madeira on Myspace</a><br />
-and <a href="http://facebook.com/themadeira">The Madeira on Facebook</a><br />
-   </div>
 </div>
 
+<div id="footer" class="span-24 last">
+Website &copy; 2008 - 2010 by The Madeira <br />
+Visit <a href="http://myspace.com/themadeira">The Madeira on Myspace</a><br />
+and <a href="http://facebook.com/themadeira">The Madeira on Facebook</a><br />
+</div>
+
+</div>
 </body>
 </html>
--- a/mysite/templates/band/bio.html	Sun May 02 18:21:38 2010 +0000
+++ b/mysite/templates/band/bio.html	Tue May 11 23:18:32 2010 +0000
@@ -5,9 +5,11 @@
 {% if members %}
    {% for member in members %}
       <h2>{{ member.name }} - {{ member.instrument }}</h2>
+      <p>
       {% if member.photo %}
-         <img class="floatLeftBox" src="{{ member.photo.url }}" border="0" alt="{{ member.name }}" title="{{ member.name }}" />
+         <img class="left" src="{{ member.photo.url }}" border="0" alt="{{ member.name }}" title="{{ member.name }}" />
          {{ member.bio|linebreaks }}
+      </p>
          {% if member.gear_set.all %}
             <p>Gear:</p>
             <ul>
--- a/mysite/templates/band/buy.html	Sun May 02 18:21:38 2010 +0000
+++ b/mysite/templates/band/buy.html	Tue May 11 23:18:32 2010 +0000
@@ -4,9 +4,9 @@
 <h1>Madeira Merchandise</h1>
 {% for album in albums %}
    <h2>{{ album.title }} </h2>
-   <div style="float: right;">
-   <img src="{{ album.photo.image.url }}" alt="{{ album.title }}" title="{{ album.title }}" />
-   </div>
+   <p>
+   <img class="right" src="{{ album.photo.image.url }}" alt="{{ album.title }}" title="{{ album.title }}" />
+   </p>
    {% if album.label_release_set %}
       <ul>
       {% for release in album.label_release_set.all %}
@@ -38,9 +38,9 @@
 {% endif %}
 {% for item in merchandise %}
    <h2>{{ item.name }}</h2>
-   <div style="float: right;">
-      <img src="{{ item.photo.image.url }}" alt="{{ item.name }}" title="{{ item.name }}" />
-   </div>
+   <p>
+      <img class="right" src="{{ item.photo.image.url }}" alt="{{ item.name }}" title="{{ item.name }}" />
+   </p>
    {{ item.desc|safe|linebreaks }}
    {% if item.in_stock %}
       <p>Price: ${{ item.price }}</p>
--- a/mysite/templates/band/gigs.html	Sun May 02 18:21:38 2010 +0000
+++ b/mysite/templates/band/gigs.html	Tue May 11 23:18:32 2010 +0000
@@ -16,7 +16,8 @@
       <p style="clear:both">
       {% if show.flyer %}
          <a href="{{ show.flyer.image.url }}" class="thickbox" rel="madeira-gallery">
-            <img style="float:left; margin-right:5px; margin-bottom:1em" src="{{ show.flyer.get_thumbnail_url }}" 
+            <!-- <img style="float:left; margin-right:5px; margin-bottom:1em" src="{{ show.flyer.get_thumbnail_url }}" -->
+            <img class="left" src="{{ show.flyer.get_thumbnail_url }}" 
                alt="{{ show.flyer.caption }}" title="{{ show.flyer.caption }}" /></a>
       {% endif %}
       <strong>{{ show.date|date:"F d, Y" }}</strong>
@@ -82,8 +83,7 @@
 {% if flyerGigs %}
 <div class="thumb-box">
    <h2>Flyers</h2>
-   <table align="center" border="0">
-   <tr><td>
+   <center>
    {% for gig in flyerGigs %}
       <table class="image-table">
          <caption>{{ gig.venue.name}}, {{ gig.date|date:"F 'y" }}</caption>
@@ -93,8 +93,7 @@
          </td></tr>
       </table>
    {% endfor %}
-   </td></tr>
-   </table>
+   </center>
    <div clear="all"></div>
    <center><p>To see all our flyers in full size, check out our <a href="{% url band.views.flyers %}">show flyer gallery</a>.</p></center>
 </div>
--- a/mysite/templates/band/index.html	Sun May 02 18:21:38 2010 +0000
+++ b/mysite/templates/band/index.html	Tue May 11 23:18:32 2010 +0000
@@ -46,6 +46,7 @@
 {% endif %}
 
 <div class="newsflash">
+   <center>
    <table border="0" cellspacing="2" cellpadding="2" width="100%">
       <tr><td colspan="2"><center><h1>The Madeira Releases:</h1></center></td></tr>
 
@@ -62,6 +63,7 @@
       <tr><td><center><a href="http://www.dblcrown.com">Sandstorm</a></center></td>
          <td><center><a href="http://www.dblcrown.com">Ruins</a></center></td></tr>
    </table>
+   </center>
 </div>
 
 {% endblock %}