From 1d0ca012c10d7c1396186cb8a560744eb911386b Mon Sep 17 00:00:00 2001
From: Nick Sergeant <nick@nicksergeant.com>
Date: Tue, 5 Jun 2012 23:41:37 -0400
Subject: [PATCH] Ads

---
 .../templates/blogs/themes/default/base.html  | 17 +++-
 media/css/blog-themes/default/style.css       |  8 +-
 media/css/blog-themes/default/style.scss      | 14 ++-
 media/css/style.css                           | 74 +++++-----------
 media/css/style.scss                          | 85 ++++++-------------
 snipts/templates/snipts/list-public.html      | 15 ++++
 snipts/templates/snipts/list-user.html        | 15 ++++
 7 files changed, 113 insertions(+), 115 deletions(-)

diff --git a/blogs/templates/blogs/themes/default/base.html b/blogs/templates/blogs/themes/default/base.html
index ac3ed39..644b27b 100644
--- a/blogs/templates/blogs/themes/default/base.html
+++ b/blogs/templates/blogs/themes/default/base.html
@@ -3,7 +3,7 @@
 {% block body-class %}blog-site{% endblock %}
 {% block html-class %}blog-site{% endblock %}
 
-{% block page-title %}{% if blog_user.username == 'nick' %}// Nick Sergeant {% elif blog_user.username == 'blog' %}Snipt Blog{% else %}// {{ blog_user.username }}{% endif %}{% endblock %}
+{% block page-title %}{% if blog_user.username == 'nick' %}// Nick Sergeant {% elif blog_user.username == 'blog' %}// Snipt Blog{% else %}// {{ blog_user.username }}{% endif %}{% endblock %}
 
 {% block page-description %}{% endblock %}
 {% block rochester-made %}{% endblock %}
@@ -36,6 +36,21 @@
                     {{ sidebar.stylized|safe }}
                 </section>
             {% endif %}
+            <section class="ad">
+                <div id="carbonads-container">
+                    <div class="carbonad">
+                        <div id="azcarbon"></div>
+                        <script type="text/javascript">
+                            var z = document.createElement("script");
+                            z.type = "text/javascript";
+                            z.async = true;
+                            z.src = "http://engine.carbonads.com/z/12124/azcarbon_2_1_0_VERT";
+                            var s = document.getElementsByTagName("script")[0];
+                            s.parentNode.insertBefore(z, s);
+                        </script>
+                    </div>
+                </div>
+            </section>
             <nav class="footer {% if sidebar %}with-sidebar{% endif %}">
                 <ul class="powered">
                     <li class="snipt"><a href="https://snipt.net/">Blog powered by Snipt</a></li>
