From e68661fc096d61b035d76349e2bbab1322af8221 Mon Sep 17 00:00:00 2001 From: gildardoSOD <100874861+gildardoSOD@users.noreply.github.com> Date: Mon, 5 Dec 2022 10:46:43 -0800 Subject: [PATCH] Merge from Stg to Main (#445) * Merge from Dev to Stg (#436) * feat(SNW-24): Adjust styling on save my spot button (#413) * feat(SNW-26): Fix secret nfts page (#412) * feat(SNW-25): Adjust width and style in Countdown (#411) * feat(SNW-8): Implement Hero section (#416) * feat(SNW-10): Implement Banner section (#418) * feat(SNW-9): Implement Description Section (#417) * Remove unnecessary query fields * feat(SNW-11): Implement speakers section (#419) * feat(SNW-13): Implement announcement section (#421) * feat(SNW-12): Implement Sponsors section (#420) * feat(SNW-14): Implement About Secret and CTAs section (#422) * feat(SNW-17): Implement event started state (#423) * feat(SNW-16): Implement Summit Agenda page (#425) * feat(SNW-16): Implement Summit Agenda page * fix: Adjust fixes from Strapi to make site work * fix: Remove unnecesary user img * feat: Adjust time formats * feat(SNW-18): Integrate chat and live stream (#426) * feat(SNW-31): Adjust footer (#429) * feat(SNW-31): Adjust footer * feat: fix: Adjust first letter in text to uppercase * feat(SNW-29): Adjust breadcrumb with content in mobile (#428) * feat(SNW-28): Adjust color in UTC word (#427) * feat(SNW-36): Fix problem when sponsor image empty (#431) * feat(SNW-40): Adjust time column on Summit Agenda page (#434) * feat(SNW-35): Hide moderator cell if empty (#430) * feat(SNW-34): Adjust speaker image size on Speakers section (#435) * feat(SNW-33): Adjust styles in all buttons (#432) * feat(SNW-32): Add missing column headers on agenda table on mobile (#433) * Merge from Dev to Stg (#439) * feat(SNW-24): Adjust styling on save my spot button (#413) * feat(SNW-26): Fix secret nfts page (#412) * feat(SNW-25): Adjust width and style in Countdown (#411) * feat(SNW-8): Implement Hero section (#416) * feat(SNW-10): Implement Banner section (#418) * feat(SNW-9): Implement Description Section (#417) * Remove unnecessary query fields * feat(SNW-11): Implement speakers section (#419) * feat(SNW-13): Implement announcement section (#421) * feat(SNW-12): Implement Sponsors section (#420) * feat(SNW-14): Implement About Secret and CTAs section (#422) * feat(SNW-17): Implement event started state (#423) * feat(SNW-16): Implement Summit Agenda page (#425) * feat(SNW-16): Implement Summit Agenda page * fix: Adjust fixes from Strapi to make site work * fix: Remove unnecesary user img * feat: Adjust time formats * feat(SNW-18): Integrate chat and live stream (#426) * feat(SNW-31): Adjust footer (#429) * feat(SNW-31): Adjust footer * feat: fix: Adjust first letter in text to uppercase * feat(SNW-29): Adjust breadcrumb with content in mobile (#428) * feat(SNW-28): Adjust color in UTC word (#427) * feat(SNW-36): Fix problem when sponsor image empty (#431) * feat(SNW-40): Adjust time column on Summit Agenda page (#434) * feat(SNW-35): Hide moderator cell if empty (#430) * feat(SNW-34): Adjust speaker image size on Speakers section (#435) * feat(SNW-33): Adjust styles in all buttons (#432) * feat(SNW-32): Add missing column headers on agenda table on mobile (#433) * feat(SNW-42): Implement new Save my spot button (#438) * feat(SNW-42): Implement new Save my spot button * fix: Adjust script * fix: Adjust event script in Summit page * fix: Change script order * fix: Move script to function * feat: Add client only component * feat: Remove no script tag * Merge from Dev to Stg (#442) * feat(SNW-24): Adjust styling on save my spot button (#413) * feat(SNW-26): Fix secret nfts page (#412) * feat(SNW-25): Adjust width and style in Countdown (#411) * feat(SNW-8): Implement Hero section (#416) * feat(SNW-10): Implement Banner section (#418) * feat(SNW-9): Implement Description Section (#417) * Remove unnecessary query fields * feat(SNW-11): Implement speakers section (#419) * feat(SNW-13): Implement announcement section (#421) * feat(SNW-12): Implement Sponsors section (#420) * feat(SNW-14): Implement About Secret and CTAs section (#422) * feat(SNW-17): Implement event started state (#423) * feat(SNW-16): Implement Summit Agenda page (#425) * feat(SNW-16): Implement Summit Agenda page * fix: Adjust fixes from Strapi to make site work * fix: Remove unnecesary user img * feat: Adjust time formats * feat(SNW-18): Integrate chat and live stream (#426) * feat(SNW-31): Adjust footer (#429) * feat(SNW-31): Adjust footer * feat: fix: Adjust first letter in text to uppercase * feat(SNW-29): Adjust breadcrumb with content in mobile (#428) * feat(SNW-28): Adjust color in UTC word (#427) * feat(SNW-36): Fix problem when sponsor image empty (#431) * feat(SNW-40): Adjust time column on Summit Agenda page (#434) * feat(SNW-35): Hide moderator cell if empty (#430) * feat(SNW-34): Adjust speaker image size on Speakers section (#435) * feat(SNW-33): Adjust styles in all buttons (#432) * feat(SNW-32): Add missing column headers on agenda table on mobile (#433) * feat(SNW-42): Implement new Save my spot button (#438) * feat(SNW-42): Implement new Save my spot button * fix: Adjust script * fix: Adjust event script in Summit page * fix: Change script order * fix: Move script to function * feat: Add client only component * feat: Remove no script tag * feat: Adjust Homepage Summit button * Merge from Dev to Stg (#444) * feat: Remove icons from Summit buttons * Merge from Dev to Stg (#446) * feat: Adjust button execution for Summit buttons --- src/components/page/LandingSneakPeekEvent.vue | 4 +- src/components/summit/AnnouncementSection.vue | 13 +- src/components/summit/HeroSection.vue | 13 +- src/sass/_new-swirls.scss | 18 +-- src/templates/LearnArticle.vue | 149 ++++++------------ 5 files changed, 68 insertions(+), 129 deletions(-) diff --git a/src/components/page/LandingSneakPeekEvent.vue b/src/components/page/LandingSneakPeekEvent.vue index 6593dd17..821a85ab 100644 --- a/src/components/page/LandingSneakPeekEvent.vue +++ b/src/components/page/LandingSneakPeekEvent.vue @@ -128,8 +128,8 @@ export default { setTimeout(() => { this.sneakPeek(); this.addAdScript(); - this.addEventScript(); - }, 200); + setTimeout(() => this.addEventScript(), 500); + }, 100); }, }; diff --git a/src/components/summit/AnnouncementSection.vue b/src/components/summit/AnnouncementSection.vue index ea7d197a..6fd3f951 100644 --- a/src/components/summit/AnnouncementSection.vue +++ b/src/components/summit/AnnouncementSection.vue @@ -8,11 +8,7 @@ id="eventbrite-widget-modal-trigger-444225429217" type="button" > - check icon - {{ data.cta_button.title }} + {{ data.cta_button.title }} @@ -82,7 +78,8 @@ export default { gap: 6px; width: 100%; max-width: 261px; - padding: 22px 0; + padding-top: 25px; + padding-bottom: 22px; border-radius: 100px; font-size: 20px !important; font-weight: 700; @@ -92,10 +89,6 @@ export default { font-family: "Hind"; margin-bottom: 0; - span { - padding-top: 3px; - } - &:visited:hover, &:hover { color: var(--color-newBrand-blue-03); diff --git a/src/components/summit/HeroSection.vue b/src/components/summit/HeroSection.vue index 22207609..ce4faef7 100644 --- a/src/components/summit/HeroSection.vue +++ b/src/components/summit/HeroSection.vue @@ -15,11 +15,7 @@ id="eventbrite-widget-modal-trigger-444225429217" type="button" > - check icon - {{ data.cta_button.title }} + {{ data.cta_button.title }} @@ -68,7 +64,8 @@ export default { gap: 6px; width: 100%; max-width: 261px; - padding: 22px 0; + padding-top: 25px; + padding-bottom: 22px; border-radius: 100px; font-size: 20px !important; font-weight: 700; @@ -83,10 +80,6 @@ export default { background-color: var(--color-newBrand-blue-04); color: var(--color-analog-primary-white); } - - span { - padding-top: 3px; - } } &__wrapper { diff --git a/src/sass/_new-swirls.scss b/src/sass/_new-swirls.scss index 6a98900d..3c971951 100644 --- a/src/sass/_new-swirls.scss +++ b/src/sass/_new-swirls.scss @@ -167,24 +167,19 @@ } .orange__swirl__bottom{ - //background-image: url("../../src/assets/swirl-green-top.svg"); - // background-repeat: no-repeat; - // background-position: bottom; - // background-size: cover; height: 230px; position: relative; padding: 0; + margin-top: 64px; & .content{ - & .box{ - - & img{ position: absolute; left: 0; right: 0; - top: 0; + top: auto; + bottom: 0; width: 100%; z-index: -100; overflow: hidden; @@ -192,10 +187,13 @@ @include respond-to("<=m"){ display: none; } + + @include respond-to(">=xxl"){ + top: 0; + bottom: auto; + } } - } - } @include respond-to(">=xxl"){ diff --git a/src/templates/LearnArticle.vue b/src/templates/LearnArticle.vue index d1cd9270..0d0a56a6 100644 --- a/src/templates/LearnArticle.vue +++ b/src/templates/LearnArticle.vue @@ -25,22 +25,25 @@ - + -