diff --git a/src/components/modals/Modals.jsx b/src/components/modals/Modals.jsx index b8ee652b..053bfc4c 100644 --- a/src/components/modals/Modals.jsx +++ b/src/components/modals/Modals.jsx @@ -44,7 +44,7 @@ export default class Modals extends React.PureComponent { return ( <> this.setState({ [modal]: true })}/> - this.setState({ mainModal: false })} isOpen={this.state.mainModal} className='Modal' overlayClassName='Overlay' ariaHideApp={false}> + this.setState({ mainModal: false })} isOpen={this.state.mainModal} className='Modal mainModal' overlayClassName='Overlay' ariaHideApp={false}>
this.setState({ mainModal: false })}/> diff --git a/src/components/modals/main/marketplace/Item.jsx b/src/components/modals/main/marketplace/Item.jsx index bea334ae..901bb33c 100644 --- a/src/components/modals/main/marketplace/Item.jsx +++ b/src/components/modals/main/marketplace/Item.jsx @@ -1,8 +1,8 @@ import React from 'react'; -//import Modal from 'react-modal'; +import Modal from 'react-modal'; -//import Lightbox from './Lightbox'; +import Lightbox from './Lightbox'; import ArrowBackIcon from '@material-ui/icons/ArrowBack'; @@ -66,9 +66,9 @@ export default class Item extends React.PureComponent { {warningHTML} - {/* this.setState({ showLightbox: false })} isOpen={this.state.showLightbox} className='Modal lightboxmodal' overlayClassName='Overlay resetoverlay' ariaHideApp={false}> + this.setState({ showLightbox: false })} isOpen={this.state.showLightbox} className='Modal lightboxmodal' overlayClassName='Overlay resetoverlay' ariaHideApp={false}> this.setState({ showLightbox: false })} img={iconsrc}/> - */} + ); } diff --git a/src/components/modals/main/scss/index.scss b/src/components/modals/main/scss/index.scss index a99931b8..754ece30 100644 --- a/src/components/modals/main/scss/index.scss +++ b/src/components/modals/main/scss/index.scss @@ -15,7 +15,6 @@ border: none; opacity: 1; z-index: -2; - padding: 25px; transition-timing-function: ease-in; border-radius: map-get($modal, 'border-radius'); user-select: none; @@ -28,6 +27,10 @@ } } +.mainModal { + padding: 25px; +} + .modalLink { color: var(--modal-link); cursor: pointer; @@ -70,8 +73,8 @@ } .ReactModal__Content { - min-height: calc(100vh - 30vh); - max-height: calc(100vh - 10vh); + //min-height: calc(100vh - 30vh); + //max-height: calc(100vh - 10vh); box-shadow: 0 0 30px 0 rgba(0, 0, 0, 0.25); overflow-y: auto; position: relative; @@ -101,7 +104,7 @@ @media only screen and (min-height: 700px) { .ReactModal__Content { - min-height: 600px; + //min-height: 600px; } } diff --git a/src/components/modals/main/scss/marketplace/_main.scss b/src/components/modals/main/scss/marketplace/_main.scss index 4577173d..74b9824c 100644 --- a/src/components/modals/main/scss/marketplace/_main.scss +++ b/src/components/modals/main/scss/marketplace/_main.scss @@ -198,12 +198,16 @@ p.description { .lightboxmodal { margin: auto; max-width: 60%; + background: none !important; + box-shadow: none !important; img { - max-height: 80%; - max-width: 80%; - display: block; - margin-left: auto; - margin-right: auto; + height: auto; + width: 100%; + } + + .closeModal { + color: #fff; + text-shadow: 0 0 20px rgb(0 0 0 / 30%); } } diff --git a/src/components/modals/main/settings/sections/Changelog.jsx b/src/components/modals/main/settings/sections/Changelog.jsx index 8747754e..61caf976 100644 --- a/src/components/modals/main/settings/sections/Changelog.jsx +++ b/src/components/modals/main/settings/sections/Changelog.jsx @@ -1,8 +1,8 @@ import React from 'react'; -//import Modal from 'react-modal'; +import Modal from 'react-modal'; -//import Lightbox from '../../marketplace/Lightbox'; +import Lightbox from '../../marketplace/Lightbox'; import WifiOffIcon from '@material-ui/icons/WifiOff'; @@ -103,9 +103,9 @@ export default class Changelog extends React.PureComponent {
{this.state.author} • {this.state.date}
{this.state.image ? {window.language.modals.update.title} : null}
- {/* this.setState({ showLightbox: false })} isOpen={this.state.showLightbox} className='Modal lightboxmodal' overlayClassName='Overlay resetoverlay' ariaHideApp={false}> + this.setState({ showLightbox: false })} isOpen={this.state.showLightbox} className='Modal lightboxmodal' overlayClassName='Overlay resetoverlay' ariaHideApp={false}> this.setState({ showLightbox: false })} img={this.state.lightboxImg}/> - */} +
); }