appearance: much more fixes

This commit is contained in:
muerwre 2018-11-27 13:07:50 +07:00
parent 291280c52e
commit b586663827
11 changed files with 64 additions and 23 deletions

View file

@ -46,9 +46,19 @@ export const Component = (props: Props) => {
|| mode === MODES.CONFIRM_CANCEL
);
const dialogIsSmall = (
mode === MODES.LOGO
);
return (
showDialog &&
<div id="control-dialog" style={{ width }}>
<div
id="control-dialog"
style={{
width: dialogIsSmall ? 201 : width,
right: dialogIsSmall ? 217 : 10,
}}
>
{ mode === MODES.ROUTER && <RouterDialog {...props} /> }
{ mode === MODES.STICKERS && <StickersDialog {...props} /> }
{ mode === MODES.TRASH && <TrashDialog {...props} /> }

View file

@ -150,10 +150,10 @@ class Component extends React.PureComponent<Props, void> {
<div className={classnames('panel right', { active: !editing })}>
<div className="control-bar">
<button
className={classnames({ active: mode === MODES.SHOTTER })}
className={classnames('disabled', { active: mode === MODES.SHOTTER })}
onClick={this.startShotterMode}
>
<Icon icon="icon-shot-2" />
<Icon icon="icon-shot-3" />
<span>
СНИМОК
</span>

View file

@ -87,6 +87,18 @@ export class Component extends React.PureComponent<Props, void> {
<UserMenu user={user} userLogout={this.props.userLogout} />
}
</div>
<div className="control-sep" />
<div className="control-bar">
<button
className="disabled"
// className={classnames({ active: mode === MODES.SHOTTER })}
// onClick={this.startShotterMode}
>
<Icon icon="icon-shot-3" />
</button>
</div>
</div>
</div>
);

View file

@ -2,6 +2,7 @@ import React from 'react';
import { MODES } from '$constants/modes';
import { editor } from '$modules/Editor';
import { Icon } from '$components/panels/Icon';
type Props = {
stopEditing: Function,
@ -24,12 +25,12 @@ export class CancelDialog extends React.Component<Props, void> {
render() {
return (
<div className="helper cancel-helper">
<div className="helper__text">
<div className="big white">Изменения не сохранены!</div>
<div className="small gray">Закрыть редактор?</div>
<div className="helper__text danger">
<Icon icon="icon-cancel-1" />
<div className="big upper">Закрыть редактор?</div>
</div>
<div className="helper__buttons">
<div className="button danger router-helper__button" onClick={this.cancel}>
<div className="button router-helper__button" onClick={this.cancel}>
Удалить измения
</div>

View file

@ -14,7 +14,7 @@ export const TrashDialog = ({
<div className="helper trash-helper">
<div className="helper__text danger">
<Icon icon="icon-trash-4" />
<div className="big upper">Уверены?</div>
<div className="big upper">Удалить:</div>
</div>
<div className="helper__buttons">
<div className="button-group">