muerwre/orchidmap-front
1
0
Fork 0
mirror of https://github.com/muerwre/orchidmap-front.git synced 2025-04-30 13:36:41 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions

appearance: icons fixed

Browse source
This commit is contained in:
muerwre 2018-11-27 12:02:04 +07:00
parent 9e186397e0
commit 169d4d4222
16 changed files with 290 additions and 120 deletions

36
src/components/panels/EditorPanel.jsx
View file

@ -73,7 +73,7 @@ class Component extends React.PureComponent<Props, void> {
</div>
<div className={classnames('panel right', { active: editing })} ref={el => { this.panel = el; }}>
<div className="control-bar">
<div className="control-bar control-bar-padded">
<button
className={classnames({ active: mode === MODES.ROUTER })}
onClick={this.startRouterMode}
@ -84,39 +84,45 @@ class Component extends React.PureComponent<Props, void> {
className={classnames({ active: mode === MODES.POLY })}
onClick={this.startPolyMode}
>
<Icon icon="icon-poly-2" />
<Icon icon="icon-poly-3" />
</button>
<button
className={classnames({ active: mode === MODES.STICKERS })}
onClick={this.startStickerMode}
>
<Icon icon="icon-sticker-2" />
<Icon icon="icon-sticker-3" />
</button>
</div>
<div className="control-sep" />
<div className="control-bar">
<button
className={classnames({ active: mode === MODES.SHOTTER })}
onClick={this.startShotterMode}
>
<Icon icon="icon-shot-2" />
</button>
<div className="control-bar control-bar-padded">
<button
className={classnames({ active: mode === MODES.TRASH })}
onClick={this.startTrashMode}
>
<Icon icon="icon-trash-2" />
<Icon icon="icon-trash-4" />
</button>
<button
className={classnames('disabled', { active: mode === MODES.SHOTTER })}
// onClick={this.startShotterMode}
>
<Icon icon="icon-shot-3" />
</button>
<button
className={classnames('disabled', { active: mode === MODES.LOGO })}
>
<Icon icon="icon-map-1" />
</button>
<button
className={classnames({ active: mode === MODES.LOGO })}
onClick={this.startLogoMode}
>
<Icon icon="icon-logo-2" />
<Icon icon="icon-logo-3" />
</button>
</div>
@ -127,7 +133,7 @@ class Component extends React.PureComponent<Props, void> {
className="highlighted cancel"
onClick={this.props.stopEditing}
>
<span>ОТМЕНА</span>
<Icon icon="icon-cancel-1" />
</button>
<button
@ -135,7 +141,7 @@ class Component extends React.PureComponent<Props, void> {
onClick={this.startSaveMode}
>
<span>СХОРОНИТЬ</span>
<Icon icon="icon-save-2" />
<Icon icon="icon-check-1" />
</button>
</div>

17
src/components/router/RouterDialog.jsx
View file

@ -1,4 +1,5 @@
import React from 'react';
import { Icon } from '$components/panels/Icon';
type Props = {
routerCancel: Function,
@ -9,8 +10,10 @@ type Props = {
const noPoints = ({ routerCancel }: Props) => (
<div className="helper router-helper">
<div className="helper__text">
<div className="big white">Укажите на карте первую точку маршрута</div>
<div className="small gray">Путь прокладывается по улицам, тротуарам и тропинкам</div>
<Icon icon="icon-pin-1" />
<div className="big white upper">
Укажите первую точку на карте
</div>
</div>
<div className="helper__buttons">
<div className="button router-helper__button" onClick={routerCancel}>
@ -23,8 +26,8 @@ const noPoints = ({ routerCancel }: Props) => (
const firstPoint = ({ routerCancel }: Props) => (
<div className="helper router-helper">
<div className="helper__text">
<div className="big white">Укажите на карте конечную точку маршрута</div>
<div className="small gray"> Вы сможете добавить уточняющие точки</div>
<Icon icon="icon-pin-1" />
<div className="big white upper">Теперь - следующую</div>
</div>
<div className="helper__buttons">
<div className="button router-helper__button" onClick={routerCancel}>
@ -36,9 +39,9 @@ const firstPoint = ({ routerCancel }: Props) => (
const draggablePoints = ({ routerCancel, routerSubmit }: Props) => (
<div className="helper router-helper">
<div className="helper__text">
<div className="big white">Продолжите маршрут, щелкая по карте</div>
<div className="small gray">Потяните линию, чтобы указать промежуточные точки</div>
<div className="helper__text success">
<Icon icon="icon-check-1" />
<div className="big upper">Продолжайте маршрут</div>
</div>
<div className="helper__buttons button-group">
<div className="button button_red router-helper__button" onClick={routerCancel}>

24
src/components/trash/TrashDialog.jsx
View file

@ -1,4 +1,5 @@
import React from 'react';
import { Icon } from '$components/panels/Icon';
type Props = {
clearPoly: Function,
@ -12,18 +13,19 @@ export const TrashDialog = ({
}: Props) => (
<div className="helper trash-helper">
<div className="helper__text">
<div className="big white">Уверены?</div>
<div className="small gray">Мы все удалим</div>
<div className="big white upper">Уверены?</div>
</div>
<div className="helper__buttons button-group">
<div className="button router-helper__button" onClick={clearStickers}>
Стикеры
</div>
<div className="button router-helper__button" onClick={clearPoly}>
Маршрут
</div>
<div className="button danger router-helper__button" onClick={clearAll}>
Очистить
<div className="helper__buttons">
<div className="button-group">
<div className="button router-helper__button" onClick={clearPoly}>
Маршрут
</div>
<div className="button router-helper__button" onClick={clearStickers}>
Стикеры
</div>
<div className="button danger router-helper__button" onClick={clearAll}>
Удалить все
</div>
</div>
<div className="button primary router-helper__button" onClick={clearCancel}>
Отмена

4
src/components/user/GuestButton.jsx
View file

@ -1,16 +1,18 @@
// @flow
import React from 'react';
import { Icon } from '$components/panels/Icon';
type Props = {
onClick: Function,
}
export const GuestButton = ({ onClick }: Props) => (
<div className="control-bar user-bar">
<div className="control-bar user-bar control-bar-padded">
<button
className="user-bar-guest"
onClick={onClick}
>
<Icon icon="icon-reg-1" />
<span>ВОЙТИ</span>
</button>
</div>