diff --git a/media/css/blog-themes/default/style.css b/media/css/blog-themes/default/style.css
index 0056195..54c232e 100644
--- a/media/css/blog-themes/default/style.css
+++ b/media/css/blog-themes/default/style.css
@@ -10,9 +10,12 @@ body.blog-site article.snipt div.group div.container header h1 {
 body.blog-site section.main div.ruler {
   z-index: 50;
 }
+body.blog-site section.main aside.main nav.footer {
+  margin-right: 0;
+}
 body.blog-site section.main aside.main nav.footer ul.powered {
   border-top: 1px solid #DDDDDD;
-  padding-top: 20px;
+  padding-top: 30px;
 }
 body.blog-site section.main aside.main nav.footer ul.powered li {
   background: transparent url("/static/images/favicon.png") center left no-repeat;
@@ -27,9 +30,10 @@ body.blog-site section.main aside.main nav.footer ul.powered li a:hover {
   color: #333;
 }
 body.blog-site section.main aside.main nav.footer.with-sidebar {
-  margin-top: 20px;
+  margin-top: 30px;
 }
 body.blog-site section.main aside.main section.sidebar {
+  margin-bottom: 30px;
   margin-left: 15px;
 }
 body.blog-site section.main aside.main section.sidebar p {
diff --git a/media/css/blog-themes/default/style.scss b/media/css/blog-themes/default/style.scss
index 51cd571..d77ca4d 100644
--- a/media/css/blog-themes/default/style.scss
+++ b/media/css/blog-themes/default/style.scss
@@ -22,9 +22,11 @@ body.blog-site {
         }
         aside.main {
             nav.footer {
+                margin-right: 0;
+
                 ul.powered {
                     border-top: 1px solid #DDDDDD;
-                    padding-top: 20px;
+                    padding-top: 30px;
 
                     li {
                         background: transparent url('/static/images/favicon.png') center left no-repeat;
@@ -42,10 +44,11 @@ body.blog-site {
                     }
                 }
                 &.with-sidebar {
-                    margin-top: 20px;
+                    margin-top: 30px;
                 }
             }
             section.sidebar {
+                margin-bottom: 30px;
                 margin-left: 15px;
 
                 p {
@@ -100,6 +103,13 @@ body.blog-site {
             z-index: 51;
         }
     }
+    section.ad {
+        div.carbonad {
+            div#azcarbon {
+                
+            }
+        }
+    }
 }
 body.blog-detail {
     section.main {
diff --git a/media/css/style.css b/media/css/style.css
index de62ca6..78694f2 100644
--- a/media/css/style.css
+++ b/media/css/style.css
@@ -246,69 +246,37 @@ section.main aside.main {
   width: 190px;
 }
 section.main aside.main section.ad {
-  height: 209px;
-  margin-bottom: 28px;
+  margin: 0 0 30px 15px;
 }
-section.main aside.main section.ad div.asset {
-  background: #FFF;
-  border: 1px solid #DDDDDD;
-  margin: 0 15px 6px;
-  padding: 15px 14px;
-  width: 130px;
+section.main aside.main section.ad div.carbonad {
+  border-width: 1px;
+  height: 231px;
+  width: auto;
   -webkit-background-clip: padding-box;
-  -webkit-border-radius: 4px;
+  -webkit-border-radius: 5px;
   -moz-background-clip: padding-box;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
   background-clip: padding-box;
 }
-section.main aside.main section.ad div.asset a {
-  color: #939393;
-  display: block;
-  font: normal 11px/12px "Helvetica Neue", Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif;
-  text-decoration: none;
+section.main aside.main section.ad div.carbonad div#azcarbon span.carbonad-image a img {
+  margin-left: 21px;
+  margin-top: 21px;
 }
-section.main aside.main section.ad div.asset a img {
-  display: block;
-  margin-bottom: 10px;
+section.main aside.main section.ad div.carbonad div#azcarbon span.carbonad-text {
+  color: #999999;
+  margin-left: 21px;
 }
-section.main aside.main section.ad div.asset a:hover {
-  color: #666;
-  text-decoration: none;
+section.main aside.main section.ad div.carbonad div#azcarbon span.carbonad-text a {
+  color: #999999;
 }
-section.main aside.main section.ad div.meta {
-  color: #939393;
-  font: normal 11px/12px "Helvetica Neue", Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif;
-  margin: 0 15px;
+section.main aside.main section.ad div.carbonad div#azcarbon span.carbonad-tag {
+  margin-left: 0;
   text-align: center;
-  text-transform: uppercase;
+  width: 100%;
 }
-section.main aside.main section.ad div.meta a {
-  color: #CCC;
-  text-decoration: none;
-}
-section.main aside.main section.ad div.meta a:hover {
-  text-decoration: underline;
-}
-section.main aside.main section.ad.coffee {
-  margin-bottom: 27px;
-}
-section.main aside.main section.ad.coffee p {
-  display: block !important;
-  height: auto !important;
-  margin: 7px 0 0 0;
-}
-section.main aside.main section.ad.coffee > div {
-  height: auto !important;
-  margin-bottom: 0 !important;
-}
-section.main aside.main section.ad.coffee > div div:nth-child(1) {
-  margin-bottom: 6px !important;
-}
-section.main aside.main section.ad.coffee > div div:nth-child(2) {
-  font: normal 11px/12px "Helvetica Neue", Helvetica, Arial, "Liberation Sans", FreeSans, sans-serif;
-  height: 12px;
-  margin: 0 !important;
+section.main aside.main section.ad div.carbonad div#azcarbon span.carbonad-tag a {
+  margin-left: 4px;
 }
 section.main aside.main section.tags {
   margin: 0 0 45px 15px;
diff --git a/media/css/style.scss b/media/css/style.scss
index ad542dd..63d33e6 100644
--- a/media/css/style.scss
+++ b/media/css/style.scss
@@ -311,68 +311,39 @@ section.main {
         width: 190px;
 
         section.ad {
-            height: 209px;
-            margin-bottom: 28px;
+            margin: 0 0 30px 15px;
 
-            div.asset {
-                background: #FFF;
-                border: 1px solid #DDDDDD;
-                margin: 0 15px 6px;
-                padding: 15px 14px;
-                width: 130px;
-                @include border-radius(4px);
+            div.carbonad {
+                border-width: 1px;
+                height: 231px;
+                width: auto;
+                @include border-radius(5px);
 
-                a {
-                    color: #939393;
-                    display: block;
-                    font: normal 11px/12px $Helvetica;
-                    text-decoration: none;
-
-                    img {
-                        display: block;
-                        margin-bottom: 10px;
+                div#azcarbon {
+                    span.carbonad-image {
+                        a {
+                            img {
+                                margin-left: 21px;
+                                margin-top: 21px;
+                            }
+                        }
                     }
-                    &:hover {
-                        color: #666;
-                        text-decoration: none;
+                    span.carbonad-text {
+                        color: #999999;
+                        margin-left: 21px;
+
+                        a {
+                            color: #999999;
+                        }
                     }
-                }
-            }
-            div.meta {
-                color: #939393;
-                font: normal 11px/12px $Helvetica;
-                margin: 0 15px;
-                text-align: center;
-                text-transform: uppercase;
+                    span.carbonad-tag {
+                        margin-left: 0;
+                        text-align: center;
+                        width: 100%;
 
-                a {
-                    color: #CCC;
-                    text-decoration: none;
-
-                    &:hover {
-                        text-decoration: underline;
-                    }
-                }
-            }
-            &.coffee {
-                margin-bottom: 27px;
-
-                p {
-                    display: block !important;
-                    height: auto !important;
-                    margin: 7px 0 0 0;
-                }
-                & > div {
-                    height: auto !important;
-                    margin-bottom: 0 !important;
-
-                    div:nth-child(1) {
-                        margin-bottom: 6px !important;
-                    }
-                    div:nth-child(2) {
-                        font: normal 11px/12px $Helvetica;
-                        height: 12px;
-                        margin: 0 !important;
+                        a {
+                            margin-left: 4px;
+                        }
                     }
                 }
             }
diff --git a/snipts/templates/snipts/list-public.html b/snipts/templates/snipts/list-public.html
index 83ac2ae..9fb0416 100644
--- a/snipts/templates/snipts/list-public.html
+++ b/snipts/templates/snipts/list-public.html
@@ -11,5 +11,20 @@
 {% endblock %}
 
 {% block tags %}
+    <section class="ad">
+        <div id="carbonads-container">
+            <div class="carbonad">
+                <div id="azcarbon"></div>
+                <script type="text/javascript">
+                    var z = document.createElement("script");
+                    z.type = "text/javascript";
+                    z.async = true;
+                    z.src = "http://engine.carbonads.com/z/12124/azcarbon_2_1_0_VERT";
+                    var s = document.getElementsByTagName("script")[0];
+                    s.parentNode.insertBefore(z, s);
+                </script>
+            </div>
+        </div>
+    </section>
     {% include "snipts/tags-public.html" %}
 {% endblock %}
diff --git a/snipts/templates/snipts/list-user.html b/snipts/templates/snipts/list-user.html
index 64ae629..c7015b7 100644
--- a/snipts/templates/snipts/list-user.html
+++ b/snipts/templates/snipts/list-user.html
@@ -34,5 +34,20 @@
             {% endif %}
         </div>
     </div>
+    <section class="ad">
+        <div id="carbonads-container">
+            <div class="carbonad">
+                <div id="azcarbon"></div>
+                <script type="text/javascript">
+                    var z = document.createElement("script");
+                    z.type = "text/javascript";
+                    z.async = true;
+                    z.src = "http://engine.carbonads.com/z/12124/azcarbon_2_1_0_VERT";
+                    var s = document.getElementsByTagName("script")[0];
+                    s.parentNode.insertBefore(z, s);
+                </script>
+            </div>
+        </div>
+    </section>
     {% include "snipts/tags-user.html" %}
 {% endblock %}