Skip to content

Commit

Permalink
Merge branch 'new-carbonads'
Browse files Browse the repository at this point in the history
  • Loading branch information
peterbe committed Jan 18, 2018
2 parents 5337d3f + 0239407 commit 33dfb46
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 21 deletions.
81 changes: 60 additions & 21 deletions peterbecom/base/static/css/carbonads.css
Original file line number Diff line number Diff line change
@@ -1,31 +1,70 @@
#fusion_ad {
display: block;
overflow: hidden;
margin-left: 10px;
padding: 10px;
max-width: 180px;
width: auto;
border: solid 1px #5185ce;
background: #fbfcfe;
font: 12px/1.5 Verdana, "Helvetica Neue", Helvetica, sans-serif;
#carbonads {
display: block;
float: right;
overflow: hidden;
/* margin-top: 50px; */
margin-left: 40px;
padding: 14px 10px;
max-width: 160px;
border: solid 1px #5a85c9;
border-radius: 3px;
background: hsl(0, 0%, 98%);
text-align: center;
font-size: 14px;
line-height: 1.5;
}

#fusion_ad br {
display: none;
#carbonads span {
display: block;
overflow: hidden;
}

.fusionimg {
display: block;
margin: 0 auto;
.carbon-img {
display: block;
margin: 0 auto 8px;
line-height: 1;
}

.fusiontext {
display: block;
margin: 5px 0;
.carbon-text {
display: block;
margin-bottom: 8px;
}

.carbon-poweredby {
display: block;
text-transform: uppercase;
letter-spacing: 1px;
font-size: 9px;
line-height: 1;
}

@media only screen and (min-width: 320px) and (max-width: 759px) {
#carbonads {
float: none;
margin: 0 auto;
margin-bottom: 20px;
max-width: 330px;
}
#carbonads span {
position: relative;
}
#carbonads > span {
max-width: none;
}
.carbon-img {
float: left;
margin: 0 1em 0 0;
}
.carbon-text {
float: left;
margin-bottom: 0;
max-width: calc(100% - 130px - 1em);
text-align: left;
}
.carbon-poweredby {
position: absolute;
bottom: 0;
left: 144px;
display: block;
text-align: right;
font-size: 11px;
}
}
}
3 changes: 3 additions & 0 deletions peterbecom/plog/jinja2/plog/_fusion.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=peterbecom" id="_carbonads_js"></script>
{#
<div id="fusion_ad">
<a href="http://fusionads.net">Powered by Fusion</a><a class="close" href="#" onclick="$('#fusion_ad').remove();return false">&times;</a>
</div>
Expand All @@ -9,3 +11,4 @@
(document.head || document.getElementsByTagName('head')[0]).appendChild(fusion);
})();
</script>
#}

0 comments on commit 33dfb46

Please sign in to comment.