From d047409fce7739921c27e7179091109213bc9656 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Thu, 10 May 2018 18:51:58 +0300 Subject: [PATCH 1/2] Fix school current day in profile --- apps/user/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/user/views.py b/apps/user/views.py index e98ee454..8bdc6824 100644 --- a/apps/user/views.py +++ b/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 From ec233922564a986bc93b33a3b0bf540bede3730c Mon Sep 17 00:00:00 2001 From: nikita Date: Thu, 10 May 2018 23:33:08 +0300 Subject: [PATCH 2/2] CSS improvements --- web/src/sass/_common.sass | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 0158b4c0..a1d409e6 100755 --- a/web/src/sass/_common.sass +++ b/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