diff --git a/src/components/dialogs/ShotPrefetchDialog.jsx b/src/components/dialogs/ShotPrefetchDialog.jsx index fed53ba..39a2d25 100644 --- a/src/components/dialogs/ShotPrefetchDialog.jsx +++ b/src/components/dialogs/ShotPrefetchDialog.jsx @@ -8,7 +8,7 @@ type Props = { } export const ShotPrefetchDialog = ({ renderer: { info, progress }}: Props) => ( -
+
{info}
diff --git a/src/components/panels/EditorPanel.jsx b/src/components/panels/EditorPanel.jsx index 6b7742c..893d14e 100644 --- a/src/components/panels/EditorPanel.jsx +++ b/src/components/panels/EditorPanel.jsx @@ -125,13 +125,6 @@ class Component extends React.PureComponent { > - -
@@ -156,17 +149,6 @@ class Component extends React.PureComponent {
-
- -
- -
-
+ +
+ +
+ +
); diff --git a/src/index.html b/src/index.html index 86070f0..390fc91 100644 --- a/src/index.html +++ b/src/index.html @@ -1,7 +1,7 @@ - + diff --git a/src/redux/user/sagas.js b/src/redux/user/sagas.js index b534474..571a7e2 100644 --- a/src/redux/user/sagas.js +++ b/src/redux/user/sagas.js @@ -307,6 +307,8 @@ function* setSaveSuccessSaga({ address, title }) { } function* getRenderData() { + yield put(setRenderer({ info: 'Загрузка тайлов', progress: 0.1 })); + const canvas = document.getElementById('renderer'); canvas.width = window.innerWidth; canvas.height = window.innerHeight; @@ -317,7 +319,7 @@ function* getRenderData() { const stickers = getStickersPlacement(); ctx.clearRect(0, 0, canvas.width, canvas.height); - yield put(setRenderer({ info: 'Загрузка тайлов', progress: 0.1 })); + yield delay(10000); const images = yield fetchImages(ctx, geometry); diff --git a/src/styles/colors.less b/src/styles/colors.less index 9d3ad64..03de625 100644 --- a/src/styles/colors.less +++ b/src/styles/colors.less @@ -25,3 +25,4 @@ @dialog_shadow: rgba(0,0,0,0.3) 0 2px 0; @mobile_breakpoint: 768px; +@micro_breakpoint: 390px; diff --git a/src/styles/panel.less b/src/styles/panel.less index a1fcf06..8c174bd 100644 --- a/src/styles/panel.less +++ b/src/styles/panel.less @@ -165,7 +165,7 @@ .panel-user { @media (max-width: @mobile_breakpoint) { - z-index: 1; + z-index: 3; flex-direction: column-reverse; .control-sep { @@ -173,6 +173,10 @@ height: 10px; } } + + @media (max-width: @micro_breakpoint) { + bottom: 68px; + } } .control-dialog { @@ -190,6 +194,11 @@ top: 52px; } + &.left { + right: auto; + left: 10px; + } + &.control-dialog-big { min-width: 555px; @@ -215,7 +224,7 @@ } &.control-dialog-small { - min-width: 312px; + min-width: 270px; @media (max-width: @mobile_breakpoint) { min-width: 100%;