Merge Develop to Master (#3220)

sushilshinde · web-flow · commit f0e08c948ebf · 2019-08-15T14:22:17.000+05:30
Merge Develop to Master
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -112,7 +112,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": "^1.0.10",
+    "topcoder-react-ui-kit": "^1.0.11",
     "topcoder-react-utils": "0.7.8",
     "turndown": "^4.0.2",
     "url-parse": "^1.4.1",
diff --git a/src/client/index.jsx b/src/client/index.jsx
@@ -59,6 +59,7 @@ function authenticate(store) {
     configureConnector({
       connectorUrl: window.CONFIG.URL.ACCOUNTS_APP_CONNECTOR,
       frameId: 'tc-accounts-iframe',
+      frameTitle: 'Accounts authentication window',
     });
   }
 
diff --git a/src/shared/components/Contentful/ContentBlock/themes/general.scss b/src/shared/components/Contentful/ContentBlock/themes/general.scss
@@ -104,6 +104,10 @@
 
     // color: $tc-black;
     font-size: 15px;
+    letter-spacing: 2px;
+    line-height: 25px;
+    margin-bottom: 30px;
+    word-spacing: 2.5px;
   }
 
   table {
diff --git a/src/shared/components/SubmissionPage/Header/index.jsx b/src/shared/components/SubmissionPage/Header/index.jsx
@@ -27,9 +27,9 @@ const Header = ({
 Back to challenge
       </p>
     </Link>
-    <h2>
+    <h1>
       {title}
-    </h2>
+    </h1>
   </div>
 );
 
diff --git a/src/shared/components/SubmissionPage/Header/styles.scss b/src/shared/components/SubmissionPage/Header/styles.scss
@@ -31,7 +31,7 @@
     }
   }
 
-  h2 {
+  h1 {
     font-weight: 300;
     font-size: 24px;
     color: #3d3d3d;
diff --git a/src/shared/components/TopcoderHeader/Auth/index.jsx b/src/shared/components/TopcoderHeader/Auth/index.jsx
@@ -17,21 +17,21 @@ export default function Auth({ column }) {
       styleName="auth"
     >
       <a
+        role="button"
         className="tc-btn-sm tc-btn-primary"
         href={`${config.URL.AUTH}/member/registration?utm_source=community-app-main`}
-        role="button"
       >
 Join
       </a>
       <a
+        role="button"
         className="tc-btn-sm tc-btn-default"
         href={`${config.URL.AUTH}/member?utm_source=community-app-main`}
         onClick={(event) => {
           const retUrl = encodeURIComponent(window.location.href);
           window.location = `${config.URL.AUTH}/member?retUrl=${retUrl}&utm_source=community-app-main`;
           event.preventDefault();
         }}
-        role="button"
       >
 Log In
       </a>
diff --git a/src/shared/components/challenge-detail/Header/Prizes.jsx b/src/shared/components/challenge-detail/Header/Prizes.jsx
@@ -32,7 +32,7 @@ export default function Prizes({ pointPrizes, prizes }) {
               role="figure"
               aria-label={`${rank}${getOrdinal(rank)} prize is ${!_.isUndefined(prizes[index]) ? '$' : ''}${pair.join(' + ')}`}
             >
-              <div id={`rank${rank}`} styleName="prize-card">
+              <div id={`rank${rank}`} styleName="prize-card" aria-hidden="true">
                 <p styleName="prize-rank">
                   {rank}
                   <span styleName="rank-ordinal">

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ function authenticate(store) {`
`59`	`59`	`configureConnector({`
`60`	`60`	`connectorUrl: window.CONFIG.URL.ACCOUNTS_APP_CONNECTOR,`
`61`	`61`	`frameId: 'tc-accounts-iframe',`
	`62`	`+ frameTitle: 'Accounts authentication window',`
`62`	`63`	`});`
`63`	`64`	`}`
`64`	`65`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,10 @@`
`104`	`104`
`105`	`105`	`// color: $tc-black;`
`106`	`106`	`font-size: 15px;`
	`107`	`+ letter-spacing: 2px;`
	`108`	`+ line-height: 25px;`
	`109`	`+ margin-bottom: 30px;`
	`110`	`+ word-spacing: 2.5px;`
`107`	`111`	`}`
`108`	`112`
`109`	`113`	`table {`
-Original file line number
+Diff line change
 Back to challenge
       </p>
     </Link>
 -    <h2>
 +    <h1>
       {title}
 -    </h2>
 +    </h1>
   </div>
 );
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`		`- h2 {`
	`34`	`+ h1 {`
`35`	`35`	`font-weight: 300;`
`36`	`36`	`font-size: 24px;`
`37`	`37`	`color: #3d3d3d;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export default function Prizes({ pointPrizes, prizes }) {`
`32`	`32`	`role="figure"`
`33`	`33`	aria-label={`${rank}${getOrdinal(rank)} prize is ${!_.isUndefined(prizes[index]) ? '$' : ''}${pair.join(' + ')}`}
`34`	`34`	`>`
`35`		- <div id={`rank${rank}`} styleName="prize-card">
	`35`	+ <div id={`rank${rank}`} styleName="prize-card" aria-hidden="true">
`36`	`36`	`<p styleName="prize-rank">`
`37`	`37`	`{rank}`
`38`	`38`	`<span styleName="rank-ordinal">`