Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add cancel button for exiting install modal #835

Merged
merged 11 commits into from
Jan 3, 2022
Merged

Add cancel button for exiting install modal #835

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
039d51b
Add cancel button for exiting install modal
Artumira8 Dec 29, 2021
b0a8414
changed close button to icon
Artumira8 Dec 30, 2021
45b75d5
removed comments
Artumira8 Dec 30, 2021
a1e45b7
relocate close icon to the right
Artumira8 Dec 30, 2021
fc173d6
fixed changes
Artumira8 Dec 30, 2021
3ae9a91
refactoring changes
Artumira8 Jan 1, 2022
6d61f26
remove files from commit and important from position
Artumira8 Jan 1, 2022
90a5878
merge fix
Artumira8 Jan 1, 2022
11222c3
delete unwanted files
Artumira8 Jan 1, 2022
e5eb61c
restored old values
Artumira8 Jan 1, 2022
7b51670
resolve settings file
Artumira8 Jan 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,17 @@ html,
color: white;
}

.close-icon {
position: absolute;
right: 2rem;
top: 2rem;
cursor: pointer;
}

.close-icon-container {
position: relative !important;
}

.button.is-secondary:hover {
background: var(--secondary-hover);
color: var(--text-tertiary);
Expand Down
7 changes: 5 additions & 2 deletions src/screens/Library/components/InstallModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { getInstallInfo, getProgress, install, writeConfig } from 'src/helpers'
import React, { useContext, useEffect, useState } from 'react'

import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
import { faFolderOpen } from '@fortawesome/free-solid-svg-icons'
import { faFolderOpen, faXmark } from '@fortawesome/free-solid-svg-icons'
import { faWindows, faApple } from '@fortawesome/free-brands-svg-icons'
import prettyBytes from 'pretty-bytes'
import { Checkbox } from '@material-ui/core'
Expand Down Expand Up @@ -173,7 +173,10 @@ export default function InstallModal({ appName, backdropClick }: Props) {
return (
<span className="modalContainer">
{gameInfo?.game?.title ? (
<div className="modal">
<div className="modal close-icon-container">
arielj marked this conversation as resolved.
Show resolved Hide resolved
<SvgButton onClick={() => backdropClick()}>
<FontAwesomeIcon className={'close-icon'} icon={faXmark} />
arielj marked this conversation as resolved.
Show resolved Hide resolved
</SvgButton>
<span className="title">
{gameInfo?.game?.title}
<FontAwesomeIcon icon={isMacNative ? faApple : faWindows} />
Expand Down