Merge branch 'hotfix/3.0.2' into develop

This commit is contained in:
Michael Rose 2016-04-14 21:33:54 -04:00
commit 8892666e91
3 changed files with 4 additions and 2 deletions

View file

@ -48,9 +48,11 @@
margin-bottom: 1em; margin-bottom: 1em;
@include breakpoint($large) { @include breakpoint($large) {
position: relative;
float: right; float: right;
width: $right-sidebar-width-narrow; width: $right-sidebar-width-narrow;
margin-left: span(0.5 of 12); margin-left: span(0.5 of 12);
z-index: 10;
} }
@include breakpoint($x-large) { @include breakpoint($x-large) {

View file

@ -348,7 +348,7 @@ body:hover .visually-hidden button {
========================================================================== */ ========================================================================== */
.sticky { .sticky {
@include breakpoint($medium) { @include breakpoint($large) {
@include clearfix(); @include clearfix();
position: -webkit-sticky; position: -webkit-sticky;
position: sticky; position: sticky;

File diff suppressed because one or more lines are too long