From e9ed2892c8ab60c4b4b29d9dfead696b586f7521 Mon Sep 17 00:00:00 2001 From: anishTP Date: Tue, 16 Apr 2024 12:03:11 +0530 Subject: [PATCH 01/15] Styling changes to the profile calendar widget --- funnel/assets/sass/pages/profile_calendar.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/funnel/assets/sass/pages/profile_calendar.scss b/funnel/assets/sass/pages/profile_calendar.scss index 13333f366..0d999a468 100644 --- a/funnel/assets/sass/pages/profile_calendar.scss +++ b/funnel/assets/sass/pages/profile_calendar.scss @@ -10,7 +10,7 @@ } .fc { - margin: $mui-grid-padding auto; + margin: $mui-grid-padding auto 0; width: 100%; max-width: 100%; @@ -105,7 +105,7 @@ table.proposal-list-table tr { border-radius: 16px; } .fc-view-harness { - height: 270px !important; + height: 260px !important; } .fc-daygrid-day-frame { From a1f3a121f3ff9a8cf2383b4a993a93dd08769134 Mon Sep 17 00:00:00 2001 From: anishTP Date: Tue, 16 Apr 2024 12:25:23 +0530 Subject: [PATCH 02/15] Updated z-index for subnavbar and dropdown menu --- funnel/assets/sass/components/_subnavbar.scss | 1 + funnel/assets/sass/mui/_dropdown.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/funnel/assets/sass/components/_subnavbar.scss b/funnel/assets/sass/components/_subnavbar.scss index c0d46fd73..9fc7fe978 100644 --- a/funnel/assets/sass/components/_subnavbar.scss +++ b/funnel/assets/sass/components/_subnavbar.scss @@ -1,5 +1,6 @@ .sub-navbar-container--sticky { margin-top: $mui-grid-padding; + z-index: 3; } .sub-navbar { diff --git a/funnel/assets/sass/mui/_dropdown.scss b/funnel/assets/sass/mui/_dropdown.scss index dd0d54773..16a135b0e 100644 --- a/funnel/assets/sass/mui/_dropdown.scss +++ b/funnel/assets/sass/mui/_dropdown.scss @@ -45,7 +45,7 @@ text-align: left; background-color: $mui-dropdown-bg-color; border-radius: $mui-dropdown-border-radius; - z-index: 1; + z-index: 4; background-clip: padding-box; // open state From cfaee0beb6968a6d10cc4c4859010292c2a48ec4 Mon Sep 17 00:00:00 2001 From: Vidya Ramakrishnan Date: Tue, 16 Apr 2024 15:09:50 +0530 Subject: [PATCH 03/15] Fix rendering of projects when view is changed from year to month. Add loading icon --- funnel/assets/js/profile_calendar.js | 10 ++++++++++ funnel/templates/profile_calendar.html.jinja2 | 10 +--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/funnel/assets/js/profile_calendar.js b/funnel/assets/js/profile_calendar.js index 6992fa950..0547745f8 100644 --- a/funnel/assets/js/profile_calendar.js +++ b/funnel/assets/js/profile_calendar.js @@ -16,6 +16,7 @@ $(() => { return { date: '', showFilter: false, + loading: false, calendarView: 'monthly', access: 'both', cfp: '', @@ -49,6 +50,7 @@ $(() => { } return false; }, + lazyFetching: false, eventTimeFormat: { // like '14:30:00' hour: '2-digit', @@ -70,10 +72,12 @@ $(() => { this.events = this.calendar.getEvents(); }, prev() { + this.loading = true; this.calendar.prev(); this.updateTitle(); }, next() { + this.loading = true; this.calendar.next(); this.updateTitle(); }, @@ -81,6 +85,7 @@ $(() => { this.showFilter = !this.showFilter; }, applyFilter() { + this.loading = true; this.showFilter = false; // Close filter menu switch (this.calendarView) { case 'monthly': @@ -115,5 +120,10 @@ $(() => { }); }, }, + watch: { + events() { + this.loading = false; + }, + }, }); }); diff --git a/funnel/templates/profile_calendar.html.jinja2 b/funnel/templates/profile_calendar.html.jinja2 index 1dd314fb7..8a450a992 100644 --- a/funnel/templates/profile_calendar.html.jinja2 +++ b/funnel/templates/profile_calendar.html.jinja2 @@ -55,6 +55,7 @@
+
@@ -129,15 +130,6 @@ - From a019fe42a935e9f2ec77052758089d7d5a7df012 Mon Sep 17 00:00:00 2001 From: Vidya Ramakrishnan Date: Tue, 16 Apr 2024 16:29:48 +0530 Subject: [PATCH 04/15] Updating the project filter --- funnel/views/profile.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/funnel/views/profile.py b/funnel/views/profile.py index feedc8b22..860227404 100644 --- a/funnel/views/profile.py +++ b/funnel/views/profile.py @@ -260,8 +260,22 @@ def calendar( if end > start: filtered_projects = ( all_projects.filter( - Project.start_at >= start, - Project.end_at < end, + sa.or_( + sa.and_( + Project.start_at >= start, + Project.end_at < end, + ), + sa.and_( + Project.start_at < start, + Project.end_at > start, + Project.end_at < end, + ), + sa.and_( + Project.start_at < end, + Project.start_at >= start, + Project.end_at >= end), + ) + ) .order_by(Project.order_by_date()) .all() From 3f4e32c1b405b7ba4d60c524e3c3966e9551a8b4 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 11:01:24 +0000 Subject: [PATCH 05/15] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- funnel/views/profile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/funnel/views/profile.py b/funnel/views/profile.py index 860227404..e30ad8f36 100644 --- a/funnel/views/profile.py +++ b/funnel/views/profile.py @@ -273,9 +273,9 @@ def calendar( sa.and_( Project.start_at < end, Project.start_at >= start, - Project.end_at >= end), + Project.end_at >= end, + ), ) - ) .order_by(Project.order_by_date()) .all() From 4a4589cc5bf9515b115dbad711521bc8f9e1369c Mon Sep 17 00:00:00 2001 From: anishTP Date: Wed, 17 Apr 2024 15:33:34 +0530 Subject: [PATCH 06/15] Bug fixes + fine tuned styling on year view --- .../assets/sass/pages/profile_calendar.scss | 29 ++++++++++++++----- funnel/templates/profile_calendar.html.jinja2 | 4 +-- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/funnel/assets/sass/pages/profile_calendar.scss b/funnel/assets/sass/pages/profile_calendar.scss index 0d999a468..133e79294 100644 --- a/funnel/assets/sass/pages/profile_calendar.scss +++ b/funnel/assets/sass/pages/profile_calendar.scss @@ -53,7 +53,20 @@ .fc-multimonth-month { justify-content: left; padding: 0; - background: #fff; + } + .fc-multimonth-header { + border-radius: 16px; + } + .fc-view-harness-active > .fc-view { + border-radius: 16px; + inset: 10px 0 0; + } + .fc-scroller-harness-liquid { + border-radius: 16px; + } + .fc-multimonth { + margin-top: -66px; + border: none !important; } --fc-border-color: #fff; @@ -74,22 +87,22 @@ table.proposal-list-table tr { border-bottom: 1px solid rgba(132, 146, 166, 0.3); } -.flex-wrapper--baseline { - justify-content: right; - padding: $mui-grid-padding/2 $mui-grid-padding 0 0; +.fc-widget-header { + float: right; + padding: $mui-grid-padding/2 $mui-grid-padding; position: relative; + align-items: center; z-index: 3; } .fc-text-caption { font-size: 14px; + margin-top: 8px; + width: 120px; + text-align: center; font-variant: all-small-caps; } -.fc-multimonth { - margin: -66px 0 0; -} - .fc-multimonth-title { font-size: 14px !important; font-variant: all-small-caps; diff --git a/funnel/templates/profile_calendar.html.jinja2 b/funnel/templates/profile_calendar.html.jinja2 index 8a450a992..9b8cd2a34 100644 --- a/funnel/templates/profile_calendar.html.jinja2 +++ b/funnel/templates/profile_calendar.html.jinja2 @@ -79,9 +79,9 @@
-
+
- {{ date }} +

{{ date }}

From d49230739275b6231818bc5285af4e9c4ae96529 Mon Sep 17 00:00:00 2001 From: anishTP Date: Tue, 30 Apr 2024 12:41:48 +0530 Subject: [PATCH 07/15] Aligned the filter icon and removed the square border at the bottom of the card --- .../assets/sass/pages/profile_calendar.scss | 42 ++++++++++++------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/funnel/assets/sass/pages/profile_calendar.scss b/funnel/assets/sass/pages/profile_calendar.scss index 5eb2f2f12..8a0706cec 100644 --- a/funnel/assets/sass/pages/profile_calendar.scss +++ b/funnel/assets/sass/pages/profile_calendar.scss @@ -84,6 +84,15 @@ display: block; } +.fc-theme-standard .fc-scrollgrid { + border: none; +} + +.fc-scrollgrid-section td, +.fc-scrollgrid-section th { + border: none; +} + table.proposal-list-table tr { border-bottom: 1px solid rgba(132, 146, 166, 0.3); } @@ -171,20 +180,23 @@ table.proposal-list-table tr { gap: math.div($mui-grid-padding, 4); } -.filter-menu { - position: absolute; - left: 158px; - padding: $mui-grid-padding; - background-color: $mui-bg-color-primary; - z-index: 1000; - box-shadow: - 0 0 2px rgba(0, 0, 0, 0.12), - 0 2px 2px rgba(0, 0, 0, 0.2); - border-radius: 0 16px 16px 16px; - min-width: 200px; - - button { - width: 100%; - margin-top: $mui-grid-padding; +.filter { + height: 30.6px; + .filter-menu { + position: absolute; + left: 158px; + padding: $mui-grid-padding; + background-color: $mui-bg-color-primary; + z-index: 1000; + box-shadow: + 0 0 2px rgba(0, 0, 0, 0.12), + 0 2px 2px rgba(0, 0, 0, 0.2); + border-radius: 0 16px 16px 16px; + min-width: 200px; + + button { + width: 100%; + margin-top: $mui-grid-padding; + } } } From 0ef934cbc579ded1777faea5b12ebeab2592bc79 Mon Sep 17 00:00:00 2001 From: anishTP Date: Tue, 30 Apr 2024 13:33:57 +0530 Subject: [PATCH 08/15] Removed clipping on scrollbar --- funnel/assets/sass/pages/profile_calendar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/funnel/assets/sass/pages/profile_calendar.scss b/funnel/assets/sass/pages/profile_calendar.scss index 8a0706cec..bf929f0d4 100644 --- a/funnel/assets/sass/pages/profile_calendar.scss +++ b/funnel/assets/sass/pages/profile_calendar.scss @@ -63,7 +63,7 @@ inset: 10px 0 0; } .fc-scroller-harness-liquid { - border-radius: 16px; + border-radius: 0 0 16px 16px; } .fc-multimonth { margin-top: -66px; From 1243fc8d34c5088c32f5b8cd9e5f89f0e6427337 Mon Sep 17 00:00:00 2001 From: anishTP Date: Tue, 30 Apr 2024 13:53:39 +0530 Subject: [PATCH 09/15] Removed bottom whitespace on mobile --- funnel/assets/sass/pages/profile_calendar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/funnel/assets/sass/pages/profile_calendar.scss b/funnel/assets/sass/pages/profile_calendar.scss index bf929f0d4..476a31dd8 100644 --- a/funnel/assets/sass/pages/profile_calendar.scss +++ b/funnel/assets/sass/pages/profile_calendar.scss @@ -3,7 +3,7 @@ .calendar-container { width: 100%; - min-height: 300px; + min-height: 85vh; } .fc-header-toolbar { From b177a4d0251acb58a22cdbf036fbbcbcf7b94119 Mon Sep 17 00:00:00 2001 From: Vidya Ramakrishnan Date: Tue, 30 Apr 2024 14:44:54 +0530 Subject: [PATCH 10/15] Change css class names and css fixes --- .../assets/sass/pages/profile_calendar.scss | 145 ++++++++++++------ funnel/templates/profile_calendar.html.jinja2 | 100 ++++++------ funnel/views/profile.py | 18 +-- 3 files changed, 147 insertions(+), 116 deletions(-) diff --git a/funnel/assets/sass/pages/profile_calendar.scss b/funnel/assets/sass/pages/profile_calendar.scss index 0d999a468..fb55287c4 100644 --- a/funnel/assets/sass/pages/profile_calendar.scss +++ b/funnel/assets/sass/pages/profile_calendar.scss @@ -1,8 +1,71 @@ @import '../base/variable'; -.calendar-container { +.calendar { width: 100%; - min-height: 300px; + min-height: 100vh; + + .calendar__wrapper__project-list { + .calendar__wrapper__project-list__table { + border-collapse: collapse; + overflow: hidden; + margin: 0 !important; + border-radius: 16px; + tr { + border-bottom: 1px solid rgba(132, 146, 166, 0.3); + } + + .calendar__wrapper__project-list__table__venue { + margin: $mui-grid-padding 0 0; + display: flex; + gap: $mui-grid-padding/4; + } + } + } + + .calendar__wrapper__calendar__toolbar { + justify-content: right; + padding: $mui-grid-padding/2 $mui-grid-padding 0 0; + position: relative; + z-index: 3; + + .calendar__wrapper__calendar__toolbar__filter { + margin-left: $mui-grid-padding/2; + } + + .calendar__wrapper__calendar__toolbar__filter__menu { + position: absolute; + left: 158px; + padding: $mui-grid-padding; + background-color: $mui-bg-color-primary; + z-index: 1000; + box-shadow: + 0 0 2px rgba(0, 0, 0, 0.12), + 0 2px 2px rgba(0, 0, 0, 0.2); + border-radius: 0 16px 16px 16px; + min-width: 200px; + + button { + width: 100%; + margin-top: $mui-grid-padding; + } + } + } + + @media (max-width: 768px) { + .calendar__wrapper .calendar__wrapper__headline { + order: 2; + } + .calendar__wrapper .calendar__wrapper__project-list { + order: 2; + } + .calendar__wrapper .calendar__wrapper__calendar { + order: 1; + margin: -$mui-grid-padding-double 0 $mui-grid-padding * 1.5; + position: sticky; + top: $mui-grid-padding-double; + z-index: 2; + } + } } .fc-header-toolbar { @@ -53,7 +116,20 @@ .fc-multimonth-month { justify-content: left; padding: 0; - background: #fff; + } + .fc-multimonth-header { + border-radius: 16px; + } + .fc-view-harness-active > .fc-view { + border-radius: 16px; + inset: 10px 0 0; + } + .fc-scroller-harness-liquid { + border-radius: 0 0 16px 16px; + } + .fc-multimonth { + margin-top: -66px; + border: none !important; } --fc-border-color: #fff; @@ -70,26 +146,35 @@ display: block; } +.fc-theme-standard .fc-scrollgrid { + border: none; +} + +.fc-scrollgrid-section td, +.fc-scrollgrid-section th { + border: none; +} + table.proposal-list-table tr { border-bottom: 1px solid rgba(132, 146, 166, 0.3); } -.flex-wrapper--baseline { - justify-content: right; - padding: $mui-grid-padding/2 $mui-grid-padding 0 0; +.fc-widget-header { + float: right; + padding: math.div($mui-grid-padding, 2) $mui-grid-padding; position: relative; + align-items: center; z-index: 3; } .fc-text-caption { font-size: 14px; + margin-top: 8px; + width: 120px; + text-align: center; font-variant: all-small-caps; } -.fc-multimonth { - margin: -66px 0 0; -} - .fc-multimonth-title { font-size: 14px !important; font-variant: all-small-caps; @@ -134,43 +219,3 @@ table.proposal-list-table tr { color: #1f2d3d; font-weight: 700; } - -@media (max-width: 768px) { - .calendar_mobile .grid__col-12 { - order: 2; - } - .calendar_mobile .proposal_list { - order: 2; - } - .calendar_mobile .calendar_mobile_container { - order: 1; - margin: -$mui-grid-padding-double 0 $mui-grid-padding * 1.5; - position: sticky; - top: $mui-grid-padding-double; - z-index: 2; - } -} - -.proposal_venue { - margin: $mui-grid-padding 0 0; - display: flex; - gap: $mui-grid-padding/4; -} - -.filter-menu { - position: absolute; - left: 158px; - padding: $mui-grid-padding; - background-color: $mui-bg-color-primary; - z-index: 1000; - box-shadow: - 0 0 2px rgba(0, 0, 0, 0.12), - 0 2px 2px rgba(0, 0, 0, 0.2); - border-radius: 0 16px 16px 16px; - min-width: 200px; - - button { - width: 100%; - margin-top: $mui-grid-padding; - } -} diff --git a/funnel/templates/profile_calendar.html.jinja2 b/funnel/templates/profile_calendar.html.jinja2 index 8a450a992..0c2bdaf08 100644 --- a/funnel/templates/profile_calendar.html.jinja2 +++ b/funnel/templates/profile_calendar.html.jinja2 @@ -48,15 +48,15 @@
{% raw %} -
-
-
+
+
+

Projects

-
+
-
+
@@ -77,65 +77,65 @@
+ calendar__wrapper__calendar">
-
- - {{ date }} - -
- -
-
-

{{ gettext('Format') }}

-
-
-
    -
  • - -
    • -
  • - -
    • -
-
-
- -

{{ gettext('Access') }}

-
+
+ + {{ date }} + +
+ +
+ +

{{ gettext('Format') }}

-
    +
    • - +
    • - -
      • -
    • - +
-
-

{{ gettext('Proposal Submissions') }}

-
-
-
- +

{{ gettext('Access') }}

+
+
+
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
-
- - + +

{{ gettext('Proposal Submissions') }}

+
+
+
+ +
+
+
+ + +
-
- +
diff --git a/funnel/views/profile.py b/funnel/views/profile.py index 860227404..feedc8b22 100644 --- a/funnel/views/profile.py +++ b/funnel/views/profile.py @@ -260,22 +260,8 @@ def calendar( if end > start: filtered_projects = ( all_projects.filter( - sa.or_( - sa.and_( - Project.start_at >= start, - Project.end_at < end, - ), - sa.and_( - Project.start_at < start, - Project.end_at > start, - Project.end_at < end, - ), - sa.and_( - Project.start_at < end, - Project.start_at >= start, - Project.end_at >= end), - ) - + Project.start_at >= start, + Project.end_at < end, ) .order_by(Project.order_by_date()) .all() From 6248e3a5e00e7a316aae4e68a26e6f11c16ea8a9 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 30 Apr 2024 09:22:16 +0000 Subject: [PATCH 11/15] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- funnel/assets/sass/pages/profile_calendar.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/funnel/assets/sass/pages/profile_calendar.scss b/funnel/assets/sass/pages/profile_calendar.scss index ac897ce62..93d4cfc1e 100644 --- a/funnel/assets/sass/pages/profile_calendar.scss +++ b/funnel/assets/sass/pages/profile_calendar.scss @@ -165,7 +165,6 @@ border: none; } - .fc-multimonth-title { font-size: 14px !important; font-variant: all-small-caps; From ce88db09b2c73363292839e5a005e0a623a413b2 Mon Sep 17 00:00:00 2001 From: Vidya Ramakrishnan Date: Tue, 30 Apr 2024 15:05:17 +0530 Subject: [PATCH 12/15] Style changes for event title popup --- funnel/assets/sass/pages/profile_calendar.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/funnel/assets/sass/pages/profile_calendar.scss b/funnel/assets/sass/pages/profile_calendar.scss index ac897ce62..31a206713 100644 --- a/funnel/assets/sass/pages/profile_calendar.scss +++ b/funnel/assets/sass/pages/profile_calendar.scss @@ -178,6 +178,10 @@ height: 260px !important; } +.fc-daygrid-day-events{ + top: -$mui-grid-padding/2; +} + .fc-daygrid-day-frame { height: 38px; } From 7bfe32fe6cdf734e5fce0b31984a0e0ab76a98a6 Mon Sep 17 00:00:00 2001 From: anishTP Date: Tue, 30 Apr 2024 14:54:21 +0530 Subject: [PATCH 13/15] Altered the button layout on the calendar header --- funnel/assets/sass/pages/profile_calendar.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/funnel/assets/sass/pages/profile_calendar.scss b/funnel/assets/sass/pages/profile_calendar.scss index 93d4cfc1e..9293b0d98 100644 --- a/funnel/assets/sass/pages/profile_calendar.scss +++ b/funnel/assets/sass/pages/profile_calendar.scss @@ -168,7 +168,7 @@ .fc-multimonth-title { font-size: 14px !important; font-variant: all-small-caps; - padding: $mui-grid-padding !important; + padding: $mui-grid-padding * 3 $mui-grid-padding $mui-grid-padding !important; text-align: left !important; font-weight: 600 !important; } From ff5df2a6c8ab8a7f47477c1b563051eff39cf675 Mon Sep 17 00:00:00 2001 From: Vidya Ramakrishnan Date: Tue, 30 Apr 2024 15:12:06 +0530 Subject: [PATCH 14/15] Remove extra class --- funnel/assets/sass/pages/profile_calendar.scss | 2 +- funnel/templates/profile_calendar.html.jinja2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/funnel/assets/sass/pages/profile_calendar.scss b/funnel/assets/sass/pages/profile_calendar.scss index 31a206713..646e02a6b 100644 --- a/funnel/assets/sass/pages/profile_calendar.scss +++ b/funnel/assets/sass/pages/profile_calendar.scss @@ -179,7 +179,7 @@ } .fc-daygrid-day-events{ - top: -$mui-grid-padding/2; + top: -$mui-grid-padding/4; } .fc-daygrid-day-frame { diff --git a/funnel/templates/profile_calendar.html.jinja2 b/funnel/templates/profile_calendar.html.jinja2 index 3a6233736..0426f2d58 100644 --- a/funnel/templates/profile_calendar.html.jinja2 +++ b/funnel/templates/profile_calendar.html.jinja2 @@ -79,7 +79,7 @@
-
+
{{ date }} From 06c296b6abb65ce3f72a47426266fd783dc2b1fa Mon Sep 17 00:00:00 2001 From: anishTP Date: Tue, 30 Apr 2024 16:32:40 +0530 Subject: [PATCH 15/15] Tweaked styling on the filter icon and cleaned up the calendar header --- funnel/assets/sass/pages/profile_calendar.scss | 15 ++++++++++++--- funnel/templates/profile_calendar.html.jinja2 | 6 +++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/funnel/assets/sass/pages/profile_calendar.scss b/funnel/assets/sass/pages/profile_calendar.scss index 9293b0d98..0ba3690ce 100644 --- a/funnel/assets/sass/pages/profile_calendar.scss +++ b/funnel/assets/sass/pages/profile_calendar.scss @@ -26,20 +26,24 @@ .calendar__wrapper__calendar__toolbar { float: right; padding: math.div($mui-grid-padding, 2) $mui-grid-padding; + width: 100%; position: relative; align-items: center; z-index: 3; .calendar__wrapper__calendar__toolbar__month { font-size: 14px; - margin-top: 8px; - width: 120px; - text-align: center; + width: 100%; + height: 27px; + margin: math.div(-$mui-grid-padding, 2) math.div($mui-grid-padding, 2); + text-align: left; font-variant: all-small-caps; } .calendar__wrapper__calendar__toolbar__filter { height: 30.6px; + margin-right: math.div($mui-grid-padding, 1.25); + margin-top: math.div(-$mui-grid-padding, 8); } .calendar__wrapper__calendar__toolbar__filter__menu { @@ -173,6 +177,11 @@ font-weight: 600 !important; } +.fc-button { + padding: 0; + margin-left: math.div(-$mui-grid-padding, 4); +} + .fc-view-harness { height: 260px !important; } diff --git a/funnel/templates/profile_calendar.html.jinja2 b/funnel/templates/profile_calendar.html.jinja2 index 3a6233736..f814fb44d 100644 --- a/funnel/templates/profile_calendar.html.jinja2 +++ b/funnel/templates/profile_calendar.html.jinja2 @@ -80,11 +80,10 @@ calendar__wrapper__calendar">
- + {{ date }} -
- +

{{ gettext('Format') }}

@@ -134,6 +133,7 @@
+
@@ -68,7 +68,7 @@
Accepting proposalsMember accessFree
-

{{ propertyVal(event, 'venue') }}

+

{{ propertyVal(event, 'venue') }}