Merge branch 'master' into fix-infinite-loop

slidewiki · Aug 21, 2020 · f85b240 · f85b240
2 parents 53981fe + 646211f
commit f85b240
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/assets/css/custom.css b/assets/css/custom.css
@@ -291,7 +291,7 @@ div#embedModal .fields>label {
   }
   .au-body .au-skip-link__link:hover,.au-skip-link__link:hover{
     text-decoration:none;
-    color:#fff
+    color:#000
   }
 /* Questions Display */
 .questionsList{

diff --git a/components/Search/SearchResultsPanel/Facets.js b/components/Search/SearchResultsPanel/Facets.js
@@ -132,8 +132,8 @@ class Facets extends React.Component {
             });
 
             return <Menu.Item disabled={this.props.loading} key={`${facetField}_${index}`} name={ name } active={ isActive } onClick={this.handleFacetClick.bind(this)} onKeyPress={this.handleKeyPress.bind(this, name)} tabIndex="0">
-                <Label color={ labelColor }>{ item.rowCount }</Label>
                 { item.text }
+                <Label color={ labelColor }>{ item.rowCount }</Label>
             </Menu.Item>;
         });
 

diff --git a/components/Search/SearchResultsPanel/SearchResultsItem.js b/components/Search/SearchResultsPanel/SearchResultsItem.js
@@ -96,8 +96,8 @@ class SearchResultsItem extends React.Component {
                     <Grid>
                         <Grid.Row>
                             <Grid.Column width={3}>
-                                <NavLink href={result.link}>
-                                    <Image bordered src={`${Microservices.file.uri}/thumbnail/slide/${result.firstSlide}${(result.theme) ? '/' + result.theme : ''}`} alt={this.context.intl.formatMessage(this.messages.thumbnailAlt, { title: result.title })} size="small" aria-hidden="true" />
+                                <NavLink href={result.link} aria-hidden="true" tabIndex="-1">
+                                    <Image bordered src={`${Microservices.file.uri}/thumbnail/slide/${result.firstSlide}${(result.theme) ? '/' + result.theme : ''}`} alt={this.context.intl.formatMessage(this.messages.thumbnailAlt, { title: result.title })} size="small" />
                                 </NavLink>
                             </Grid.Column>
                             <Grid.Column width={8}>

diff --git a/components/User/UserProfile/PublicUserData.js b/components/User/UserProfile/PublicUserData.js
@@ -22,7 +22,7 @@ class PublicUserData extends React.Component {
     }
     render() {
         let content1 = <UserPicture picture={ this.props.user.picture } username={ this.props.user.uname } link={ false } private={ false } width={ 150 } centered={ false } size={ 'small' } aria-hidden={ 'true' } />;
-        let content2 = <div><h1><div className="sr-only">User: </div>{ this.props.user.displayName }</h1>
+        let content2 = <div><h1><span className="sr-only">User: { this.props.user.uname } </span></h1>
         <div className="ui item">
             <div className="item">
                 <div className="content">

diff --git a/components/User/UserProfile/RecommendedDecks.js b/components/User/UserProfile/RecommendedDecks.js
@@ -31,7 +31,7 @@ class RecommendedDecks extends React.Component {
                 {[...Array(size).keys()].map( (i) => <DeckCard userid={this.props.UserProfileStore.user.id} key={i} cardContent={content[i]} newTab={this.props.newTab}/>)}
                     </div>);
         } else {
-            return <h3>No recommendations available</h3>;
+            return <h2>No recommendations available</h2>;
         }
     }
 }

diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
     "@babel/register": "^7.9.0",
-    "@gov.au/skip-link": "^2.0.10",
+    "@gov.au/skip-link": "^2.0.16",
     "async": "^2.1.5",
     "babel-loader": "^8.0.0",
     "babel-plugin-add-module-exports": "0.2.1",