Merge branch 'dev' into 'master'

Dev

See merge request lilcity/backend!20

apps/user/views.py

@@ -85,7 +85,10 @@ class UserView(DetailView):
             context['subscription_ends'] = school_payment.last().date_end
         context['school_schedules'] = SchoolSchedule.objects.filter(
             weekday__in=school_schedules_purchased if school_payment.exists() else [],
-        )
+        ).annotate(
+            calk=F('weekday') - now().isoweekday(),
+            weight=(7 + F('calk') % 7) % 7,
+        ).order_by('weight')
 
         return context
 

web/src/sass/_common.sass

@@ -40,6 +40,14 @@ $cl: #191919
   50%
     opacity: 0
 
+@keyframes iridescent
+  0%
+    background-position: 0% 50%
+  50%
+    background-position: 100% 50%
+  100%
+    background-position: 0% 50%
+  
 body
   min-width: 360px
   +f
@@ -633,7 +641,9 @@ a.btn
     left: 0
     right: 0
     bottom: 0
-    background-image: linear-gradient(-225deg, #FFE2EB 0%, #D8F5F5 100%)
+    background: linear-gradient(-45deg, #FFE2EB, #D8F5F5, #FFE2EB, #D8F5F5)
+    background-size: 200% 200%
+    animation: iridescent 8s ease infinite
     opacity: .8
     z-index: -2
   &__center
@@ -1493,8 +1503,7 @@ a.grey-link
     margin-bottom: 5px
     +fb
     font-size: 20px
-    text-transform: uppercase
-    letter-spacing: 4px
+    letter-spacing: 2px
     +t
       font-size: 12px
       letter-spacing: 2px
@@ -3759,7 +3768,7 @@ a.grey-link
         height: 8px
         background: #EE4630
         border-radius: 50%
-        animation: blinker 2s linear infinite;
+        animation: blinker 2s linear infinite
   &__date
     opacity: .5
     +m