diff options
| -rw-r--r-- | apps/blog/models.py | 7 | ||||
| -rw-r--r-- | media/css/base.css | 2 | ||||
| -rw-r--r-- | media/css/dark.css | 2 | ||||
| -rw-r--r-- | media/sass/_reset.sass | 73 | ||||
| -rw-r--r-- | media/sass/base.sass | 94 | ||||
| -rw-r--r-- | media/sass/dark.sass | 43 | ||||
| -rw-r--r-- | templates/base.html | 6 | ||||
| -rw-r--r-- | templates/details/entry.html | 8 | ||||
| -rw-r--r-- | templates/details/national-parks.html | 8 |
9 files changed, 143 insertions, 100 deletions
diff --git a/apps/blog/models.py b/apps/blog/models.py index 7b01eb7..85f105f 100644 --- a/apps/blog/models.py +++ b/apps/blog/models.py @@ -19,6 +19,10 @@ def get_upload_path(self, filename): def get_tn_path(self, filename): return "images/post-thumbnail/%s/%s" %(datetime.datetime.today().strftime("%Y"), filename) +def image_url_replace(str): + str = str.replace('[[base_url]]', settings.IMAGES_URL) + print str + return str def markdown_processor(md): processed = markdown.markdown(md, ['footnotes'],safe_mode = False).split('<break>') @@ -119,7 +123,8 @@ class Entry(models.Model): return '%spost-images/%s/%s' %(settings.IMAGES_URL, image_dir, img) def save(self): - html,lede = markdown_processor(self.body_markdown) + md = image_url_replace(self.body_markdown) + html,lede = markdown_processor(md) self.body_html = html self.lede = lede self.dek == markdown.markdown(self.dek, safe_mode = False) diff --git a/media/css/base.css b/media/css/base.css index fe09984..fc8a505 100644 --- a/media/css/base.css +++ b/media/css/base.css @@ -1 +1 @@ -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,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,article,aside,canvas,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary,time,mark,audio,video{margin:0;padding:0;border:0;outline:0;font-size:100%;font:inherit;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}body{line-height:1}ol,ul{list-style:none}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:"";content:none}ins{text-decoration:none}del{text-decoration:line-through}table{border-collapse:collapse;border-spacing:0}html{height:100%}body{font:normal 100% Hoefler Text, Georgia, Times New Roman, Times, serif;color:#201a11;margin:0 1.125em;min-height:100%;position:relative;padding:0;max-width:20.938em;background:#fff}p{font-size:1.063em;line-height:1.5em;margin:1em 0 0}footer p{font-size:0.625em;text-align:center}a{text-decoration:none;color:#201a11}a:hover{color:#b53a04}ul li{display:inline;margin:0 0.125em}div[role="main"] ul li{display:block;margin:0.5em 0}.dateline,nav li,.breadcrumbs li,.geo,.legend h3{text-transform:uppercase;font-size:0.75em;letter-spacing:0.063em}.geo{text-align:center}img{border:10px #201a11 solid}#featured-image img{width:95%}h1{font:normal 1.875em Helvetica, Verdana, sans-serif;letter-spacing:0.5px;text-align:center}article h1{font:normal 1.5em Helvetica, Verdana, sans-serif;letter-spacing:0.5px;text-align:center;text-transform:none;margin:1.875em 0 0.875em 0}#archive h1{font-weight:700;font-size:0.75em;text-transform:uppercase;text-align:left}.footnote{font-size:0.875em}#post-metadata{margin-top:0;border-top:1px #201a11 dotted}#post-metadata p{font-size:0.875em;text-align:left}#pagination{border-top:1px #201a11 dotted;border-bottom:1px #201a11 dotted;text-align:center;padding:0.25em 0}.col{font-size:0.875em}header[role="banner"]{margin:0 auto;text-align:center}header[role="banner"] #logo h1{background:url("../img/tree.png") 0 0 no-repeat;text-indent:-9999px;width:151px;height:84px;margin:0 auto}header[role="banner"] #logo h2{background:url("../img/text.png") 0 0 no-repeat;text-indent:-9999px;width:184px;height:54px;margin:0 auto}nav[role="navigation"]{margin:1em auto 0.5em auto;text-align:center;border-top:1px #201a11 dotted;border-bottom:1px #201a11 dotted;width:100%;padding:0.25em 0;font-size:0.875em}nav:after,footer:before,.archive article:after{content:".";display:block;height:0;clear:both;visibility:hidden}.dateline{text-align:center}.dateline time{display:block}.postpic,.post-image{float:left;margin:0 0.625em 0.625em 0}.postpic,.postpicright{width:auto}article img{width:95%}article object,article embed{width:100%}#breadcrumbs{margin:0 0 2em 0.75em;font-size:0.875em}article[role="main"] li{display:block;margin:0.5em 0}.hide{display:none}#writing-archive article{border-bottom:1px #201a11 dotted;margin-bottom:1.5em;padding-bottom:1.5em}.figure{position:relative;margin:0}.figure .legend{display:block;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;position:absolute;bottom:0;left:0;font-size:13px;padding:8px 0 8px 8px;width:auto;background:#201a11;color:#999}#photo-galleries li{margin:8px;position:relative;display:block;width:100%;margin-bottom:30px}#photo-galleries .figure{width:100%;margin:0}#photo-galleries .figure img{width:87%}#photo-galleries .legend{padding:10px;color:#888;width:85%;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;line-height:18px;text-align:left;margin-bottom:5px}#photo-galleries h3{color:#fff;padding:0;margin:3px 0;font-size:0.875em}#photo-galleries p{margin:0}#map-canvas{border:10px #201a11 solid;width:95%;height:300px}.map-legend h4{font-size:1em;font-weight:bold;margin:1em 0 0.25em}.map-legend li:after{content:","}#about img{width:auto;float:left;margin:0 8px 8px 0}#about h2{font:normal 1.5em Helvetica, Verdana, sans-serif;margin:1em 0}#about article[role="main"] a{color:#b53a04}#about section:after{content:".";display:block;height:0;clear:both;visibility:hidden}.button{display:block;font-family:Helvetica, Verdana, sans-serif !important;margin:10px 10px 0 0;width:auto;font-size:10px}.button a{padding:9px 14px 7px 14px;font-weight:bold;line-height:25px;text-transform:uppercase;background:#d7d7d7;color:#666;-moz-border-radius:25px;-webkit-border-radius:25px;border-radius:25px}.button a:hover{background:#b53a04;color:#fff}footer{margin-top:2em}footer[role="contentinfo"] nav{text-align:center;padding:0.25em;border-top:1px #201a11 dotted;border-bottom:1px #201a11 dotted}@media only screen and (min-width: 800px){body{max-width:61.75em;margin:0 auto}header[role="banner"]{text-align:left;clear:both;border-bottom:#201a11 2px solid;height:9.375em}header[role="banner"] #logo h1,header[role="banner"] #logo h2{float:left;padding-top:2.2em;background-position:left bottom;margin:0 !important}header[role="banner"] #logo h2{padding-top:3.5em;background:url("../img/text-wide.png") left bottom no-repeat !important;margin-left:1.7em !important}nav[role="navigation"]{width:25em;border:none;padding-top:6.3em;padding-left:13em}nav[role="navigation"] a{letter-spacing:1px}nav[role="navigation"] li{font-size:12px}#pagination{font-family:Helvetica, Verdana, sans-serif !important;font-size:1.125em}#archive{clear:both}#featured img{float:right;margin:0}article img{width:auto !important}.img{float:right}.img img{margin:0}.archive{padding-top:2em}.archive article{margin-bottom:2em;padding-bottom:2em;border:none !important}.archive h1,.archive p{width:41%;float:left;text-align:left;margin:0;font-size:1em}.archive h1{font-size:1.5em;line-height:1.3em;margin-top:0.15em;letter-spacing:0.5px}.archive .dateline{clear:left;margin:0.75em 0;font-size:0.688em}.archive .hyphenate{text-align:justify}.archive time{display:inline;float:right}#photo-galleries:after,#projects-page .top:after{content:".";display:block;height:0;clear:both;visibility:hidden}#page-nav{border:none;text-align:left;margin-top:2em}#breadcrumbs{margin-left:0}#photo-galleries li{float:left;width:291px;margin:0 1em 1em 1em}#photo-galleries li .figure img{width:100%}#photo-galleries .legend{width:97%;padding:1em;font-size:0.75em !important;line-height:95%}#map-canvas{width:47.5em;height:31.25em;float:right}.map-legend h4{margin-bottom:0.25em;letter-spacing:1px;font-size:0.875em}.map-legend li{display:block;font-size:0.875em;margin:3px 0}.map-legend li:after{content:""}#projects-page .col{float:left;font-size:0.875em;margin:0 40px 0 0;width:360px}#projects-page .two{margin:0 0 0 3.5em;width:32em}#projects-page .top{padding-bottom:2em;margin-bottom:2em;border-bottom:1px solid #e3e3e3}#projects-page article p{margin:1em 0 0 0}article[role="main"] header,article[role="main"] #post-body,article[role="main"] footer,article[role="main"] #comments{width:35.625em;margin:3.5em 0 0 12em}article[role="main"] h1,article[role="main"] aside{text-align:left;margin:0 0 0.4em 0}article[role="main"] p:nth-of-type(1){font-size:1.25em;line-height:28px}article[role="main"] #post-metadata{border-bottom:1px #201a11 dotted;margin-bottom:2em}article[role="main"] #post-metadata p{line-height:1.5em !important}article[role="main"] #post-metadata a{color:#b53a04}article[role="main"] #page-navigation{text-transform:uppercase;font:normal 1.125em Helvetica, Verdana, sans-serif}article[role="main"] #page-navigation a{color:#b53a04}article[role="main"] #page-navigation li#next{float:right;padding-right:9em}article[role="main"] #page-navigation li#prev{float:left;padding-left:6em}footer[role="contentinfo"]{font-family:Helvetica, Verdana, sans-serif;background:#201a11;height:2.25em;color:#888;margin:80px auto 0;font-size:1em;padding:0}footer[role="contentinfo"] li{float:left;text-transform:uppercase;line-height:3em;margin-left:8px}footer[role="contentinfo"] a{color:#888 !important}footer[role="contentinfo"] a:hover{color:#b53a04 !important}footer[role="contentinfo"] nav{border:none;height:auto;width:15em;margin:0;padding:0;float:right}footer[role="contentinfo"] p{float:left;padding-left:8px;line-height:4em;margin:0}.drop{font-size:4.8em;display:block;float:left;padding:38px 10px 5px 0;overflow:visible}.drop-small{font-size:2.9em;display:block;float:left;padding:19px 8px 5px 0;overflow:visible}.postpic,.postpicright{display:block;margin:0.3em 0.6em}.postpic{float:left;margin-left:0;margin-top:0.3em}.postpicright{float:right;margin-right:0}.postpicleft{float:left;margin:5px}.picfull{margin-top:20px}} +ol,ul,li,dl{list-style:none;margin:0;padding:0;border:0;outline:0;background:transparent}blockquote,q{quotes:none}:focus{outline:0}header,section,footer,aside,article,nav{display:block;text-align:left}html{height:100%}body{font:normal 100% Hoefler Text, Georgia, Times New Roman, Times, serif;color:#201a11;margin:0 1.125em;min-height:100%;position:relative;padding:0;max-width:20.938em;background:#fff}p{font-size:1.063em;line-height:1.5em;margin:1em 0 0}footer p{font-size:0.625em;text-align:center}a{text-decoration:none;color:#201a11}a:hover{color:#b53a04}strong{font-weight:bold}sup{font:normal 0.625em Helvetica, Verdana, sans-serif}ul li{display:inline;margin:0 0.125em}div[role="main"] ul li{display:block;margin:0.5em 0}.dateline,nav li,.breadcrumbs li,.geo,.legend h3{text-transform:uppercase;font-size:0.75em;letter-spacing:0.063em}.geo{text-align:center}img{border:10px #201a11 solid}#featured-image img{width:95%}h1{font:normal 1.875em Helvetica, Verdana, sans-serif;letter-spacing:0.5px;text-align:center}article h1{font:normal 1.5em Helvetica, Verdana, sans-serif;letter-spacing:0.5px;text-align:center;text-transform:none;margin:1.875em 0 0.875em 0}#archive h1{font-weight:700;font-size:0.75em;text-transform:uppercase;text-align:left}.footnote{font-size:0.875em}#post-metadata{margin-top:0;border-top:1px #201a11 dotted}#post-metadata p{font-size:0.875em;text-align:left}#pagination{border-top:1px #201a11 dotted;border-bottom:1px #201a11 dotted;text-align:center;padding:0.25em 0}.col{font-size:0.875em}header[role="banner"]{margin:0 auto;text-align:center}header[role="banner"] h1{background:url("../img/tree.png") 0 0 no-repeat;text-indent:-9999px;width:151px;height:84px;margin:0 auto}header[role="banner"] h2{background:url("../img/text.png") 0 0 no-repeat;text-indent:-9999px;width:184px;height:54px;margin:0 auto}nav[role="navigation"]{margin:1em auto 0.5em auto;text-align:center;border-top:1px #201a11 dotted;border-bottom:1px #201a11 dotted;width:100%;padding:0.25em 0;font-size:0.875em}nav:after,footer:before,.archive article:after{content:".";display:block;height:0;clear:both;visibility:hidden}.dateline{text-align:center}.dateline time{display:block}.postpic,.post-image{float:left;margin:0 0.625em 0.625em 0}.postpic,.postpicright{width:auto}article img{width:95%}article object,article embed{width:100%}#breadcrumbs{margin:0 0 2em 0.75em;font-size:0.875em}article[role="main"] li{display:block;margin:0.5em 0}.hide{display:none}#writing-archive article{border-bottom:1px #201a11 dotted;margin-bottom:1.5em;padding-bottom:1.5em}.figure{position:relative;margin:0}.figure .legend{display:block;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;position:absolute;bottom:0;left:0;font-size:13px;padding:8px 0 8px 8px;width:auto;background:#201a11;color:#999}#photo-galleries li{margin:8px;position:relative;display:block;width:100%;margin-bottom:30px}#photo-galleries .figure{width:100%;margin:0}#photo-galleries .figure img{width:87%}#photo-galleries .legend{padding:10px;color:#888;width:85%;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;line-height:18px;text-align:left;margin-bottom:5px}#photo-galleries h3{color:#fff;padding:0;margin:3px 0;font-size:0.875em}#photo-galleries p{margin:0}#map-canvas{border:10px #201a11 solid;width:95%;height:300px}.map-legend h4{font-size:1em;font-weight:bold;margin:1em 0 0.25em}.map-legend li:after{content:","}#about img{width:auto;float:left;margin:0 8px 8px 0}#about h2{font:normal 1.5em Helvetica, Verdana, sans-serif;margin:1em 0}#about article[role="main"] a{color:#b53a04}#about section:after{content:".";display:block;height:0;clear:both;visibility:hidden}.button{display:block;font-family:Helvetica, Verdana, sans-serif !important;margin:10px 10px 0 0;width:auto;font-size:10px}.button a{padding:9px 14px 7px 14px;font-weight:bold;line-height:25px;text-transform:uppercase;background:#d7d7d7;color:#666;-moz-border-radius:25px;-webkit-border-radius:25px;border-radius:25px}.button a:hover{background:#b53a04;color:#fff}footer{margin-top:2em}footer[role="contentinfo"] nav{text-align:center;padding:0.25em;border-top:1px #201a11 dotted;border-bottom:1px #201a11 dotted}#parks{margin-top:36px}#parks article{position:relative;display:block;margin-top:36px;clear:both;margin-bottom:72px}#parks .figure img{border:none;min-height:5em}#parks h1{display:block;color:#888;padding:10px 10px 10px 0px;background:#201a11;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;color:#fff;margin:0;width:100%;text-align:left}#parks .legend{display:block;padding:10px 10px 10px 0px;background:#201a11;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;height:45px;font-size:10px;line-height:16px;color:#fff;width:100%}#parks h2{line-height:36px;font-size:18px;margin:0;padding:0;float:left}#parks .buttons{display:block;clear:left;padding-bottom:1em}@media only screen and (min-width: 800px){body{max-width:61.75em;margin:0 auto}header[role="banner"]{text-align:left;clear:both;border-bottom:#201a11 2px solid;height:9.375em}header[role="banner"] h1,header[role="banner"] h2{float:left;padding-top:2.2em;background-position:left bottom;margin:0 !important}header[role="banner"] h2{padding-top:3.5em;background:url("../img/text-wide.png") left bottom no-repeat !important;margin-left:1.7em !important}nav[role="navigation"]{width:25em;border:none;padding-top:7.3em;padding-left:15em}nav[role="navigation"] a{letter-spacing:1px}nav[role="navigation"] li{font-size:12px}#pagination{font-family:Helvetica, Verdana, sans-serif !important;font-size:1.125em}#archive{clear:both}#featured img{float:right;margin:0}article img{width:auto !important}.img{float:right}.img img{margin:0}.archive{padding-top:2em}.archive article{margin-bottom:2em;padding-bottom:2em;border:none !important}.archive h1,.archive p{width:41%;float:left;text-align:left;margin:0;font-size:1em}.archive h1{font-size:1.5em;line-height:1.3em;margin-top:0.15em;letter-spacing:0.5px}.archive .dateline{clear:left;margin:0.75em 0;font-size:0.688em}.archive .hyphenate{text-align:justify}.archive time{display:inline;float:right}#photo-galleries:after,#projects-page .top:after{content:".";display:block;height:0;clear:both;visibility:hidden}#page-nav{border:none;text-align:left;margin-top:2em}#breadcrumbs{margin-left:0}#breadcrumbs li{letter-spacing:1px}#photo-galleries li{float:left;width:291px;margin:0 1em 1em 1em}#photo-galleries li .figure img{width:100%}#photo-galleries .legend{width:97%;padding:1em;font-size:0.75em !important;line-height:95%}#map-canvas{width:47.5em;height:31.25em;float:right}.map-legend h4{margin-bottom:0.25em;letter-spacing:1px;font-size:0.875em}.map-legend li{display:block;font-size:0.875em;margin:3px 0}.map-legend li:after{content:""}#projects-page .col{float:left;font-size:0.875em;margin:0 40px 0 0;width:360px}#projects-page .two{margin:0 0 0 3.5em;width:32em}#projects-page .top{padding-bottom:2em;margin-bottom:2em;border-bottom:1px solid #e3e3e3}#projects-page article p{margin:1em 0 0 0}article[role="main"] header,article[role="main"] #post-body,article[role="main"] footer,article[role="main"] #comments{width:35.625em;margin:3.5em 0 0 12em}article[role="main"] #post-body{margin-top:0}article[role="main"] h1,article[role="main"] aside{text-align:left;margin:0 0 0.4em 0}article[role="main"] h1{font-size:1.875em}article[role="main"] p:nth-of-type(1){font-size:1.25em;line-height:28px}article[role="main"] #post-metadata{border-bottom:1px #201a11 dotted;margin-bottom:2em}article[role="main"] #post-metadata p{line-height:1.5em !important}article[role="main"] #post-metadata a{color:#b53a04}article[role="main"] #page-navigation{text-transform:uppercase;font:normal 1.125em Helvetica, Verdana, sans-serif}article[role="main"] #page-navigation a{color:#b53a04}article[role="main"] #page-navigation li#next{float:right;padding-right:9em}article[role="main"] #page-navigation li#prev{float:left;padding-left:6em}#about article[role="main"] .content{width:35.625em;margin:0 0 0 12.4em}#about article[role="main"] h2{margin-left:8.2em}#about article[role="main"] p:nth-of-type(1){font-size:1.063em;line-height:1.5em}footer[role="contentinfo"]{font-family:Helvetica, Verdana, sans-serif;background:#201a11;height:3em;color:#888;margin:80px auto 0;font-size:1em;padding:0}footer[role="contentinfo"] li{float:left;text-transform:uppercase;line-height:3em;margin-top:0.75em;margin-left:8px}footer[role="contentinfo"] a{color:#888 !important}footer[role="contentinfo"] a:hover{color:#b53a04 !important}footer[role="contentinfo"] nav{border:none;margin:0 1em 0 0;padding:0;float:right}footer[role="contentinfo"] p{float:left;padding-left:8px;line-height:4em;margin-top:0.75em}.drop{font-size:4.8em;display:block;float:left;padding:38px 10px 5px 0;overflow:visible}.drop-small{font-size:2.9em;display:block;float:left;padding:19px 8px 5px 0;overflow:visible}.postpic,.postpicright{display:block;margin:0.3em 0.6em}.postpic{float:left;margin-left:0;margin-top:0.3em}.postpicright{float:right;margin-right:0}.postpicleft{float:left;margin:5px}.picfull{margin-top:20px}} diff --git a/media/css/dark.css b/media/css/dark.css index eea3606..9dabe82 100644 --- a/media/css/dark.css +++ b/media/css/dark.css @@ -1 +1 @@ -*:focus{outline:#b53a04 dotted thin}body{background:#201a11}a{text-decoration:none;color:#b53a04}a:visited{color:#fff;text-decoration:none}a:hover{color:#fff;text-decoration:none}header{border-bottom:#ccc 1px solid}header a{color:#fff !important}header a:hover{color:#b53a04 !important}header #logo{background:url("../img/logo-dark.gif") no-repeat left bottom}#breadcrumbs{color:#fff}#breadcrumbs a{color:#fff}#breadcrumbs a:hover{color:#b53a04}footer{color:#ccc}footer a{color:#ccc !important}footer a:hover{color:#b53a04 !important}img.postpic,img.postpicright{border:none}img.picfull{border:none}#post-body{color:#ccc}aside,header{color:#ccc}aside section a{color:#ccc !important}aside section a:hover{color:#b53a04 !important}#post-metadata{border-top:#555 1px dotted;border-bottom:#555 1px dotted}#post-metadata p{color:#ccc}.addendum dt{margin-left:-30px !important}h4 a.disqus-link-count{color:#ccc !important}#writing-detail img{border:none}#writing-detail .legend{padding:8px} +ol,ul,li,dl{list-style:none;margin:0;padding:0;border:0;outline:0;background:transparent}blockquote,q{quotes:none}:focus{outline:0}header,section,footer,aside,article,nav{display:block;text-align:left}html{height:100%}body{font:normal 100% Hoefler Text, Georgia, Times New Roman, Times, serif;color:#201a11;margin:0 1.125em;min-height:100%;position:relative;padding:0;max-width:20.938em;background:#fff}p{font-size:1.063em;line-height:1.5em;margin:1em 0 0}footer p{font-size:0.625em;text-align:center}a{text-decoration:none;color:#201a11}a:hover{color:#b53a04}strong{font-weight:bold}sup{font:normal 0.625em Helvetica, Verdana, sans-serif}ul li{display:inline;margin:0 0.125em}div[role="main"] ul li{display:block;margin:0.5em 0}.dateline,nav li,.breadcrumbs li,.geo,.legend h3{text-transform:uppercase;font-size:0.75em;letter-spacing:0.063em}.geo{text-align:center}img{border:10px #201a11 solid}#featured-image img{width:95%}h1{font:normal 1.875em Helvetica, Verdana, sans-serif;letter-spacing:0.5px;text-align:center}article h1{font:normal 1.5em Helvetica, Verdana, sans-serif;letter-spacing:0.5px;text-align:center;text-transform:none;margin:1.875em 0 0.875em 0}#archive h1{font-weight:700;font-size:0.75em;text-transform:uppercase;text-align:left}.footnote{font-size:0.875em}#post-metadata{margin-top:0;border-top:1px #201a11 dotted}#post-metadata p{font-size:0.875em;text-align:left}#pagination{border-top:1px #201a11 dotted;border-bottom:1px #201a11 dotted;text-align:center;padding:0.25em 0}.col{font-size:0.875em}header[role="banner"]{margin:0 auto;text-align:center}header[role="banner"] h1{background:url("../img/tree.png") 0 0 no-repeat;text-indent:-9999px;width:151px;height:84px;margin:0 auto}header[role="banner"] h2{background:url("../img/text.png") 0 0 no-repeat;text-indent:-9999px;width:184px;height:54px;margin:0 auto}nav[role="navigation"]{margin:1em auto 0.5em auto;text-align:center;border-top:1px #201a11 dotted;border-bottom:1px #201a11 dotted;width:100%;padding:0.25em 0;font-size:0.875em}nav:after,footer:before,.archive article:after{content:".";display:block;height:0;clear:both;visibility:hidden}.dateline{text-align:center}.dateline time{display:block}.postpic,.post-image{float:left;margin:0 0.625em 0.625em 0}.postpic,.postpicright{width:auto}article img{width:95%}article object,article embed{width:100%}#breadcrumbs{margin:0 0 2em 0.75em;font-size:0.875em}article[role="main"] li{display:block;margin:0.5em 0}.hide{display:none}#writing-archive article{border-bottom:1px #201a11 dotted;margin-bottom:1.5em;padding-bottom:1.5em}.figure{position:relative;margin:0}.figure .legend{display:block;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;position:absolute;bottom:0;left:0;font-size:13px;padding:8px 0 8px 8px;width:auto;background:#201a11;color:#999}#photo-galleries li{margin:8px;position:relative;display:block;width:100%;margin-bottom:30px}#photo-galleries .figure{width:100%;margin:0}#photo-galleries .figure img{width:87%}#photo-galleries .legend{padding:10px;color:#888;width:85%;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;line-height:18px;text-align:left;margin-bottom:5px}#photo-galleries h3{color:#fff;padding:0;margin:3px 0;font-size:0.875em}#photo-galleries p{margin:0}#map-canvas{border:10px #201a11 solid;width:95%;height:300px}.map-legend h4{font-size:1em;font-weight:bold;margin:1em 0 0.25em}.map-legend li:after{content:","}#about img{width:auto;float:left;margin:0 8px 8px 0}#about h2{font:normal 1.5em Helvetica, Verdana, sans-serif;margin:1em 0}#about article[role="main"] a{color:#b53a04}#about section:after{content:".";display:block;height:0;clear:both;visibility:hidden}.button{display:block;font-family:Helvetica, Verdana, sans-serif !important;margin:10px 10px 0 0;width:auto;font-size:10px}.button a{padding:9px 14px 7px 14px;font-weight:bold;line-height:25px;text-transform:uppercase;background:#d7d7d7;color:#666;-moz-border-radius:25px;-webkit-border-radius:25px;border-radius:25px}.button a:hover{background:#b53a04;color:#fff}footer{margin-top:2em}footer[role="contentinfo"] nav{text-align:center;padding:0.25em;border-top:1px #201a11 dotted;border-bottom:1px #201a11 dotted}#parks{margin-top:36px}#parks article{position:relative;display:block;margin-top:36px;clear:both;margin-bottom:72px}#parks .figure img{border:none;min-height:5em}#parks h1{display:block;color:#888;padding:10px 10px 10px 0px;background:#201a11;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;color:#fff;margin:0;width:100%;text-align:left}#parks .legend{display:block;padding:10px 10px 10px 0px;background:#201a11;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";filter:alpha(opacity=90);-moz-opacity:0.9;-khtml-opacity:0.9;opacity:0.9;height:45px;font-size:10px;line-height:16px;color:#fff;width:100%}#parks h2{line-height:36px;font-size:18px;margin:0;padding:0;float:left}#parks .buttons{display:block;clear:left;padding-bottom:1em}@media only screen and (min-width: 800px){body{max-width:61.75em;margin:0 auto}header[role="banner"]{text-align:left;clear:both;border-bottom:#201a11 2px solid;height:9.375em}header[role="banner"] h1,header[role="banner"] h2{float:left;padding-top:2.2em;background-position:left bottom;margin:0 !important}header[role="banner"] h2{padding-top:3.5em;background:url("../img/text-wide.png") left bottom no-repeat !important;margin-left:1.7em !important}nav[role="navigation"]{width:25em;border:none;padding-top:7.3em;padding-left:15em}nav[role="navigation"] a{letter-spacing:1px}nav[role="navigation"] li{font-size:12px}#pagination{font-family:Helvetica, Verdana, sans-serif !important;font-size:1.125em}#archive{clear:both}#featured img{float:right;margin:0}article img{width:auto !important}.img{float:right}.img img{margin:0}.archive{padding-top:2em}.archive article{margin-bottom:2em;padding-bottom:2em;border:none !important}.archive h1,.archive p{width:41%;float:left;text-align:left;margin:0;font-size:1em}.archive h1{font-size:1.5em;line-height:1.3em;margin-top:0.15em;letter-spacing:0.5px}.archive .dateline{clear:left;margin:0.75em 0;font-size:0.688em}.archive .hyphenate{text-align:justify}.archive time{display:inline;float:right}#photo-galleries:after,#projects-page .top:after{content:".";display:block;height:0;clear:both;visibility:hidden}#page-nav{border:none;text-align:left;margin-top:2em}#breadcrumbs{margin-left:0}#breadcrumbs li{letter-spacing:1px}#photo-galleries li{float:left;width:291px;margin:0 1em 1em 1em}#photo-galleries li .figure img{width:100%}#photo-galleries .legend{width:97%;padding:1em;font-size:0.75em !important;line-height:95%}#map-canvas{width:47.5em;height:31.25em;float:right}.map-legend h4{margin-bottom:0.25em;letter-spacing:1px;font-size:0.875em}.map-legend li{display:block;font-size:0.875em;margin:3px 0}.map-legend li:after{content:""}#projects-page .col{float:left;font-size:0.875em;margin:0 40px 0 0;width:360px}#projects-page .two{margin:0 0 0 3.5em;width:32em}#projects-page .top{padding-bottom:2em;margin-bottom:2em;border-bottom:1px solid #e3e3e3}#projects-page article p{margin:1em 0 0 0}article[role="main"] header,article[role="main"] #post-body,article[role="main"] footer,article[role="main"] #comments{width:35.625em;margin:3.5em 0 0 12em}article[role="main"] #post-body{margin-top:0}article[role="main"] h1,article[role="main"] aside{text-align:left;margin:0 0 0.4em 0}article[role="main"] h1{font-size:1.875em}article[role="main"] p:nth-of-type(1){font-size:1.25em;line-height:28px}article[role="main"] #post-metadata{border-bottom:1px #201a11 dotted;margin-bottom:2em}article[role="main"] #post-metadata p{line-height:1.5em !important}article[role="main"] #post-metadata a{color:#b53a04}article[role="main"] #page-navigation{text-transform:uppercase;font:normal 1.125em Helvetica, Verdana, sans-serif}article[role="main"] #page-navigation a{color:#b53a04}article[role="main"] #page-navigation li#next{float:right;padding-right:9em}article[role="main"] #page-navigation li#prev{float:left;padding-left:6em}#about article[role="main"] .content{width:35.625em;margin:0 0 0 12.4em}#about article[role="main"] h2{margin-left:8.2em}#about article[role="main"] p:nth-of-type(1){font-size:1.063em;line-height:1.5em}footer[role="contentinfo"]{font-family:Helvetica, Verdana, sans-serif;background:#201a11;height:3em;color:#888;margin:80px auto 0;font-size:1em;padding:0}footer[role="contentinfo"] li{float:left;text-transform:uppercase;line-height:3em;margin-top:0.75em;margin-left:8px}footer[role="contentinfo"] a{color:#888 !important}footer[role="contentinfo"] a:hover{color:#b53a04 !important}footer[role="contentinfo"] nav{border:none;margin:0 1em 0 0;padding:0;float:right}footer[role="contentinfo"] p{float:left;padding-left:8px;line-height:4em;margin-top:0.75em}.drop{font-size:4.8em;display:block;float:left;padding:38px 10px 5px 0;overflow:visible}.drop-small{font-size:2.9em;display:block;float:left;padding:19px 8px 5px 0;overflow:visible}.postpic,.postpicright{display:block;margin:0.3em 0.6em}.postpic{float:left;margin-left:0;margin-top:0.3em}.postpicright{float:right;margin-right:0}.postpicleft{float:left;margin:5px}.picfull{margin-top:20px}}*:focus{outline:#b53a04 dotted thin}body{background:#201a11}a{text-decoration:none;color:#b53a04}a:visited{color:#fff;text-decoration:none}a:hover{color:#fff;text-decoration:none}header[role="banner"]{border-bottom:#ccc 1px solid;margin-bottom:1em}header[role="banner"] a{color:#fff !important}header[role="banner"] a:hover{color:#b53a04 !important}header[role="banner"] h1{background:url("../img/tree-dark.png") left bottom no-repeat}header[role="banner"] h2{background:url("../img/text-dark.png") left bottom no-repeat !important}.legend h2{float:left;width:40%;background:#f3f}.buttons{float:left;background:#fff}#breadcrumbs{color:#fff}#breadcrumbs a{color:#fff}#breadcrumbs a:hover{color:#b53a04}article[role="main"] .geo a{color:#fff}article[role="main"] .geo a:hover{color:#b53a04}footer{color:#ccc}footer a{color:#ccc !important}footer a:hover{color:#b53a04 !important}img.postpic,img.postpicright{border:none}img.picfull{border:none}#post-body{color:#ccc}aside,header{color:#ccc}aside section a{color:#ccc !important}aside section a:hover{color:#b53a04 !important}#post-metadata{border-top:#555 1px dotted;border-bottom:#555 1px dotted}#post-metadata p{color:#ccc}.addendum dt{margin-left:-30px !important}h4 a.disqus-link-count{color:#ccc !important}#writing-detail img{border:none}#writing-detail .legend{padding:8px} diff --git a/media/sass/_reset.sass b/media/sass/_reset.sass index a8100da..a06badd 100644 --- a/media/sass/_reset.sass +++ b/media/sass/_reset.sass @@ -1,56 +1,17 @@ -/* http://meyerweb.com/eric/tools/css/reset/ - v2.0b1 | 201101 - NOTE: WORK IN PROGRESS - USE WITH CAUTION AND TEST WITH ABANDON */ - -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, 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, -article, aside, canvas, details, figcaption, figure, -footer, header, hgroup, menu, nav, section, summary, -time, mark, audio, video - margin: 0 - padding: 0 - border: 0 - outline: 0 - font-size: 100% - font: inherit - vertical-align: baseline - -/* HTML5 display-role reset for older browsers */ -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section - display: block - -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 visible focus styles! -//\:focus -// outline: ?????? - -/* remember to highlight inserts somehow! */ -ins - text-decoration: none -del - text-decoration: line-through - -table - border-collapse: collapse - border-spacing: 0 +ol, ul, li, dl + list-style: none + margin: 0 + padding: 0 + border: 0 + outline: 0 + background: transparent + +blockquote, q + quotes: none + +\:focus + outline: 0 + +header, section, footer, aside, article, nav + display: block + text-align: left diff --git a/media/sass/base.sass b/media/sass/base.sass index 5af846c..82b5634 100644 --- a/media/sass/base.sass +++ b/media/sass/base.sass @@ -43,7 +43,11 @@ a color: $brown &:hover color: $orange - +strong + font-weight: bold + +sup + font: normal .625em Helvetica, Verdana, sans-serif ul li display: inline margin: 0 .125em @@ -99,13 +103,13 @@ article h1 header[role="banner"] margin: 0 auto text-align: center - #logo h1 + h1 background: url('../img/tree.png') 0 0 no-repeat text-indent: -9999px width: 151px height: 84px margin: 0 auto - #logo h2 + h2 background: url('../img/text.png') 0 0 no-repeat text-indent: -9999px width: 184px @@ -262,6 +266,55 @@ footer[role="contentinfo"] border-bottom: 1px $brown dotted +#parks + margin-top: 36px + article + position: relative + display: block + margin-top: 36px + clear: both + margin-bottom: 72px + .figure + img + border: none + min-height: 5em + h1 + display: block + color: #888888 + padding: 10px 10px 10px 0px + background: $brown + +transparent_class + + color: white + margin: 0 + width: 100% + text-align: left + + .legend + display: block + padding: 10px 10px 10px 0px + background: $brown + +transparent_class + height: 45px + font-size: 10px + line-height: 16px + color: white + width: 100% + h2 + line-height: 36px + font-size: 18px + margin: 0 + padding: 0 + float: left + .buttons + display: block + clear: left + padding-bottom: 1em + + + + + /* ######### layout large ################*/ @media only screen and (min-width: 800px) @@ -274,20 +327,20 @@ footer[role="contentinfo"] clear: both border-bottom: $brown 2px solid height: 9.375em - #logo h1, #logo h2 + h1, h2 float: left padding-top: 2.2em background-position: left bottom margin: 0 !important - #logo h2 + h2 padding-top: 3.5em background: url('../img/text-wide.png') left bottom no-repeat !important margin-left: 1.7em !important nav[role="navigation"] width: 25em border: none - padding-top: 6.3em - padding-left: 13em + padding-top: 7.3em + padding-left: 15em a letter-spacing: 1px li @@ -353,6 +406,8 @@ footer[role="contentinfo"] margin-top: 2em #breadcrumbs margin-left: 0 + li + letter-spacing: 1px //photo pages @@ -403,15 +458,18 @@ footer[role="contentinfo"] border-bottom: 1px solid #E3E3E3 #projects-page article p margin: 1em 0 0 0 - //Permalink pages article[role="main"] header, #post-body, footer, #comments width: 35.625em margin: 3.5em 0 0 12em + #post-body + margin-top: 0 h1, aside text-align: left margin: 0 0 .4em 0 + h1 + font-size: 1.875em p:nth-of-type(1) font-size: 1.25em line-height: 28px @@ -433,11 +491,20 @@ footer[role="contentinfo"] li#prev float: left padding-left: 6em - + //About Page + #about article[role="main"] + .content + width: 35.625em + margin: 0 0 0 12.4em + h2 + margin-left: 8.2em + p:nth-of-type(1) + font-size: 1.063em + line-height: 1.5em footer[role="contentinfo"] font-family: Helvetica, Verdana, sans-serif background: $brown - height: 2.25em + height: 3em color: #888888 margin: 80px auto 0 font-size: 1em @@ -446,6 +513,7 @@ footer[role="contentinfo"] float: left text-transform: uppercase line-height: 3em + margin-top: .75em margin-left: 8px a color: #888888 !important @@ -453,16 +521,14 @@ footer[role="contentinfo"] color: $orange !important nav border: none - height: auto - width: 15em - margin: 0 + margin: 0 1em 0 0 padding: 0 float: right p float: left padding-left: 8px line-height: 4em - margin: 0 + margin-top: .75em .drop font-size: 4.8em display: block diff --git a/media/sass/dark.sass b/media/sass/dark.sass index 29ac968..4315d18 100644 --- a/media/sass/dark.sass +++ b/media/sass/dark.sass @@ -1,17 +1,18 @@ -//basic stuff +@import base.sass -$luxagraf_brown: #201a11 -$luxagraf_orange: #b53a04 + +$brown: #201a11 +$orange: #b53a04 *:focus - outline: $luxagraf_orange dotted thin + outline: $orange dotted thin body - background: $luxagraf_brown + background: $brown a text-decoration: none - color: $luxagraf_orange + color: $orange &:visited color: white text-decoration: none @@ -19,28 +20,42 @@ a color: white text-decoration: none -header +header[role="banner"] border-bottom: #cccccc 1px solid + margin-bottom: 1em a color: white !important &:hover - color: $luxagraf_orange unquote("!important") - #logo - background: url("../img/logo-dark.gif") no-repeat left bottom + color: $orange unquote("!important") + h1 + background: url('../img/tree-dark.png') left bottom no-repeat + h2 + background: url('../img/text-dark.png') left bottom no-repeat !important +.legend h2 + float: left + width: 40% + background: #f3f +.buttons + float: left + background: #fff + #breadcrumbs color: white a color: white &:hover - color: $luxagraf_orange - + color: $orange +article[role="main"] .geo a + color: white +article[role="main"] .geo a:hover + color: $orange footer color: #cccccc a color: #cccccc !important &:hover - color: $luxagraf_orange !important + color: $orange !important img &.postpic, &.postpicright @@ -58,7 +73,7 @@ aside section a color: #cccccc !important &:hover - color: $luxagraf_orange !important + color: $orange !important #post-metadata border-top: #555555 1px dotted diff --git a/templates/base.html b/templates/base.html index ec35269..4abf87d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -15,12 +15,12 @@ type="application/rss+xml" title="RSS 2.0" href="http://feeds2.feedburner.com/luxagraf/blog"> - <link rel="stylesheet" + {%block stylesheet%}<link rel="stylesheet" href="{{MEDIA_URL}}css/base.css" - media="screen"> + media="screen">{%endblock%}{%comment%} <link rel="stylesheet" href="{{MEDIA_URL}}css/print.css" - media="print">{%block stylesheet%}{%endblock%} + media="print">{%endcomment%} <link rel="shortcut icon" href="http://media.luxagraf.net/img/favicon.ico" type="image/vnd.microsoft.icon"> diff --git a/templates/details/entry.html b/templates/details/entry.html index 7952b9f..473c910 100644 --- a/templates/details/entry.html +++ b/templates/details/entry.html @@ -3,14 +3,10 @@ {% block pagetitle %}{{object.title|title|smartypants|safe}} | Luxagraf, a travelogue | {% if object.location.state.country.name == "United States" %}{{object.location.name|smartypants|safe}}, {{object.location.state.name}}{%else%}{{object.location.name|smartypants|safe}}, {{object.location.state.country.name}}{%endif%}){% endblock %} -{%block stylesheet%}{%if object.template_name == 2%}<link rel="stylesheet" +{%block stylesheet%}{%if object.template_name == 2 or object.template_name == 3 %}<link rel="stylesheet" href="{{MEDIA_URL}}css/dark.css" type="text/css" - media="screen">{%endif%} - {%if object.template_name == 3%}<link rel="stylesheet" - href="{{MEDIA_URL}}css/dark.css" - type="text/css" - media="screen">{%endif%}{%endblock%} + media="screen">{%else%}{{block.super}}{%endif%}{%endblock%} {% block metadescription %}{{object.meta_description|striptags|safe}}{% endblock %} diff --git a/templates/details/national-parks.html b/templates/details/national-parks.html index 63a2d8e..7fa2873 100644 --- a/templates/details/national-parks.html +++ b/templates/details/national-parks.html @@ -3,11 +3,11 @@ {% block pagetitle %}Luxagraf | Projects | National Parks {% endblock %} {% block metadescription %}{% endblock %} -{% block extrahead %}<link rel="stylesheet" +{%block stylesheet%}<link rel="stylesheet" href="{{MEDIA_URL}}css/dark.css" - media="screen"> + type="text/css" + media="screen">{%endblock%} -{% endblock %} {%block bodyid%}id="projects-detail"{%endblock%} @@ -26,10 +26,10 @@ </section> <section id="parks">{% for object in object_list %} <article id="park-{{forloop.counter}}"> + <h1>{{object.name}}</h1> <div class="figure"> <img src="{{object.image.url}}" alt="{{object.title}}" /> </div> - <h1>{{object.name}}</h1> <div class="legend"> <h2>{{object.tag_line}}</h2> <ul class="buttons"> |