Skip to content

Commit

Permalink
Unpin libsass (wagtail 2.6+ needs a more modern version to function).…
Browse files Browse the repository at this point in the history
… Fix a few invalid places in our vendor scss files. Move to wagtail 2.8.
  • Loading branch information
rjsparks committed Apr 28, 2020
1 parent fc6ec35 commit 7efa220
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ietf/static/css/jsenabled.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
}

&:before {
@extend %bleed-left;
@extend %bleed-left !optional;
background: $light;
margin-left: -999em;
position: absolute;
Expand Down
7 changes: 5 additions & 2 deletions ietf/static/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1071,12 +1071,13 @@ dl {
}

@media #{$tabletxl} {
/*
@include keyframes(slide-down) {
0% { transform: translate3d( 110%, 100%, 0 );}
1% { transform: translate3d( 0%, 0, 0 ); }
90% { transform: translate3d( 0%, 0, 0 ); }
}

*/
.link-preview {
display: block;
width: 160px;
Expand All @@ -1088,7 +1089,9 @@ dl {
padding: 10px;
transform: translate3d( 110%, 0, 0 );
@include transition( transform 0.25s ease 0s );
/*
@include animation('slide-down 5s 3');
*/
&:after {
content: '';
position: absolute;
Expand Down Expand Up @@ -1130,7 +1133,7 @@ dl {
}

.link-preview-show {
@extend #link-preview;
@extend #link-preview !optional;
display: block;
position: relative;
margin: 0 auto;
Expand Down
4 changes: 2 additions & 2 deletions ietf/static/css/mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ $prefixes: (-webkit, -moz, -ms, -o);
}

//animation ===================================================================================//
@mixin keyframes($animation-name) {
/*
@mixin keyframes($animation-name) {
@-webkit-keyframes $animation-name {
@content;
}
Expand All @@ -344,8 +344,8 @@ $prefixes: (-webkit, -moz, -ms, -o);
@keyframes $animation-name {
@content;
}
*/
}
*/

@mixin animation($str) {
-webkit-animation: #{$str};
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Django>=2.2,<3
djangorestframework>=3.8
psycopg2>=2.7.5
wagtail==2.3
wagtail>=2.8,<2.9
django-libsass>=0.8
libsass==0.8.3
libsass>=0.8.3
future>=0.15.2
django_compressor>=2.2
mod_wsgi>=4.6
Expand Down

0 comments on commit 7efa220

Please sign in to comment.