Skip to content

merge to master #3156

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.

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 23 commits into from
Jul 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
91f608d
merge for topcoderfooter/style.scss
sushilshinde Jul 25, 2019
9442f7c
Merge pull request #2932 from r0hit-gupta/msft30
sushilshinde Jul 25, 2019
8a02238
Merge pull request #2937 from r0hit-gupta/msft17
sushilshinde Jul 25, 2019
65109a7
Merge pull request #2947 from r0hit-gupta/msft133
sushilshinde Jul 28, 2019
2f83581
Merge pull request #2970 from r0hit-gupta/msft16
sushilshinde Jul 22, 2019
d9b8d45
Merge pull request #2994 from r0hit-gupta/msft16-mobile-fix
sushilshinde Jul 25, 2019
a42736b
Merge pull request #2998 from anonymousjaggu/fix-2846
sushilshinde Jul 28, 2019
bfb9d03
Merge pull request #3007 from afrisalyp/issue-2902
sushilshinde Jul 26, 2019
c78347d
Merge pull request #3056 from romitgit/MSFT-122-Issue#2820
sushilshinde Jul 26, 2019
2725a1c
Merge pull request #3057 from romitgit/MSFT-127-Issue#2825
sushilshinde Jul 26, 2019
9ff1838
Merge pull request #3114 from asadath1395/qa-accessibility-2911-new
sushilshinde Jul 28, 2019
bab771c
Merge pull request #3117 from asadath1395/qa-access-2824
sushilshinde Jul 28, 2019
b9fb15e
Merge pull request #3119 from PrakashDurlabhji/issue_2810_1
sushilshinde Jul 26, 2019
e3a16d1
Merge pull request #3121 from gets0ul/issue-2832-fix
sushilshinde Jul 26, 2019
e823b90
Merge pull request #3143 from r0hit-gupta/msft148
sushilshinde Jul 28, 2019
8a8b02b
Merge pull request #3144 from r0hit-gupta/msft149
sushilshinde Jul 28, 2019
f25e590
Merge pull request #3145 from r0hit-gupta/msft107
sushilshinde Jul 28, 2019
2448bbb
Merge pull request #3149 from rashmi73/issue_2907_1
sushilshinde Jul 29, 2019
d6636d3
Merge pull request #2937 from r0hit-gupta/msft17
sushilshinde Jul 25, 2019
ec01c84
Merge pull request #2943 from PrakashDurlabhji/issue_2754
sushilshinde Jul 20, 2019
9ba0248
Merge pull request #3057 from romitgit/MSFT-127-Issue#2825
sushilshinde Jul 26, 2019
cb44b84
corrected code https://github.com/topcoder-platform/community-app/iss…
sushilshinde Jul 29, 2019
662177f
Merge pull request #3154 from topcoder-platform/release-qa-accessibility
sushilshinde Jul 29, 2019
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ exports[`Default render 1`] = `
className="src-shared-components-TopcoderHeader-___style__main-desktop-header___oqm_l"
>
<a
aria-label="Topcoder Homepage"
className="src-shared-components-TopcoderHeader-___style__logo___2WLJ0"
href="https://www.topcoder-dev.com"
>
Expand Down Expand Up @@ -286,6 +287,7 @@ exports[`Render with open menu 1`] = `
className="src-shared-components-TopcoderHeader-___style__main-desktop-header___oqm_l"
>
<a
aria-label="Topcoder Homepage"
className="src-shared-components-TopcoderHeader-___style__logo___2WLJ0"
href="https://www.topcoder-dev.com"
>
Expand Down Expand Up @@ -574,6 +576,7 @@ exports[`Render with specified profile 1`] = `
className="src-shared-components-TopcoderHeader-___style__main-desktop-header___oqm_l"
>
<a
aria-label="Topcoder Homepage"
className="src-shared-components-TopcoderHeader-___style__logo___2WLJ0"
href="https://www.topcoder-dev.com"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ exports[`Matches shallow shapshot 1`] = `
endDatePlaceholderText="End Date"
firstDayOfWeek={null}
focusedInput={null}
hideKeyboardShortcutsPanel={true}
hideKeyboardShortcutsPanel={false}
horizontalMargin={0}
initialVisibleMonth={null}
inputIconPosition="before"
Expand Down Expand Up @@ -46,6 +46,7 @@ exports[`Matches shallow shapshot 1`] = `
"calendarLabel": "Calendar",
"chooseAvailableEndDate": [Function],
"chooseAvailableStartDate": [Function],
"clearDate": "Clear Date",
"clearDates": "Clear Dates",
"closeDatePicker": "Close",
"dateIsSelected": [Function],
Expand All @@ -57,8 +58,8 @@ exports[`Matches shallow shapshot 1`] = `
"focusStartDate": "Interact with the calendar and add the check-in date for your trip.",
"hideKeyboardShortcutsPanel": "Close the shortcuts panel.",
"homeEnd": "Home and end keys",
"jumpToNextMonth": "Move forward to switch to the next month.",
"jumpToPrevMonth": "Move backward to switch to the previous month.",
"jumpToNextMonth": "Next Month",
"jumpToPrevMonth": "Previous Month",
"keyboardNavigationInstructions": "Press the down arrow key to interact with the calendar and
select a date. Press the question mark key to get the keyboard shortcuts for changing dates.",
"keyboardShortcuts": "Keyboard Shortcuts",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ exports[`Matches shallow shapshot 1`] = `
},
]
}
placeholder="Select Keywords"
selectRef={[Function]}
simpleValue={true}
value={null}
Expand Down Expand Up @@ -131,6 +132,7 @@ exports[`Matches shallow shapshot 1`] = `
},
]
}
placeholder="Select Subtrack"
selectRef={[Function]}
simpleValue={true}
value={null}
Expand Down Expand Up @@ -276,6 +278,7 @@ exports[`Matches shallow shapshot 2`] = `
multi={true}
onChange={[Function]}
options={Array []}
placeholder="Select Keywords"
selectRef={[Function]}
simpleValue={true}
value={null}
Expand Down Expand Up @@ -336,6 +339,7 @@ exports[`Matches shallow shapshot 2`] = `
multi={true}
onChange={[Function]}
options={Array []}
placeholder="Select Subtrack"
selectRef={[Function]}
simpleValue={true}
value={null}
Expand Down
2 changes: 1 addition & 1 deletion src/client/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
* the page by Topcoder accounts-app. */
#tc-accounts-iframe {
border: none;
display: block;
display: none;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ Uploading:
}).then(file => this.onSuccess(file, path));
return undefined;
}}
role="button"
role="tab"
styleName="drop-zone-mask"
tabIndex={0}
aria-label="Select file to upload"
Expand Down
7 changes: 4 additions & 3 deletions src/shared/components/SubmissionPage/Submit/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -316,14 +316,15 @@ Please follow the instructions on the Challenge Details page regarding
<input
type="checkbox"
id="agree"
aria-label="I understand and agree"
onChange={e => setAgreed(e.target.checked)}
/>
<label htmlFor="agree">
<div styleName="tc-checkbox-label">
I UNDERSTAND AND AGREE
</div>
<input type="hidden" />
</label>
<div styleName="tc-checkbox-label">
I UNDERSTAND AND AGREE
</div>
</div>
<PrimaryButton
type="submit"
Expand Down
15 changes: 12 additions & 3 deletions src/shared/components/SubmissionPage/Submit/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
}

