Skip to content

Reskin profile - Cherry Pick #6587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 20, 2022
Merged

Reskin profile - Cherry Pick #6587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
70f6cc3
improvement(reskin-profile): change modal bg
dedywahyudi Jun 15, 2022
0fa8dd9
improvement(reskin-profile): change to #000
dedywahyudi Jun 15, 2022
b64338c
ci: deploy to QA
rakibansary Jun 15, 2022
72262e9
improvement(reskin-profile): edit page title
dedywahyudi Jun 17, 2022
ddabfe8
ci: reskin-profile to qa & beta
dedywahyudi Jun 17, 2022
abbb0d4
Merge branch 'develop' into reskin-profile
dedywahyudi Jun 17, 2022
ff10285
improvement(reskin-profile): verified badge
dedywahyudi Jun 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ workflows:
branches:
only:
- develop
- reskin-profile
# This is alternate dev env for parallel testing
- "build-test":
context : org-global
Expand All @@ -364,7 +363,7 @@ workflows:
filters:
branches:
only:
- free
- reskin-profile
# This is beta env for production soft releases
- "build-prod-beta":
context : org-global
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/Contentful/Modal/modal-styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $light-gray: #d4d4d4;
}

.overlay {
background-color: #2a2a2a;
background-color: #000;
opacity: 0.95;
border: none;
height: 100%;
Expand Down
10 changes: 9 additions & 1 deletion src/shared/components/ProfilePage/Activity/ActivityCard/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,15 @@ const ActivityCard = ({
subTracks.map((subtrack, index) => (
<div styleName="sub-track-item" key={index}>
<span styleName="title">
{_.upperFirst(subtrack.name.replace('FIRST_2_FINISH', 'FIRST2FINISH').replace(/_/g, ' ').toLowerCase())}
{(_.upperFirst(subtrack.name.replace('FIRST_2_FINISH', 'FIRST2FINISH').replace(/_/g, ' ').toLowerCase()))
.replace('First2finish', 'First2Finish')
.replace('Design first2finish', 'Design First2Finish')
.replace('Srm', 'SRM')
.replace('Ria build competition', 'RIA Build Competition')
.replace('Ria component competition', 'RIA Component Competition')
.replace('Design first2finish', 'Design First2Finish')
.replace('Ui prototype competition', 'UI Prototype Competition')
}
</span>

<div styleName="right">
Expand Down