Skip to content

Commit

Permalink
Merge pull request #1951 from SUNET/eunju-new-qrcode-icon
Browse files Browse the repository at this point in the history
introduce new QR code icon
  • Loading branch information
cartja authored Jan 10, 2025
2 parents 4078a00 + da249d1 commit 2329142
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 4 deletions.
39 changes: 39 additions & 0 deletions img/qr-code.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 2 additions & 4 deletions src/components/Login/UsernamePw.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import { IconProp } from "@fortawesome/fontawesome-svg-core";
import { faQrcode } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { fetchUsernamePassword } from "apis/eduidLogin";
import EduIDButton from "components/Common/EduIDButton";
import TextInput from "components/Common/EduIDTextInput";
Expand All @@ -15,6 +12,7 @@ import { Link, useNavigate } from "react-router-dom";
import loginSlice from "slices/Login";
import { clearNotifications } from "slices/Notifications";
import resetPasswordSlice from "slices/ResetPassword";
import qrCode from "../../../img/qr-code.svg";
import { LoginAbortButton } from "./LoginAbortButton";
import { LoginAtServiceInfo } from "./LoginAtServiceInfo";
import { forgetThisDevice } from "./NewDevice";
Expand Down Expand Up @@ -225,7 +223,7 @@ function UsernamePwAnotherDeviceButton(): JSX.Element | null {

return (
<EduIDButton buttonstyle="primary" onClick={handleOnClick} className="btn-icon" id="login-other-device-button">
<FontAwesomeIcon icon={faQrcode as IconProp} />
<img className="qr-icon" height="20" alt="qr icon" src={qrCode} />
<FormattedMessage defaultMessage="Other device" description="Login UsernamePw" />
</EduIDButton>
);
Expand Down

0 comments on commit 2329142

Please sign in to comment.