From 05ede44fdc0e841813e4771765dced2ab2f6a61d Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Mon, 7 Dec 2020 12:27:21 +0200 Subject: [PATCH 1/2] fixes #5229 --- .../HallOfFamePage/Finalists/index.jsx | 1 + .../HallOfFamePage/FunFacts/styles.scss | 5 ++--- src/shared/components/HallOfFamePage/HoF.jsx | 2 +- .../components/HallOfFamePage/styles.scss | 22 ++++++++++++++++--- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/shared/components/HallOfFamePage/Finalists/index.jsx b/src/shared/components/HallOfFamePage/Finalists/index.jsx index d3d74c0265..e4fc92b119 100644 --- a/src/shared/components/HallOfFamePage/Finalists/index.jsx +++ b/src/shared/components/HallOfFamePage/Finalists/index.jsx @@ -34,6 +34,7 @@ function findTheme(track) { case 'DEVELOPMENT': case 'FIRST2FINISH': case 'MOD DASH': + case 'QA': return developmentAndFirst2finishTheme; case 'STUDIO': case 'UI DESIGN': diff --git a/src/shared/components/HallOfFamePage/FunFacts/styles.scss b/src/shared/components/HallOfFamePage/FunFacts/styles.scss index 89e066ac61..ad86d74fa0 100644 --- a/src/shared/components/HallOfFamePage/FunFacts/styles.scss +++ b/src/shared/components/HallOfFamePage/FunFacts/styles.scss @@ -1,7 +1,7 @@ @import "~styles/mixins"; .container { - align-items: center; + align-items: stretch; display: flex; justify-content: space-between; @@ -15,7 +15,6 @@ .fact { background-color: #fff; border-radius: 4px; - height: 330px; width: 360px; @include xs-to-lg { @@ -48,10 +47,10 @@ border-top: solid 4px #5cc900; color: #000; font-size: 15px; - height: 150px; line-height: 25px; padding: 15px; text-align: left; + margin-top: -3px; a, a:visited { diff --git a/src/shared/components/HallOfFamePage/HoF.jsx b/src/shared/components/HallOfFamePage/HoF.jsx index aeb380d546..4954077d9b 100644 --- a/src/shared/components/HallOfFamePage/HoF.jsx +++ b/src/shared/components/HallOfFamePage/HoF.jsx @@ -243,7 +243,7 @@ const HallOfFamePage = ({ eventId, hallOfFame }) => { { data.fields.spiritAwardWinners && (
-

Spirit Award

+

SPIRIT AWARD WINNER

{ _.map( diff --git a/src/shared/components/HallOfFamePage/styles.scss b/src/shared/components/HallOfFamePage/styles.scss index bad47a9ab3..cb7448faaa 100644 --- a/src/shared/components/HallOfFamePage/styles.scss +++ b/src/shared/components/HallOfFamePage/styles.scss @@ -179,6 +179,7 @@ img { min-height: 375px; + max-height: 100%; width: 100%; } @@ -253,6 +254,7 @@ margin: 0; padding: 0; width: 127px; + white-space: nowrap; } margin: 7px; @@ -374,13 +376,23 @@ } .spirit-awards { - margin-top: 50px; + margin: 40px auto 60px auto; display: flex; flex-direction: column; - align-items: center; + border: 1px solid #e2c6f3; + border-radius: 4px; + width: 173px; h3 { - margin-bottom: 20px; + margin: 0; + background-color: #914da5; + border-radius: 4px 4px 0 0; + color: #fff; + font-family: Roboto, sans-serif; + font-size: 13px; + line-height: 30px; + text-align: center; + font-weight: bold; } .spirit-awards-wrap { @@ -390,5 +402,9 @@ a { font-size: 16px; } + + p { + margin: 0; + } } } From a47b1ad7a801c8fc1bc53cc7352fdfb74b617241 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Mon, 7 Dec 2020 12:29:10 +0200 Subject: [PATCH 2/2] ci: on test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 086cb438b1..776baec704 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -237,7 +237,7 @@ workflows: filters: branches: only: - - free + - hall-of-fame-fixes # This is alternate dev env for parallel testing - "build-qa": context : org-global