a {
color: #1f7be7;
color: $tc-dark-blue-110;
cursor: pointer;
}

Expand Down Expand Up @@ -163,7 +163,7 @@
}

a {
color: #1a85ff;
color: $tc-dark-blue-110;
}

.tc-checkbox-label {
Expand All @@ -187,7 +187,12 @@
margin-bottom: 30px;

input[type=checkbox] {
display: none;
visibility: visible;
position: absolute;
opacity: 0;
cursor: pointer;
height: 0;
width: 0;
}

label {
Expand Down Expand Up @@ -230,6 +235,10 @@
border-color: $tc-dark-blue;
}

input[type=checkbox]:focus ~ label {
outline: 2px auto $tc-dark-blue;
}

input[type=checkbox]:checked + label::after {
opacity: 1;
border-color: $tc-white;
Expand Down
2 changes: 0 additions & 2 deletions src/shared/components/TopcoderFooter/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
text-align: center;
font-family: "Roboto", Helvetica, Arial, sans-serif;
font-size: 12px;
color: $tc-gray-60;
color: $tc-gray-40;
color: $tc-gray-30;
}

Expand Down
6 changes: 3 additions & 3 deletions src/shared/components/TopcoderHeader/Auth/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
}

.tc-btn-default {
border: 1px solid $tc-dark-blue;
color: $tc-dark-blue;
border: 1px solid $tc-dark-blue-110;
color: $tc-dark-blue-110;

&:hover {
background: $tc-dark-blue;
background: $tc-dark-blue-110;
color: $tc-white;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/shared/components/TopcoderHeader/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ export default class TopcoderHeader extends React.Component {
}}
>
<div styleName="main-desktop-header">
<a href={BASE_URL} styleName="logo">
<a href={BASE_URL} styleName="logo" aria-label="Topcoder Homepage">
<LogoTopcoderWithName height={53} width={135} />
</a>
<ul styleName="main-menu" ref={(ul) => { this.mainMenu = ul; }}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default function Header({
styleName="header"
tabIndex={0}
>
{<LogoTopcoder styleName="logo" />}
{<span aria-label="Topcoder Homepage" role="banner"><LogoTopcoder styleName="logo" /></span>}
<div styleName="menu">
Menu
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default function DeadlinesPanel({ deadlines }) {
const started = moment(start).isBefore(moment());

return (
<div styleName="panel">
<div styleName="panel" tabIndex="0" role="tabpanel">
<p styleName="timezone">
Timezone:
{moment.tz.guess()}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ export default function ChallengeViewSelector(props) {
<div styleName="mask right" />
<div styleName="challenge-view-selector">
<a
tabIndex="0"
role="tab"
aria-selected={selectedView === DETAIL_TABS.DETAILS}
onClick={(e) => { handleSelectorClicked(e, DETAIL_TABS.DETAILS); }}
onKeyPress={(e) => { handleSelectorClicked(e, DETAIL_TABS.DETAILS); }}
styleName={getSelectorStyle(selectedView, DETAIL_TABS.DETAILS)}
Expand All @@ -82,6 +85,9 @@ DETAILS
{
numRegistrants ? (
<a
tabIndex="0"
role="tab"
aria-selected={selectedView === DETAIL_TABS.REGISTRANTS}
onClick={(e) => {
handleSelectorClicked(e, DETAIL_TABS.REGISTRANTS);
}}
Expand All @@ -100,6 +106,9 @@ REGISTRANTS (
trackLower === 'design' && checkpointCount > 0
&& (
<a
tabIndex="0"
role="tab"
aria-selected={selectedView === DETAIL_TABS.CHECKPOINTS}
onClick={(e) => { handleSelectorClicked(e, DETAIL_TABS.CHECKPOINTS); }}
onKeyPress={(e) => { handleSelectorClicked(e, DETAIL_TABS.CHECKPOINTS); }}
styleName={getSelectorStyle(selectedView, DETAIL_TABS.CHECKPOINTS)}
Expand All @@ -113,6 +122,9 @@ CHECKPOINTS (
{
numSubmissions ? (
<a
tabIndex="0"
role="tab"
aria-selected={selectedView === DETAIL_TABS.SUBMISSIONS}
onClick={(e) => { handleSelectorClicked(e, DETAIL_TABS.SUBMISSIONS); }}
onKeyPress={(e) => { handleSelectorClicked(e, DETAIL_TABS.SUBMISSIONS); }}
styleName={getSelectorStyle(selectedView, DETAIL_TABS.SUBMISSIONS)}
Expand All @@ -126,6 +138,9 @@ SUBMISSIONS (
{
numWinners ? (
<a
tabIndex="0"
role="tab"
aria-selected={selectedView === DETAIL_TABS.WINNERS}
onClick={(e) => { handleSelectorClicked(e, DETAIL_TABS.WINNERS); }}
onKeyPress={(e) => { handleSelectorClicked(e, DETAIL_TABS.WINNERS); }}
styleName={getSelectorStyle(selectedView, DETAIL_TABS.WINNERS)}
Expand Down
4 changes: 2 additions & 2 deletions src/shared/components/challenge-detail/Header/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,9 @@ export default function ChallengeHeader(props) {
</div>
<div styleName="prizes-ops-container">
<div styleName="prizes-outer-container">
<h3 styleName="prizes-title">
<h2 styleName="prizes-title">
PRIZES
</h3>
</h2>
<Prizes prizes={prizes && prizes.length ? prizes : [0]} pointPrizes={pointPrizes} />
{
bonusType ? (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export default class ShareSocial extends React.Component {
<a
className="addthis_button_facebook"
title="Facebook"
aria-label="Share via Facebook"
href="#"
>
<div styleName="facebook-icon">
Expand All @@ -46,13 +47,15 @@ f
<a
className="addthis_button_twitter"
title="Twitter"
aria-label="Share via Twitter"
href="#"
>
<TwitterIcon />
</a>
<a
className="addthis_button_print"
title="Print"
aria-label="Print this challenge"
href="#"
>
<PrintIcon />
Expand All @@ -61,13 +64,15 @@ f
className="addthis_button_email"
target="_blank"
title="Email"
aria-label="Email this challenge"
href="#"
>
<EmailIcon />
</a>
<a
className="addthis_button_compact"
href="#"
aria-label="More sharing options"
>
<MoreIcon />
</a>
Expand Down
Loading