diff --git a/.eslintrc b/.eslintrc index ddc5f09737..00def584cd 100644 --- a/.eslintrc +++ b/.eslintrc @@ -2,7 +2,8 @@ "extends": "./node_modules/topcoder-react-utils/config/eslint/default.json", "rules": { "jsx-a11y/anchor-is-valid": false, - "import/no-cycle": [2, { "maxDepth": 1 }] + "import/no-cycle": [2, { "maxDepth": 1 }], + "react/prop-types": ["error", { "ignore": ["challenge","eventDetails","winner","bucket","theme","submissionObject","profile","communitiesList","meta","scoreboard","item","activeTrigger","menuItems","scoreboard"] }] }, "env": { "browser": true diff --git a/__tests__/shared/__snapshots__/index.jsx.snap b/__tests__/shared/__snapshots__/index.jsx.snap index 026e3d21a9..2f1255577e 100644 --- a/__tests__/shared/__snapshots__/index.jsx.snap +++ b/__tests__/shared/__snapshots__/index.jsx.snap @@ -5,6 +5,11 @@ exports[`Snapshot match 1`] = `
@@ -284,6 +285,7 @@ exports[`Render with open menu 1`] = ` className="src-shared-components-TopcoderHeader-___style__main-desktop-header___oqm_l" > @@ -570,6 +572,7 @@ exports[`Render with specified profile 1`] = ` className="src-shared-components-TopcoderHeader-___style__main-desktop-header___oqm_l" > diff --git a/__tests__/shared/components/TopcoderHeader/desktop/SubMenu/Item.jsx b/__tests__/shared/components/TopcoderHeader/desktop/SubMenu/Item.jsx index 0e8c470923..0ebcd65cb8 100644 --- a/__tests__/shared/components/TopcoderHeader/desktop/SubMenu/Item.jsx +++ b/__tests__/shared/components/TopcoderHeader/desktop/SubMenu/Item.jsx @@ -8,7 +8,7 @@ test('Matches shallow shapshot', () => { renderer.render(( } title="title" link="menu url" /> @@ -18,7 +18,7 @@ test('Matches shallow shapshot', () => { renderer.render(( } title="title" link="menu url" /> diff --git a/__tests__/shared/components/TopcoderHeader/desktop/SubMenu/__snapshots__/Item.jsx.snap b/__tests__/shared/components/TopcoderHeader/desktop/SubMenu/__snapshots__/Item.jsx.snap index 352474da67..a438da528a 100644 --- a/__tests__/shared/components/TopcoderHeader/desktop/SubMenu/__snapshots__/Item.jsx.snap +++ b/__tests__/shared/components/TopcoderHeader/desktop/SubMenu/__snapshots__/Item.jsx.snap @@ -11,7 +11,9 @@ exports[`Matches shallow shapshot 1`] = ` openNewTab={false} to="menu url" > - icon url +
title @@ -28,7 +30,9 @@ exports[`Matches shallow shapshot 2`] = ` openNewTab={false} to="menu url" > - icon url +
title diff --git a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap index 806c785a9e..a19e662270 100644 --- a/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap +++ b/__tests__/shared/components/__snapshots__/TopcoderFooter.jsx.snap @@ -5,7 +5,7 @@ exports[`Matches shallow shapshot 1`] = ` className="src-shared-components-TopcoderFooter-___style__footer___28yQ6" >

@@ -78,6 +79,7 @@ exports[`Matches shallow shapshot 1`] = ` @@ -98,6 +100,7 @@ exports[`Matches shallow shapshot 1`] = ` @@ -118,6 +121,7 @@ exports[`Matches shallow shapshot 1`] = ` diff --git a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap index 42666c02e2..f9500fe0e6 100644 --- a/__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap +++ b/__tests__/shared/components/challenge-listing/Filters/__snapshots__/ChallengeFilters.jsx.snap @@ -108,7 +108,10 @@ exports[`Matches shallow shapshot shapshot 2`] = ` /> + "data":
Sample community
, + "label": "Sample community", "name": "Sample community", "value": "123", }, @@ -299,9 +300,10 @@ exports[`Matches shallow shapshot 2`] = ` options={ Array [ Object { - "label":
+ "data":
Sample community
, + "label": "Sample community", "name": "Sample community", "value": "123", }, diff --git a/package-lock.json b/package-lock.json index 1cc3331ff5..a3e6552ce4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1039,7 +1039,7 @@ "integrity": "sha512-2FN6DlHr6JCSxPPi25EnqGaXC4OC3/B3k1lCd6MMYrZ51/Gf/1qDfaR+JElzWa+Tl7cY2aYOlsYJGFeQyVHIeQ==", "requires": { "array.prototype.find": "2.1.0", - "function.prototype.name": "1.1.0", + "function.prototype.name": "1.1.1", "has": "1.0.3", "is-regex": "1.0.4", "object-is": "1.0.1", @@ -1290,7 +1290,7 @@ } }, "appirio-tech-react-components": { - "version": "github:appirio-tech/react-components#3c39372bdd8317d82ece5c3e42c51bba1a6f683f", + "version": "github:appirio-tech/react-components#edd4c4bd353b08937b1f59099129b685f9145683", "requires": { "appirio-tech-api-schemas": "5.0.70", "appirio-tech-client-app-layer": "0.1.3", @@ -3262,7 +3262,7 @@ "dev": true, "requires": { "caniuse-lite": "1.0.30000985", - "electron-to-chromium": "1.3.197" + "electron-to-chromium": "1.3.200" } }, "bser": { @@ -3526,7 +3526,7 @@ "dev": true, "requires": { "caniuse-db": "1.0.30000985", - "electron-to-chromium": "1.3.197" + "electron-to-chromium": "1.3.200" } } } @@ -4375,9 +4375,9 @@ } }, "content-security-policy-builder": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.0.0.tgz", - "integrity": "sha512-j+Nhmj1yfZAikJLImCvPJFE29x/UuBi+/MWqggGGc515JKaZrjuei2RhULJmy0MsstW3E3htl002bwmBNMKr7w==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz", + "integrity": "sha512-/MtLWhJVvJNkA9dVLAp6fg9LxD2gfI6R2Fi1hPmfjYXSahJJzcfvoeDOxSyp4NvxMuwWv3WMssE9o31DoULHrQ==" }, "content-type": { "version": "1.0.4", @@ -5001,7 +5001,7 @@ "dev": true, "requires": { "caniuse-db": "1.0.30000985", - "electron-to-chromium": "1.3.197" + "electron-to-chromium": "1.3.200" } }, "has-flag": { @@ -5681,9 +5681,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.197", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.197.tgz", - "integrity": "sha512-SfD7WfmueKrtKeHUESLczuANgnpdnfrSz3ZzerLdtmZf2UBZmAB3z9Q525zI5p3n9I7ii/lllUlyKHm2pIG7QQ==", + "version": "1.3.200", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.200.tgz", + "integrity": "sha512-PUurrpyDA74MuAjJRD+79ss5BqJlU3mdArRbuu4wO/dt6jc3Ic/6BDmFJxkdwbfq39cHf/XKm2vW98XSvut9Dg==", "dev": true }, "elliptic": { @@ -5772,7 +5772,7 @@ "requires": { "array.prototype.flat": "1.2.1", "cheerio": "1.0.0-rc.3", - "function.prototype.name": "1.1.0", + "function.prototype.name": "1.1.1", "has": "1.0.3", "html-element-map": "1.1.0", "is-boolean-object": "1.0.0", @@ -5790,7 +5790,7 @@ "object.values": "1.1.0", "raf": "3.4.1", "rst-selector-parser": "2.2.3", - "string.prototype.trim": "1.1.2" + "string.prototype.trim": "1.2.0" } }, "enzyme-adapter-react-16": { @@ -5816,7 +5816,7 @@ "dev": true, "requires": { "airbnb-prop-types": "2.13.2", - "function.prototype.name": "1.1.0", + "function.prototype.name": "1.1.1", "object.assign": "4.1.0", "object.fromentries": "2.0.0", "prop-types": "15.7.2", @@ -6269,9 +6269,9 @@ } }, "eslint-plugin-react": { - "version": "7.14.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.2.tgz", - "integrity": "sha512-jZdnKe3ip7FQOdjxks9XPN0pjUKZYq48OggNMd16Sk+8VXx6JOvXmlElxROCgp7tiUsTsze3jd78s/9AFJP2mA==", + "version": "7.14.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz", + "integrity": "sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA==", "dev": true, "requires": { "array-includes": "3.0.3", @@ -8219,12 +8219,13 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "function.prototype.name": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.0.tgz", - "integrity": "sha512-Bs0VRrTz4ghD8pTmbJQD1mZ8A/mN0ur/jGz+A6FBxPDUPkm1tNfF6bhTYPA7i7aF4lZJVr+OXTNNrnnIl58Wfg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.1.tgz", + "integrity": "sha512-e1NzkiJuw6xqVH7YSdiW/qDHebcmMhPNe6w+4ZYYEg0VA+LaLzx37RimbPLuonHhYGFGPx1ME2nSi74JiaCr/Q==", "requires": { "define-properties": "1.1.3", "function-bind": "1.1.1", + "functions-have-names": "1.1.1", "is-callable": "1.1.4" } }, @@ -8234,6 +8235,11 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, + "functions-have-names": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.1.1.tgz", + "integrity": "sha512-U0kNHUoxwPNPWOJaMG7Z00d4a/qZVrFtzWJRaK8V9goaVOCXBSQSJpt3MYGNtkScKEBKovxLjnNdC9MlXwo5Pw==" + }, "gauge": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", @@ -8680,9 +8686,9 @@ "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" }, "helmet": { - "version": "3.19.0", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.19.0.tgz", - "integrity": "sha512-l58Q3unSpYatlurvFzkCbTRQ8oWUmdXbOs7h+pnwQbFJRhRJDjER6UMyqHxp9iFtWPcVA05VLcUGSi0EXIv7GA==", + "version": "3.20.0", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.20.0.tgz", + "integrity": "sha512-Ob+TqmQFZ5f7WgP8kBbAzNPsbf6p1lOj5r+327/ymw/IILWih3wcx9u/u/S8Mwv5wbBkO7Li6x5s23t3COhUKw==", "requires": { "depd": "2.0.0", "dns-prefetch-control": "0.2.0", @@ -8691,7 +8697,7 @@ "feature-policy": "0.3.0", "frameguard": "3.1.0", "helmet-crossdomain": "0.4.0", - "helmet-csp": "2.7.1", + "helmet-csp": "2.8.0", "hide-powered-by": "1.1.0", "hpkp": "2.0.0", "hsts": "2.2.0", @@ -8714,12 +8720,12 @@ "integrity": "sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA==" }, "helmet-csp": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.7.1.tgz", - "integrity": "sha512-sCHwywg4daQ2mY0YYwXSZRsgcCeerUwxMwNixGA7aMLkVmPTYBl7gJoZDHOZyXkqPrtuDT3s2B1A+RLI7WxSdQ==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.8.0.tgz", + "integrity": "sha512-MlCPeM0Sm3pS9RACRihx70VeTHmkQwa7sum9EK1tfw1VZyvFU0dBWym9nHh3CRkTRNlyNm/WFCMvuh9zXkOjNw==", "requires": { "camelize": "1.0.0", - "content-security-policy-builder": "2.0.0", + "content-security-policy-builder": "2.1.0", "dasherize": "2.0.0", "platform": "1.3.5" } @@ -12553,7 +12559,7 @@ "cookie-parser": "1.4.4", "cross-env": "5.2.0", "express": "4.17.1", - "helmet": "3.19.0", + "helmet": "3.20.0", "lodash": "4.17.15", "moment": "2.24.0", "morgan": "1.9.1", @@ -12813,9 +12819,9 @@ } }, "node-releases": { - "version": "1.1.25", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.25.tgz", - "integrity": "sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==", + "version": "1.1.26", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.26.tgz", + "integrity": "sha512-fZPsuhhUHMTlfkhDLGtfY80DSJTjOcx+qD1j5pqPkuhUHVS7xHZIg9EE4DHK8O3f0zTxXHX5VIkDG8pu98/wfQ==", "dev": true, "requires": { "semver": "5.7.0" @@ -13435,7 +13441,7 @@ "dev": true, "requires": { "for-each": "0.3.3", - "string.prototype.trim": "1.1.2" + "string.prototype.trim": "1.2.0" } }, "parse-json": { @@ -14094,9 +14100,9 @@ } }, "postcss-jsx": { - "version": "0.36.1", - "resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.36.1.tgz", - "integrity": "sha512-xaZpy01YR7ijsFUtu5rViYCFHurFIPHir+faiOQp8g/NfTfWqZCKDhKrydQZ4d8WlSAmVdXGwLjpFbsNUI26Sw==", + "version": "0.36.2", + "resolved": "https://registry.npmjs.org/postcss-jsx/-/postcss-jsx-0.36.2.tgz", + "integrity": "sha512-7B8a8a6YDOQFqMQ9UmOo+IPPb2i14Z57Fvc9cOI11B3bWMSY2O6r2XJ3tlcQhUhv93TeN0ntxehTaSWJDQavlg==", "dev": true, "requires": { "@babel/core": "7.5.5" @@ -14306,7 +14312,7 @@ "dev": true, "requires": { "caniuse-db": "1.0.30000985", - "electron-to-chromium": "1.3.197" + "electron-to-chromium": "1.3.200" } }, "has-flag": { @@ -15676,7 +15682,7 @@ "babel-runtime": "6.26.0", "dom-align": "1.9.0", "prop-types": "15.7.2", - "rc-util": "4.8.1" + "rc-util": "4.8.4" } }, "rc-animate": { @@ -15689,7 +15695,7 @@ "css-animation": "1.5.0", "prop-types": "15.7.2", "raf": "3.4.1", - "rc-util": "4.8.1", + "rc-util": "4.8.4", "react-lifecycles-compat": "3.0.4" } }, @@ -15713,14 +15719,14 @@ "prop-types": "15.7.2", "rc-align": "2.4.5", "rc-animate": "2.9.2", - "rc-util": "4.8.1", + "rc-util": "4.8.4", "react-lifecycles-compat": "3.0.4" } }, "rc-util": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.8.1.tgz", - "integrity": "sha512-siJw/pPunmiQ/YVp/SXNuri3907+GgAmw8TeMVGv9H2LhE/0NlKonuU5CBwPeLQyKdKmJro4EUitEpekwP5osA==", + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.8.4.tgz", + "integrity": "sha512-1B2h0/pMXfSUBRAgPdoDIKK5XBuzLBuLI9rLwUEW163SPoDvfb9jmg3ymBPtzne2jWgwtdNw4j0vIq/8Yo849A==", "requires": { "add-dom-event-listener": "1.1.0", "babel-runtime": "6.26.0", @@ -15920,9 +15926,9 @@ } }, "react-hot-loader": { - "version": "4.12.8", - "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.8.tgz", - "integrity": "sha512-/Df2J3znMHzRzI6CW0dTOIWD2sjkVHxv56XCqujAo9mR+k2PVTiGjUgYBiGPGsix9zQzgCRfOKca93o9Zdj2vQ==", + "version": "4.12.9", + "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.9.tgz", + "integrity": "sha512-lWT3JpWUN7nGHSoI9c4MV+42ov79bd8aqwDzhoyKev3owIh+hbEivT6Mb81lCV6tWuqm9trKo2/Th2/YDhFCdw==", "dev": true, "requires": { "fast-levenshtein": "2.0.6", @@ -18901,9 +18907,9 @@ } }, "string.prototype.trim": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz", - "integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.0.tgz", + "integrity": "sha512-9EIjYD/WdlvLpn987+ctkLf0FfvBefOCuiEr2henD8X+7jfwPnyvTdmW8OJhj5p+M0/96mBdynLWkxUr+rHlpg==", "dev": true, "requires": { "define-properties": "1.1.3", @@ -19032,7 +19038,7 @@ "pify": "4.0.1", "postcss": "7.0.17", "postcss-html": "0.36.0", - "postcss-jsx": "0.36.1", + "postcss-jsx": "0.36.2", "postcss-less": "3.1.4", "postcss-markdown": "0.36.0", "postcss-media-query-parser": "0.2.3", @@ -19141,8 +19147,8 @@ "dev": true, "requires": { "caniuse-lite": "1.0.30000985", - "electron-to-chromium": "1.3.197", - "node-releases": "1.1.25" + "electron-to-chromium": "1.3.200", + "node-releases": "1.1.26" } }, "camelcase-keys": { @@ -20071,7 +20077,7 @@ } }, "tc-accounts": { - "version": "git+https://github.com/appirio-tech/accounts-app.git#a881c2f01802ed8c96d13fa16a1927c75d5a0fa6", + "version": "git+https://github.com/appirio-tech/accounts-app.git#3eed30ff82db6927b008503b61cb714c65e4dc6c", "requires": { "@uirouter/angularjs": "1.0.18", "angucomplete-alt": "2.5.0", @@ -20081,7 +20087,7 @@ "angular-messages": "1.7.2", "appirio-tech-ng-iso-constants": "1.0.6", "appirio-tech-ng-ui-components": "2.2.5", - "appirio-tech-react-components": "github:appirio-tech/react-components#3c39372bdd8317d82ece5c3e42c51bba1a6f683f", + "appirio-tech-react-components": "github:appirio-tech/react-components#edd4c4bd353b08937b1f59099129b685f9145683", "auth0-js": "9.6.1", "babel-polyfill": "6.26.0", "filestack-js": "1.14.6", @@ -28779,7 +28785,7 @@ "react-redux": "6.0.1", "redux": "3.7.2", "redux-actions": "2.6.5", - "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#a881c2f01802ed8c96d13fa16a1927c75d5a0fa6", + "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#3eed30ff82db6927b008503b61cb714c65e4dc6c", "to-capital-case": "1.0.0", "topcoder-react-utils": "0.7.8" }, @@ -28808,9 +28814,9 @@ } }, "topcoder-react-ui-kit": { - "version": "0.5.10", - "resolved": "https://registry.npmjs.org/topcoder-react-ui-kit/-/topcoder-react-ui-kit-0.5.10.tgz", - "integrity": "sha512-OZyZxtTV78nSGCmp+2v5kr57vCQ0cjiUW4n9Rkem2cf0BE/2YQD91QlDYUcjPpQTn1c17WDzFx6sa9mnWEdYqg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/topcoder-react-ui-kit/-/topcoder-react-ui-kit-1.0.0.tgz", + "integrity": "sha512-Z1LKuB6Vn1aCmZMuIHD+eAhroG31/Mao5CWXdA1H5TIF/lEYNhkha7Dkf9k6oNTWGmPA5ZWUYgBHSVIHiKXW9w==", "requires": { "prop-types": "15.7.2", "react": "16.8.6", @@ -28832,7 +28838,7 @@ "config": "1.31.0", "cookie-parser": "1.4.4", "express": "4.17.1", - "helmet": "3.19.0", + "helmet": "3.20.0", "lodash": "4.17.15", "moment": "2.24.0", "morgan": "1.9.1", diff --git a/package.json b/package.json index 181652652f..a1bd30f7bb 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "supertest": "^3.1.0", "tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#dev", "topcoder-react-lib": "0.7.11", - "topcoder-react-ui-kit": "^0.5.10", + "topcoder-react-ui-kit": "^1.0.3", "topcoder-react-utils": "0.7.8", "turndown": "^4.0.2", "url-parse": "^1.4.1", diff --git a/src/assets/images/icon-arrow-down.svg b/src/assets/images/icon-arrow-down.svg index 3cdc1aa640..b8814cfb90 100644 --- a/src/assets/images/icon-arrow-down.svg +++ b/src/assets/images/icon-arrow-down.svg @@ -1,8 +1,5 @@ - - - icon-arrow-down - Created with Sketch. +
- + diff --git a/src/shared/components/ProfilePage/Header/styles.scss b/src/shared/components/ProfilePage/Header/styles.scss index 6d753de4fc..e0dfffbc16 100644 --- a/src/shared/components/ProfilePage/Header/styles.scss +++ b/src/shared/components/ProfilePage/Header/styles.scss @@ -151,7 +151,7 @@ .link:visited { @include sofia-pro-regular; - color: $tc-dark-blue-70; + color: $tc-gray-75; font-size: 12px; line-height: 14px; text-decoration: none; diff --git a/src/shared/components/ProfilePage/Skill/index.jsx b/src/shared/components/ProfilePage/Skill/index.jsx index 95e0f97cc9..3969491b02 100644 --- a/src/shared/components/ProfilePage/Skill/index.jsx +++ b/src/shared/components/ProfilePage/Skill/index.jsx @@ -22,8 +22,8 @@ const Skill = ({ isVerified, }) => (
-
- { assets && assets.keys().includes(`./id-${tagId}.svg`) ? Skill Icon : } +
+ { assets && assets.keys().includes(`./id-${tagId}.svg`) ? {`${tagName} : }
diff --git a/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx b/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx index 2325b1d060..35e654f928 100644 --- a/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx +++ b/src/shared/components/SubmissionPage/FilestackFilePicker/index.jsx @@ -304,6 +304,7 @@ Uploading: role="button" styleName="drop-zone-mask" tabIndex={0} + aria-label="Select file to upload" /> )}
diff --git a/src/shared/components/SubmissionPage/FilestackFilePicker/styles.scss b/src/shared/components/SubmissionPage/FilestackFilePicker/styles.scss index 193e41e414..939673e74f 100644 --- a/src/shared/components/SubmissionPage/FilestackFilePicker/styles.scss +++ b/src/shared/components/SubmissionPage/FilestackFilePicker/styles.scss @@ -24,7 +24,7 @@ p { font-size: 15px; - color: #888894; + color: $tc-gray-60; line-height: 25px; flex-basis: 0; flex-grow: 1; diff --git a/src/shared/components/SubmissionPage/Header/styles.scss b/src/shared/components/SubmissionPage/Header/styles.scss index 2a854a87c6..d0979263ec 100644 --- a/src/shared/components/SubmissionPage/Header/styles.scss +++ b/src/shared/components/SubmissionPage/Header/styles.scss @@ -17,7 +17,7 @@ a { font-size: 18px; - color: #a3a3ae; + color: $tc-gray-60; font-weight: 300; display: flex; align-items: center; diff --git a/src/shared/components/SubmissionPage/Submit/styles.scss b/src/shared/components/SubmissionPage/Submit/styles.scss index a1e4061596..725bd3004d 100644 --- a/src/shared/components/SubmissionPage/Submit/styles.scss +++ b/src/shared/components/SubmissionPage/Submit/styles.scss @@ -66,7 +66,7 @@ p, a { font-size: 13px; - color: #a3a3ae; + color: $tc-gray-60; font-style: italic; max-width: 270px; width: 270px; diff --git a/src/shared/components/SwitchWithLabel/index.jsx b/src/shared/components/SwitchWithLabel/index.jsx index 1d80831a3b..43c3b0fba0 100644 --- a/src/shared/components/SwitchWithLabel/index.jsx +++ b/src/shared/components/SwitchWithLabel/index.jsx @@ -23,6 +23,9 @@ function SwitchWithLabel({ className={theme.wrapper} onClick={() => onSwitch(!enabled)} onKeyPress={() => onSwitch(!enabled)} + role="switch" + aria-checked={enabled} + tabIndex={0} > {labelBefore}
diff --git a/src/shared/components/TopcoderFooter/style.scss b/src/shared/components/TopcoderFooter/style.scss index f2cb65764c..0d8467df6d 100644 --- a/src/shared/components/TopcoderFooter/style.scss +++ b/src/shared/components/TopcoderFooter/style.scss @@ -4,7 +4,7 @@ text-align: center; font-family: "Roboto", Helvetica, Arial, sans-serif; font-size: 12px; - color: $tc-gray-60; + color: $tc-gray-40; } .footer { diff --git a/src/shared/components/TopcoderHeader/Auth/index.jsx b/src/shared/components/TopcoderHeader/Auth/index.jsx index 2d8bf65d95..099501c9ae 100644 --- a/src/shared/components/TopcoderHeader/Auth/index.jsx +++ b/src/shared/components/TopcoderHeader/Auth/index.jsx @@ -15,10 +15,6 @@ export default function Auth({ column }) {
{ event.stopPropagation(); }} - onKeyPress={null} - role="button" - tabIndex="0" > - {icon} + {accessibleIcon} {title} diff --git a/src/shared/components/TopcoderHeader/index.jsx b/src/shared/components/TopcoderHeader/index.jsx index 865b7828a3..cf6c9727ec 100644 --- a/src/shared/components/TopcoderHeader/index.jsx +++ b/src/shared/components/TopcoderHeader/index.jsx @@ -348,7 +348,7 @@ export default class TopcoderHeader extends React.Component { }} >
- +
    { this.mainMenu = ul; }}> diff --git a/src/shared/components/TopcoderHeader/mobile/Header/index.jsx b/src/shared/components/TopcoderHeader/mobile/Header/index.jsx index b8f5d6b48f..7217f78a6b 100644 --- a/src/shared/components/TopcoderHeader/mobile/Header/index.jsx +++ b/src/shared/components/TopcoderHeader/mobile/Header/index.jsx @@ -25,7 +25,7 @@ export default function Header({ styleName="header" tabIndex={0} > - {} + {}
    Menu
    diff --git a/src/shared/components/challenge-detail/Header/DeadlinesPanel/index.jsx b/src/shared/components/challenge-detail/Header/DeadlinesPanel/index.jsx index 08d2668703..7707538787 100644 --- a/src/shared/components/challenge-detail/Header/DeadlinesPanel/index.jsx +++ b/src/shared/components/challenge-detail/Header/DeadlinesPanel/index.jsx @@ -16,7 +16,7 @@ export default function DeadlinesPanel({ deadlines }) { const started = moment(start).isBefore(moment()); return ( -
    +

    Timezone: {moment.tz.guess()} diff --git a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx index acede5ae5e..490a6941d4 100644 --- a/src/shared/components/challenge-detail/Specification/SideBar/index.jsx +++ b/src/shared/components/challenge-detail/Specification/SideBar/index.jsx @@ -220,11 +220,10 @@ Fonts, Stock Photos, and Icons:

    All fonts, stock photos, and icons within your design must be declared when you submit. DO NOT include any 3rd party files in your - submission or source files. - Read about the policy + submission or source files. Read about the {' '} - here. + policy.

    @@ -234,11 +233,10 @@ Screening: All submissions are screened for eligibility before the challenge holder picks winners. Don {"'"} -t let your hard work go to waste. - Learn more about how to pass screening +t let your hard work go to waste. Learn more about how to {' '} - here. + pass screening.

    diff --git a/src/shared/components/challenge-detail/Specification/SideBar/styles.scss b/src/shared/components/challenge-detail/Specification/SideBar/styles.scss index 438ad98832..f12799eb63 100644 --- a/src/shared/components/challenge-detail/Specification/SideBar/styles.scss +++ b/src/shared/components/challenge-detail/Specification/SideBar/styles.scss @@ -31,7 +31,7 @@ } .tctooltip { - background: $tc-green; + background: $tc-green-110; font-style: roboto; font-weight: 700; font-size: 13px; diff --git a/src/shared/components/challenge-listing/ChallengeCard/NumRegistrants/index.jsx b/src/shared/components/challenge-listing/ChallengeCard/NumRegistrants/index.jsx index 8d96c18f22..0f58e791fb 100644 --- a/src/shared/components/challenge-listing/ChallengeCard/NumRegistrants/index.jsx +++ b/src/shared/components/challenge-listing/ChallengeCard/NumRegistrants/index.jsx @@ -51,6 +51,7 @@ export default function NumRegistrants({ )} styleName="link" to={link} + aria-label={`Number of registrants ${numRegistrants}`} > diff --git a/src/shared/components/challenge-listing/ChallengeCard/Status/style.scss b/src/shared/components/challenge-listing/ChallengeCard/Status/style.scss index 406407676d..a7aa7c1579 100644 --- a/src/shared/components/challenge-listing/ChallengeCard/Status/style.scss +++ b/src/shared/components/challenge-listing/ChallengeCard/Status/style.scss @@ -77,7 +77,7 @@ $status-radius-4: $corner-radius * 2; .time-left { text-align: left; - color: $tc-gray-50; + color: $tc-gray-60; font-size: 12px; line-height: $status-space-15; font-weight: 400; diff --git a/src/shared/components/challenge-listing/ChallengeCard/index.jsx b/src/shared/components/challenge-listing/ChallengeCard/index.jsx index 64870d5e5f..1dfdcde947 100644 --- a/src/shared/components/challenge-listing/ChallengeCard/index.jsx +++ b/src/shared/components/challenge-listing/ChallengeCard/index.jsx @@ -131,8 +131,7 @@ function ChallengeCard({ to={challengeDetailLink} styleName="challenge-title" openNewTab={openChallengesInNewTabs} - > - {challenge.name} + >

    {challenge.name}

    diff --git a/src/shared/components/challenge-listing/ChallengeCard/style.scss b/src/shared/components/challenge-listing/ChallengeCard/style.scss index c3188521c5..c537391e86 100644 --- a/src/shared/components/challenge-listing/ChallengeCard/style.scss +++ b/src/shared/components/challenge-listing/ChallengeCard/style.scss @@ -110,6 +110,8 @@ $challenge-radius-4: $corner-radius * 2; // date and technologies .details-footer { margin-top: $challenge-space-10; + width: max-content; + width: -webkit-max-content; .date { font-size: 12px; @@ -139,6 +141,12 @@ $challenge-radius-4: $corner-radius * 2; .technology:hover { background: $tc-dark-blue-30; } + + button { + &:last-of-type { + margin-right: 0; + } + } } // Challenge prizes diff --git a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx index d9a3ce9a3d..2e555c2150 100644 --- a/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx +++ b/src/shared/components/challenge-listing/Filters/ChallengeFilters.jsx @@ -76,21 +76,21 @@ export default function ChallengeFilters({ isCardTypeSet === 'Challenges' ? ( - + switchTrack(TRACKS.DESIGN, on)} /> - + switchTrack(TRACKS.DEVELOP, on)} /> - + !community.hidden) .map(community => ({ - label: getLabel(community), + label: community.communityName, value: community.communityId, name: community.communityName, + data: getLabel(community), })); const disableClearSaveFilterButtons = isSavingFilter || ( diff --git a/src/shared/components/challenge-listing/Filters/_fix_DateInput__input.css b/src/shared/components/challenge-listing/Filters/_fix_DateInput__input.css index fb907d86d2..f759e9f39e 100644 --- a/src/shared/components/challenge-listing/Filters/_fix_DateInput__input.css +++ b/src/shared/components/challenge-listing/Filters/_fix_DateInput__input.css @@ -30,7 +30,6 @@ .CalendarDay { vertical-align: middle; - outline: none; font-size: 15px; font-family: "Roboto", Helvetica, Arial, sans-serif; font-weight: 400; diff --git a/src/shared/components/challenge-listing/Listing/Bucket/style.scss b/src/shared/components/challenge-listing/Listing/Bucket/style.scss index 07d1922ac0..f848ab1aab 100644 --- a/src/shared/components/challenge-listing/Listing/Bucket/style.scss +++ b/src/shared/components/challenge-listing/Listing/Bucket/style.scss @@ -16,7 +16,7 @@ border-left: 0; border-radius: 0; border-right: 0; - color: $tc-gray-50; + color: $tc-gray-60; cursor: pointer; display: block; font: 300 13px Arial, sans-serif; @@ -26,3 +26,8 @@ text-transform: none; width: 100%; } + +.view-more:focus { + border: 3px solid #79a3ef; + border-radius: 4px; +} diff --git a/src/shared/components/challenge-listing/Sidebar/BucketSelector/Bucket/style.scss b/src/shared/components/challenge-listing/Sidebar/BucketSelector/Bucket/style.scss index efb0e821aa..2f76f10796 100644 --- a/src/shared/components/challenge-listing/Sidebar/BucketSelector/Bucket/style.scss +++ b/src/shared/components/challenge-listing/Sidebar/BucketSelector/Bucket/style.scss @@ -14,7 +14,6 @@ color: $tc-black; border-radius: 2 * $corner-radius; cursor: pointer; - outline: none; padding: 0 2 * $base-unit 0 3 * $base-unit; @include xs-to-sm { @@ -24,7 +23,7 @@ } .right { - color: $tc-gray-50; + color: $tc-gray-70; float: right; position: static; font-weight: 700; diff --git a/src/shared/components/challenge-listing/Sidebar/BucketSelector/style.scss b/src/shared/components/challenge-listing/Sidebar/BucketSelector/style.scss index fd0b26af76..fc29ce170f 100644 --- a/src/shared/components/challenge-listing/Sidebar/BucketSelector/style.scss +++ b/src/shared/components/challenge-listing/Sidebar/BucketSelector/style.scss @@ -4,7 +4,7 @@ text-align: center; a { - color: $tc-gray-50; + color: $tc-gray-60; font-size: 13px; line-height: 30px; }