Skip to content

Commit 3f72c6a

Browse files
committed
Fixes #497 and also fixes #528
1 parent d36ba75 commit 3f72c6a

18 files changed

Lines changed: 44 additions & 24 deletions

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@surfnet/sds": "^0.0.144",
6+
"@surfnet/sds": "^0.0.145",
77
"dompurify": "^3.2.6",
88
"i18n-js": "^4.5.1",
99
"isomorphic-dompurify": "^2.26.0",

client/src/components/BreadCrumb.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
ol.sds--breadcrumb--list {
1414
min-height: 32px;
15-
max-width: $medium;
15+
max-width: $max-width;
1616
margin: 0 auto 0 auto;
1717
position: relative;
1818
transition: margin 150ms ease-in-out;

client/src/components/Entities.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
.mod-entities {
44

5-
max-width: $medium;
5+
max-width: $max-width;
66
width: 100%;
77
margin: 0 auto;
88

client/src/components/Header.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
align-items: center;
1515
width: 100%;
1616
margin: 0 auto;
17-
max-width: $medium;
17+
max-width: $max-width;
1818

1919
@media (max-width: $medium) {
2020
padding: 0 15px;

client/src/components/Page.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import "../styles/vars.scss";
22

33
.page {
4-
max-width: $medium;
4+
max-width: $max-width;
55
width: 100%;
66
margin: 0 auto;
77
background-color: white;

client/src/components/Tabs.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
background-color: $background;
66

77
.tabs {
8-
max-width: $medium;
8+
max-width: $max-width;
99
margin: 0 auto;
1010
display: flex;
1111
gap: var(--sds--space--1);

client/src/components/UnitHeader.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626

2727
.unit-header {
28-
max-width: $medium;
28+
max-width: $max-width;
2929
margin: 0 auto;
3030
width: 100%;
3131
display: flex;

client/src/components/UnitHeaderInviter.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414

1515
.unit-header {
16-
max-width: $medium;
16+
max-width: $max-width;
1717
margin: 0 auto;
1818
width: 100%;
1919
display: flex;

client/src/pages/Inviter.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
.inviter-container {
8-
max-width: $medium;
8+
max-width: $max-width;
99
display: flex;
1010
flex-direction: column;
1111
align-items: center;

client/src/pages/Login.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,23 @@ import {login} from "../utils/Login";
88
import {useAppStore} from "../stores/AppStore";
99
import {isEmpty} from "../utils/Utils";
1010
import {useLocation} from "react-router-dom";
11-
import {useState} from "react";
11+
import {useEffect, useRef, useState} from "react";
1212

1313
export const Login = () => {
1414
const location = useLocation();
1515
const [spin, setSpin] = useState(false);
1616

1717
const config = useAppStore((state) => state.config);
1818

19+
const buttonRef = useRef();
20+
21+
useEffect(() => {
22+
if (buttonRef && buttonRef.current) {
23+
buttonRef.current.focus();
24+
}
25+
}, []) // eslint-disable-line react-hooks/exhaustive-deps
26+
27+
1928
const doLogin = () => {
2029
const force = location.state === "force";
2130
login(config, !isEmpty(force));
@@ -36,6 +45,7 @@ export const Login = () => {
3645
<Button onClick={doLogin}
3746
txt={I18n.t("landing.header.login")}
3847
type={ButtonType.Primary}
48+
ref={buttonRef}
3949
size={ButtonSize.Full}/>
4050
<p className={"sup"}
4151
dangerouslySetInnerHTML={{__html: DOMPurify.sanitize(I18n.t("landing.header.sup"))}}/>

0 commit comments

Comments
 (0)