Merge branch 'stable'

doc-src/content/stylesheets/partials/_ads.scss

@@ -0,0 +1,29 @@
+.advertisement {
+  padding: 8px 5px !important;
+  text-align: center;
+  line-height: 1.1em !important;
+  @include opacity(0);
+  @include transition(opacity 1s ease-in 3s);
+  &.visible {
+    @include opacity(1);
+  }
+  a:not(.pagerankspam) {
+    display: block;
+    color: white;
+    @extend .heading-font;
+    text-decoration: none;
+    &:hover {
+      @include text-shadow(0 0 2px #aaa);
+    }
+  }
+  .pagerankspam { font-size: 9px; }
+ .dark & {
+   @extend .code-block-dark;
+   img:hover { @include single-box-shadow(white); }
+ }
+ .light & {
+   @extend .code-block-light;
+   a:not(.pagerankspam) { color: #222}
+   img:hover { @include single-box-shadow(#222); }
+ }
+}

doc-src/content/stylesheets/screen.scss

@@ -13,6 +13,7 @@
 
 @import "partials/nav";
 @import "partials/sidebar";
+@import "partials/ads";
 @import "partials/main";
 @import "partials/code";
 @import "partials/example";

doc-src/layouts/partials/sidebar.haml

@@ -3,3 +3,8 @@
   - sidebar_item ||= sidebar_item(@item)
   - sidebar_item ||= reference_item(:stylesheet => @default_stylesheet)
   %ul= item_tree(sidebar_item, :depth => 1, :omit_self => get_var(:omit_self){true}, :heading_level => get_var(:heading_level){1}, :heading_depth => get_var(:heading_depth){10})
+
+.advertisement
+  <script type="text/javascript">(function(){ var fusion = document.createElement('script'); fusion.src = window.location.protocol + '//adn.fusionads.net/api/1.0/ad.js?zoneid=158&rand=' + Math.floor(Math.random()*9999999); fusion.async = true; (document.head || document.getElementsByTagName('head')[0]).appendChild(fusion); })(); $(function(){ $(".advertisement").addClass("visible")});</script>
+  #fusion_ad
+    %a.pagerankspam(href="http://fusionads.net") Powered by Fusion