diff --git a/src/components/modals/Modal.js b/src/components/modals/Modal.js index 382603a4..303fd2f8 100644 --- a/src/components/modals/Modal.js +++ b/src/components/modals/Modal.js @@ -2,6 +2,7 @@ var React = require('react'); export default class Modal extends React.Component { static propTypes = { + id: React.PropTypes.string, children: React.PropTypes.oneOfType([ React.PropTypes.array, React.PropTypes.element @@ -76,7 +77,7 @@ export default class Modal extends React.Component { render () { return ( -
+
× diff --git a/src/components/modals/ModalTextures.js b/src/components/modals/ModalTextures.js index b0bb27a5..3448095a 100644 --- a/src/components/modals/ModalTextures.js +++ b/src/components/modals/ModalTextures.js @@ -302,7 +302,7 @@ export default class ModalTextures extends React.Component { let addNewAssetButton = this.state.addNewDialogOpened ? 'BACK' : 'LOAD TEXTURE'; return ( - +
diff --git a/src/css/main.css b/src/css/main.css index cac5511b..bf95ed51 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -448,17 +448,21 @@ a.button:hover { margin: 0.6em 0; } + +#texture-modal .modal-content { + height: calc(100% - 50px); + width: calc(100% - 50px); +} + .modal-content { animation: animatetop 0.2s ease-out; animation-duration: 0.2s; animation-name: animatetop; background-color: #232323; box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.5), 0 6px 20px 0 rgba(0, 0, 0, 0.5); - height: calc(100% - 50px); margin: auto; overflow: hidden; padding: 0; - width: calc(100% - 50px); } @keyframes animateopacity {