Merge branch 'hotfix/3.0.2'

mmistakes · Apr 15, 2016 · 0c2cddf · 0c2cddf
2 parents 5a63f9b + d9c6183
commit 0c2cddf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/assets/_scss/_sidebar.scss b/assets/_scss/_sidebar.scss
@@ -48,9 +48,11 @@
   margin-bottom: 1em;
 
   @include breakpoint($large) {
+    position: relative;
     float: right;
     width: $right-sidebar-width-narrow;
     margin-left: span(0.5 of 12);
+    z-index: 10;
   }
 
   @include breakpoint($x-large) {

diff --git a/assets/_scss/_utilities.scss b/assets/_scss/_utilities.scss
@@ -348,7 +348,7 @@ body:hover .visually-hidden button {
    ========================================================================== */
 
 .sticky {
-  @include breakpoint($medium) {
+  @include breakpoint($large) {
     @include clearfix();
     position: -webkit-sticky;
     position: sticky;

diff --git a/assets/css/main.css b/assets/css/main.css