Skip to content

Commit 0b4a62f

Browse files
committed
Merge branch 'develop' into reskin-profile
* develop: improvement(reskin): button submission alignment improvement(reskin): submission alignment ci: remove develop from Dev env Increase node memory # Conflicts: # .circleci/config.yml
2 parents 1767a1e + 1764e47 commit 0b4a62f

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"lint:js": "eslint --ext .js,.jsx .",
1515
"lint:scss": "stylelint **/*.scss --syntax scss",
1616
"update-tests": "npm run jest -- -u",
17-
"start": "cross-env BABEL_ENV=production NODE_ENV=production node ./bin/www",
17+
"start": "cross-env BABEL_ENV=production NODE_ENV=production node --max-old-space-size=8192 ./bin/www",
1818
"test": "npm run lint && npm run --runInBand jest",
1919
"commitlint": "commitlint -E HUSKY_GIT_PARAMS",
2020
"release:changelog": "npm run conventional-changelog -- -p angular -i CHANGELOG.md -s",

src/shared/components/challenge-detail/Submissions/index.jsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -828,13 +828,15 @@ class SubmissionsComponent extends React.Component {
828828
isMM && <div styleName="bottom-line" />
829829
}
830830
{isMM && (
831-
<Button
832-
disabled={!hasRegistered || unregistering || submissionEnded || isLegacyMM}
833-
theme={{ button: style.challengeAction }}
834-
to={`${challengesUrl}/${challengeId}/submit`}
835-
>
836-
Add Submission
837-
</Button>
831+
<div styleName="btn-add-submission">
832+
<Button
833+
disabled={!hasRegistered || unregistering || submissionEnded || isLegacyMM}
834+
theme={{ button: style.challengeAction }}
835+
to={`${challengesUrl}/${challengeId}/submit`}
836+
>
837+
Add Submission
838+
</Button>
839+
</div>
838840
)}
839841
{
840842
isMM && isShowInformation && (

src/shared/components/challenge-detail/Submissions/style.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222

223223
.container.dev {
224224
line-height: 50px;
225-
text-align: center;
225+
text-align: left;
226226

227227
@include xs-to-sm {
228228
line-height: 20px;
@@ -275,6 +275,10 @@
275275
}
276276
}
277277

278+
.btn-add-submission {
279+
text-align: center;
280+
}
281+
278282
.handle {
279283
color: $tc-dark-blue;
280284
}

0 commit comments

Comments
 (0)