diff --git a/src/components/dialogs/AppInfoDialog.tsx b/src/components/dialogs/AppInfoDialog.tsx index 9441f68..3fb84e7 100644 --- a/src/components/dialogs/AppInfoDialog.tsx +++ b/src/components/dialogs/AppInfoDialog.tsx @@ -1,75 +1,62 @@ // @flow -import React from 'react'; +import React, { Fragment } from 'react'; import { Scroll } from '~/components/Scroll'; import { APP_INFO } from '~/constants/app_info'; export const AppInfoDialog = () => ( -
-
-
- Orchid Map -
-
- версия{' '} - {(APP_INFO.VERSION || 1)}. - {(APP_INFO.CHANGELOG[APP_INFO.VERSION].length || 0)}. - {(APP_INFO.CHANGELOG[APP_INFO.VERSION][0].length - 1 || 0)} -
-
-
-
-
Исходный код:
- github.com/muerwre/orchid-front -
- github.com/muerwre/orchid-backend + +
+ +
+
+
Orchid Map
+
+ версия {APP_INFO.VERSION || 1}.{APP_INFO.CHANGELOG[APP_INFO.VERSION].length || 0}. + {APP_INFO.CHANGELOG[APP_INFO.VERSION][0].length - 1 || 0}
-
-
Frontend:
- ReactJS,{' '} - Leaflet,{' '} - Leaflet Routing Machine{' '} -
-
-
Backend:
- OSRM,{' '} - Golang,{' '} - Nginx,{' '} +
+
+ +
+
Frontend:
+ + ReactJS + + ,{' '} + + Leaflet + + ,{' '} + + Leaflet Routing Machine + {' '} +
+
+
Backend:
+ + OSRM + + ,{' '} + + Golang + + ,{' '} + + Nginx + + ,{' '} +
- -
-
-

История изменений

- { - [...Object.keys(APP_INFO.CHANGELOG)].reverse().map((version, i) => ( -
-
{version}.
-
- { - APP_INFO.CHANGELOG[version].map((release, y) => ( -
-
{APP_INFO.CHANGELOG[version].length - y}.
-
- { - APP_INFO.CHANGELOG[version][y].map((build, z) => ( -
-
{(z)}.
- {APP_INFO.CHANGELOG[version][y][z]} -
- )) - } -
-
- )) - } -
-
- )) - } -
-
-
-
+ ); - diff --git a/src/components/dialogs/MapListDialog.tsx b/src/components/dialogs/MapListDialog.tsx index a351192..7bca6a3 100644 --- a/src/components/dialogs/MapListDialog.tsx +++ b/src/components/dialogs/MapListDialog.tsx @@ -163,7 +163,7 @@ class MapListDialogUnconnected extends PureComponent { const { editor_target, menu_target, is_editing, is_dropping } = this.state; return ( -
+
{list.length === 0 && loading && (
diff --git a/src/styles/dialogs.less b/src/styles/dialogs.less index 262eee4..ca518fe 100644 --- a/src/styles/dialogs.less +++ b/src/styles/dialogs.less @@ -1,13 +1,12 @@ .dialog { - // background: #222222; - // background: linear-gradient(130deg, #320523, #020d2b); - // background: #271535; position: fixed; left: 0; top: 0; width: 360px; height: 100%; z-index: 5; + display: flex; + flex-direction: column; padding: 10px 10px 68px 10px; box-sizing: border-box; @@ -77,7 +76,6 @@ .dialog-content { background: @dialog_background; - height: 100%; overflow: hidden; position: relative; border-radius: @panel_radius @panel_radius 0 @panel_radius; @@ -90,6 +88,10 @@ color: white; opacity: 0.8; } + + &.full { + flex: 1; + } } .dialog-shader {