From e9e2ed4b505f437a73ba2836834cd23bf6abf7de Mon Sep 17 00:00:00 2001
From: Allard Oelen <oelen@l3s.de>
Date: Fri, 31 Jul 2020 13:15:50 +0200
Subject: [PATCH 1/3] Fix invisible skip links on hover

Fixes #1232
---
 assets/css/custom.css | 2 +-
 package.json          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/css/custom.css b/assets/css/custom.css
index 3d27bd41f..78291a09a 100644
--- 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/package.json b/package.json
index 186a21571..ebf1919c9 100644
--- 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",

From a39f2427908515c9065fb59d05e02c91d3ef9215 Mon Sep 17 00:00:00 2001
From: Allard Oelen <oelen@l3s.de>
Date: Fri, 31 Jul 2020 16:34:45 +0200
Subject: [PATCH 2/3] Improve sequence of content

Fixes #1225
---
 components/Search/SearchResultsPanel/Facets.js            | 2 +-
 components/Search/SearchResultsPanel/SearchResultsItem.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/Search/SearchResultsPanel/Facets.js b/components/Search/SearchResultsPanel/Facets.js
index f684f3ff9..4d94c8150 100644
--- 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
index b29ff5074..eff83eed2 100644
--- 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}>

From f513cfc950850066ee6509d646081992122a74ad Mon Sep 17 00:00:00 2001
From: Allard Oelen <oelen@l3s.de>
Date: Fri, 31 Jul 2020 16:49:01 +0200
Subject: [PATCH 3/3] Meaningful headings

Fixes #1239
---
 components/User/UserProfile/PublicUserData.js   | 2 +-
 components/User/UserProfile/RecommendedDecks.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/User/UserProfile/PublicUserData.js b/components/User/UserProfile/PublicUserData.js
index 43fa8ffe9..0446943e5 100644
--- 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
index 514c3997e..ab9fba241 100644
--- 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>;
         }
     }
 }