diff options
| -rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/modal_root.js | 2 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/mastodon-light.scss | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/modal_root.js b/app/javascript/flavours/glitch/features/ui/components/modal_root.js index cdb6dc9d0..7e9980ef7 100644 --- a/app/javascript/flavours/glitch/features/ui/components/modal_root.js +++ b/app/javascript/flavours/glitch/features/ui/components/modal_root.js @@ -59,7 +59,7 @@ export default class ModalRoot extends React.PureComponent { const visible = !!type; return ( - <Base onClose={onClose} noEsc={props.noEsc}> + <Base onClose={onClose} noEsc={props ? props.noEsc : false}> {visible && ( <BundleContainer fetchComponent={MODAL_COMPONENTS[type]} loading={this.renderLoading(type)} error={this.renderError} renderDelay={200}> {(SpecificComponent) => <SpecificComponent {...props} onClose={onClose} />} diff --git a/app/javascript/flavours/glitch/styles/mastodon-light.scss b/app/javascript/flavours/glitch/styles/mastodon-light.scss index 46f88c994..029d5dde2 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light.scss @@ -122,6 +122,8 @@ $account-background-color: white; .composer--spoiler input, .composer--textarea textarea { color: darken($ui-base-color, 80%); + &:disabled { background: darken($simple-background-color, 10%) } + &::placeholder { color: darken($ui-base-color, 70%); } |