From 4c10e45c6b39e83d5ed84a4d0a62034cd4a84533 Mon Sep 17 00:00:00 2001 From: muerwre Date: Mon, 27 Aug 2018 14:05:54 +0700 Subject: [PATCH] est time now permanently shown --- src/components/panels/EditorPanel.jsx | 19 +++++-------------- src/styles/colors.less | 2 ++ src/styles/map.less | 1 + src/styles/router.less | 21 ++++++++++++++++++--- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/src/components/panels/EditorPanel.jsx b/src/components/panels/EditorPanel.jsx index 0f72da9..624fefc 100644 --- a/src/components/panels/EditorPanel.jsx +++ b/src/components/panels/EditorPanel.jsx @@ -51,20 +51,11 @@ export class EditorPanel extends React.PureComponent {
- {(totalDistance > 0) - ? - - {totalDistance} км - - { - (estimateTime > 0) && (estimateTime > 0) && {toHours(estimateTime)} - } - - : -
editor.changeMode(MODES.ROUTER)}> -
Начать рисовать
-
- } + {totalDistance} км + + { + {toHours(estimateTime)} + }
diff --git a/src/styles/colors.less b/src/styles/colors.less index 6fd6db4..169dcd8 100644 --- a/src/styles/colors.less +++ b/src/styles/colors.less @@ -1,2 +1,4 @@ @blue_primary: #55ddff; @blue_secondary: #7137c8; + +@router_line: #4597d0; diff --git a/src/styles/map.less b/src/styles/map.less index cc45a2f..812e43a 100644 --- a/src/styles/map.less +++ b/src/styles/map.less @@ -10,6 +10,7 @@ } .leaflet-vertex-icon, .leaflet-middle-icon { + outline: none !important; border-radius: 10px; opacity :1; border: none; diff --git a/src/styles/router.less b/src/styles/router.less index db82cdc..78a7d7a 100644 --- a/src/styles/router.less +++ b/src/styles/router.less @@ -12,10 +12,25 @@ width: 20px; height: 20px; border-radius: 10px; - box-shadow: 0 0 0 2px #4597d0; - margin-left: 10px; - margin-top: 10px; + box-shadow: 0 0 0 2px @router_line; + position: absolute; + left: 10px; + top: 10px; } + + &:before { + content: ' '; + display: block; + width: 5px; + height: 5px; + border-radius: 10px; + box-shadow: 0 0 0 2px @router_line; + background: @router_line; + position: absolute; + left: 18px; + top: 18px; + } + } .router-helper {