From 302385e84517c6bae28f1429d3972d0c3985f45c Mon Sep 17 00:00:00 2001 From: anishTP Date: Thu, 21 Sep 2023 21:25:46 +0530 Subject: [PATCH] Fixed the view in small and medium breakpoints --- funnel/assets/sass/components/_card.scss | 4 +- funnel/assets/sass/pages/index.scss | 35 +++++++++++---- funnel/templates/profile_layout.html.jinja2 | 49 +++++++++++++++++---- 3 files changed, 69 insertions(+), 19 deletions(-) diff --git a/funnel/assets/sass/components/_card.scss b/funnel/assets/sass/components/_card.scss index cadd300f2..247b8f7e5 100644 --- a/funnel/assets/sass/components/_card.scss +++ b/funnel/assets/sass/components/_card.scss @@ -355,7 +355,7 @@ padding-bottom: 56.2%; z-index: 2; overflow: hidden; - border-radius: 0 0 0 20px; + border-radius: 0 0 0 16px; .card__image { position: absolute; @@ -434,7 +434,7 @@ display: block; height: 100%; opacity: 0.7; - border-radius: 0 0 0 20px; + border-radius: 0 0 0 16px; } .card--small { diff --git a/funnel/assets/sass/pages/index.scss b/funnel/assets/sass/pages/index.scss index cda82ae5d..4cd422631 100644 --- a/funnel/assets/sass/pages/index.scss +++ b/funnel/assets/sass/pages/index.scss @@ -31,6 +31,11 @@ } } +.card--spotlight__body { + padding: 0 $mui-grid-padding $mui-grid-padding; + position: relative; +} + @media (min-width: 768px) { .homepage { .logo-about { @@ -41,6 +46,10 @@ padding-top: $mui-header-height; } } + .card--spotlight__body { + padding: 0 $mui-grid-padding $mui-grid-padding; + position: relative; + } } @media (min-width: 992px) { @@ -50,6 +59,9 @@ margin-top: 0; } } + .card--spotlight__body { + display: none; + } } .card--spotlight { @@ -80,15 +92,17 @@ } } + .spotlight__badge { margin: 0; - padding: $mui-grid-padding * 0.25 $mui-grid-padding; + padding: $mui-grid-padding * 0.25 $mui-grid-padding * 0.5; width: auto; - min-width: 32px; color: $mui-text-hyperlink; text-decoration: none; border-radius: 16px; font-weight: 700; + font-size: 14px; + line-height: 14px; background: transparentize($mui-primary-color, 0.85); border: 2px solid transparentize($mui-primary-color, 0.8); .spotlight__badge__footer { @@ -99,9 +113,14 @@ @media (min-width: 992px) { .card--spotlight { display: flex !important; - max-width: 100%; border-radius: 16px 16px 0 16px; - min-height: 290px; + overflow: hidden; + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.19); + max-width: 100%; + transition: 200ms linear; + -webkit-transition: 200ms linear; + height: 100%; + .card__image-wrapper { flex: 100%; @@ -118,11 +137,9 @@ } } - .card__body { - position: relative; - padding: $mui-grid-padding-double $mui-grid-padding; - width: 100%; - } + } + .card--spotlight__image-wrapper { + border-radius: 16px !important; } .card--spotlight--live { padding: $mui-grid-padding; diff --git a/funnel/templates/profile_layout.html.jinja2 b/funnel/templates/profile_layout.html.jinja2 index 731c7ed1b..3fd8c12e8 100644 --- a/funnel/templates/profile_layout.html.jinja2 +++ b/funnel/templates/profile_layout.html.jinja2 @@ -84,20 +84,28 @@ {{ featured_project.account.title }} - +
+ {{ faicon(icon='lock', icon_size='caption', baseline=false) }}

{{ featured_project.title }}

{{ featured_project.tagline }}

-

{{ featured_project.description_text }}

+

{{ featured_project.description_text }}

+ {% if calendarwidget_compact and featured_project.start_at and featured_project.calendar_weeks_compact.weeks and featured_project.calendar_weeks_compact.weeks|length > 0 %} +
+ {{ calendarwidget(featured_project.calendar_weeks_compact) }} +
+ {% elif featured_project.start_at and featured_project.calendar_weeks_full.weeks and featured_project.calendar_weeks_full.weeks|length > 0 %} +
+ {{ calendarwidget(featured_project.calendar_weeks_full, compact=false) }} +
+ {% endif %} +
{% if featured_project.primary_venue %}{{ faicon(icon='map-marker-alt', icon_size='caption', baseline=false) }} {% if featured_project.primary_venue.city %}{{ featured_project.primary_venue.city }}{% else %}{{ featured_project.primary_venue.title }}{% endif %}{% elif featured_project.location %}{{ faicon(icon='map-marker-alt', icon_size='caption', baseline=false) }} {{ featured_project.location }}{% endif %}
{% if featured_project.primary_venue %}{{ faicon(icon='map-marker-alt', icon_size='caption', baseline=false) }} {% if featured_project.primary_venue.city %}{{ featured_project.primary_venue.city }}{% else %}{{ featured_project.primary_venue.title }}{% endif %}{% elif featured_project.location %}{{ faicon(icon='map-marker-alt', icon_size='caption', baseline=false) }} {{ featured_project.location }}{% endif %}
{%- if (featured_project.start_at is not none and featured_project.calendar_weeks_full.weeks and featured_project.calendar_weeks_full.weeks|length > 0) %} -
+
{% if calendarwidget_compact and featured_project.start_at and featured_project.calendar_weeks_compact.weeks and featured_project.calendar_weeks_compact.weeks|length > 0 %}
{{ calendarwidget(featured_project.calendar_weeks_compact) }} @@ -116,9 +124,9 @@
{% endif %} -
+
-
+
@@ -148,6 +156,31 @@ {% endif %}
+ {%- if (featured_project.start_at is not none and featured_project.calendar_weeks_full.weeks and featured_project.calendar_weeks_full.weeks|length > 0) %} +
+
+ {% if calendarwidget_compact and featured_project.start_at and featured_project.calendar_weeks_compact.weeks and featured_project.calendar_weeks_compact.weeks|length > 0 %} +
+ {{ calendarwidget(featured_project.calendar_weeks_compact) }} +
+ {% elif featured_project.start_at and featured_project.calendar_weeks_full.weeks and featured_project.calendar_weeks_full.weeks|length > 0 %} +
+ {{ calendarwidget(featured_project.calendar_weeks_full, compact=false) }} +
+ {% endif %} + +
+
{% if featured_project.primary_venue %}{{ faicon(icon='map-marker-alt', icon_size='caption', baseline=false) }} {% if featured_project.primary_venue.city %}{{ featured_project.primary_venue.city }}{% else %}{{ featured_project.primary_venue.title }}{% endif %}{% elif featured_project.location %}{{ faicon(icon='map-marker-alt', icon_size='caption', baseline=false) }} {{ featured_project.location }}{% endif %}
+
+ +
+
+
+
+ {% endif %}
{% if featured_project and featured_project.schedule_start_at -%}