From 3a1f49d1e57edbb86a58546c1cf7311a85fcc784 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Tue, 18 Jun 2019 14:18:08 +0530 Subject: [PATCH 1/6] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ceb823731b..90911968e8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -189,7 +189,7 @@ workflows: filters: branches: only: - - hot-fixes-2 + - hot-fixes-4 - develop - general-features - develop-from-master-23may From e289996620b92a91bd02b296aab01f6f588ae9e4 Mon Sep 17 00:00:00 2001 From: Sushil Shinde Date: Thu, 20 Jun 2019 08:29:10 +0530 Subject: [PATCH 2/6] deploying hot-fixes-4 on dev deploying hot-fixes-4 on dev --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 90911968e8..d9d4bf17bd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -175,6 +175,7 @@ workflows: branches: only: - develop-from-master-23may + - hot-fixes-4 # This is alternate dev env for parallel testing - "build-test": context : org-global @@ -189,7 +190,6 @@ workflows: filters: branches: only: - - hot-fixes-4 - develop - general-features - develop-from-master-23may From 0a0604fcb965f09417a0d35bfc27ea8bb189e6e1 Mon Sep 17 00:00:00 2001 From: Gurmeet Singh Budhraja Date: Fri, 21 Jun 2019 02:36:04 +0530 Subject: [PATCH 3/6] Fix for issue #2642 --- .../Settings/Profile/Skills/index.jsx | 9 +++++-- .../Settings/Profile/Skills/styles.scss | 27 +++++++++++++------ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/shared/components/Settings/Profile/Skills/index.jsx b/src/shared/components/Settings/Profile/Skills/index.jsx index 5b074890fa..f06ae0af1c 100644 --- a/src/shared/components/Settings/Profile/Skills/index.jsx +++ b/src/shared/components/Settings/Profile/Skills/index.jsx @@ -20,6 +20,7 @@ import ConsentComponent from 'components/Settings/ConsentComponent'; import DevFallbackIcon from 'assets/images/profile/skills/id-develop.svg'; import DesignFallbackIcon from 'assets/images/profile/skills/id-design.svg'; import DataFallbackIcon from 'assets/images/profile/skills/id-data.svg'; +import VerifiedBadgeIcon from 'assets/images/verified-skill-badge.svg'; import { isomorphy } from 'topcoder-react-utils'; import './styles.scss'; @@ -303,6 +304,7 @@ export default class Skills extends ConsentComponent { skill.id === arraySkill[i].tagId )); if (result && result.length > 0) { + result[0].sources = arraySkill[i].sources; filterUserSkills.push(result[0]); if (_.some(result[0].categories, category => category.toLowerCase() === 'design')) { design.push(result[0].name); @@ -505,8 +507,11 @@ export default class Skills extends ConsentComponent {
{ imageExist(`id-${skill.id}.svg`) ? getImage(`id-${skill.id}.svg`) : }
-
- {_.truncate(skill.name, { length: 18, separator: ' ' })} +
+
+ {_.truncate(skill.name, { length: 18, separator: ' ' })} +
+ {_.includes(skill.sources, 'CHALLENGE') &&
}
diff --git a/src/shared/components/Settings/Profile/Skills/styles.scss b/src/shared/components/Settings/Profile/Skills/styles.scss index 7e8beed30d..86179a4eef 100644 --- a/src/shared/components/Settings/Profile/Skills/styles.scss +++ b/src/shared/components/Settings/Profile/Skills/styles.scss @@ -317,15 +317,26 @@ } } - .name { - @include roboto-regular; - + .name-wrapper { margin-top: 10px; - font-size: 12px; - line-height: 15px; - color: #262628; - text-align: center; - width: 100%; + display: flex; + align-items: center; + justify-content: center; + + .name { + @include roboto-regular; + + font-size: 12px; + line-height: 15px; + color: #262628; + text-align: center; + width: 100%; + } + + .verified-badge { + padding-left: 5px; + font-size: 0; + } } a.skill-hidden { From 17a75a54c67137a5327bc223692cac35bcf19346 Mon Sep 17 00:00:00 2001 From: Gurmeet Singh Budhraja Date: Sat, 22 Jun 2019 14:03:39 +0530 Subject: [PATCH 4/6] fix alignment for safari --- src/shared/components/Settings/Profile/Skills/styles.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/components/Settings/Profile/Skills/styles.scss b/src/shared/components/Settings/Profile/Skills/styles.scss index 86179a4eef..fdcb484cf8 100644 --- a/src/shared/components/Settings/Profile/Skills/styles.scss +++ b/src/shared/components/Settings/Profile/Skills/styles.scss @@ -318,7 +318,7 @@ } .name-wrapper { - margin-top: 10px; + margin-top: 20px; display: flex; align-items: center; justify-content: center; From 7a7bb3821506cfe7ce55d70e286584a406637937 Mon Sep 17 00:00:00 2001 From: Gurmeet Singh Budhraja Date: Thu, 27 Jun 2019 16:30:53 +0530 Subject: [PATCH 5/6] incorporate feedback --- .../Settings/Profile/Skills/index.jsx | 12 ++--- .../Settings/Profile/Skills/styles.scss | 51 ++++++++++--------- 2 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/shared/components/Settings/Profile/Skills/index.jsx b/src/shared/components/Settings/Profile/Skills/index.jsx index f06ae0af1c..a175fd0645 100644 --- a/src/shared/components/Settings/Profile/Skills/index.jsx +++ b/src/shared/components/Settings/Profile/Skills/index.jsx @@ -507,13 +507,13 @@ export default class Skills extends ConsentComponent {
{ imageExist(`id-${skill.id}.svg`) ? getImage(`id-${skill.id}.svg`) : }
-
-
- {_.truncate(skill.name, { length: 18, separator: ' ' })} -
- {_.includes(skill.sources, 'CHALLENGE') &&
} -
+
+
+ {_.truncate(skill.name, { length: 18, separator: ' ' })} +
+ {_.includes(skill.sources, 'CHALLENGE') &&
} +
); diff --git a/src/shared/components/Settings/Profile/Skills/styles.scss b/src/shared/components/Settings/Profile/Skills/styles.scss index fdcb484cf8..958e3686fe 100644 --- a/src/shared/components/Settings/Profile/Skills/styles.scss +++ b/src/shared/components/Settings/Profile/Skills/styles.scss @@ -228,7 +228,7 @@ } li { - margin: 0 10px 55px; + margin: 0 10px 10px; border-radius: 6px; @include xs-to-lg { @@ -261,6 +261,31 @@ text-decoration: none; } + .name-wrapper { + position: relative; + display: flex; + flex-direction: row; + justify-content: center; + align-items: center; + width: 75px; + padding: 5px 0px 10px; + flex-shrink: 0; + + .name { + @include roboto-regular; + + font-size: 12px; + line-height: 15px; + color: #262628; + text-align: center; + } + + .verified-badge { + padding-left: 5px; + font-size: 0; + } + } + .skill-icon { position: relative; display: flex; @@ -268,7 +293,7 @@ justify-content: center; align-items: center; background-color: #fbfbfb; - padding: 10px; + padding: 0px 10px 0px; border: 1px solid $tc-gray-20; border-radius: 6px; height: 75px; @@ -317,28 +342,6 @@ } } - .name-wrapper { - margin-top: 20px; - display: flex; - align-items: center; - justify-content: center; - - .name { - @include roboto-regular; - - font-size: 12px; - line-height: 15px; - color: #262628; - text-align: center; - width: 100%; - } - - .verified-badge { - padding-left: 5px; - font-size: 0; - } - } - a.skill-hidden { img { opacity: 0.3; From 8590a402f2085bf4e12dc3e2fe0a4df0f0c99039 Mon Sep 17 00:00:00 2001 From: Gurmeet Singh Budhraja Date: Thu, 27 Jun 2019 16:39:58 +0530 Subject: [PATCH 6/6] incorporate feedback --- src/shared/components/Settings/Profile/Skills/styles.scss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/shared/components/Settings/Profile/Skills/styles.scss b/src/shared/components/Settings/Profile/Skills/styles.scss index 958e3686fe..7ad6f6e6d2 100644 --- a/src/shared/components/Settings/Profile/Skills/styles.scss +++ b/src/shared/components/Settings/Profile/Skills/styles.scss @@ -268,7 +268,8 @@ justify-content: center; align-items: center; width: 75px; - padding: 5px 0px 10px; + padding-top: 5px; + padding-bottom: 10px; flex-shrink: 0; .name { @@ -293,7 +294,7 @@ justify-content: center; align-items: center; background-color: #fbfbfb; - padding: 0px 10px 0px; + padding: 10px; border: 1px solid $tc-gray-20; border-radius: 6px; height: 75px;