Mercurial > gemma

changeset 1306:e496832d3ea1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Markus Kottlaender <markus@intevation.de>
date Fri, 23 Nov 2018 11:19:56 +0100
parents 6c0c204f6bce (diff) a8d1f2897c42 (current diff)
children 541a5488f0e7
files
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/map/fairway/Fairwayprofile.vue	Fri Nov 23 11:17:44 2018 +0100
+++ b/client/src/components/map/fairway/Fairwayprofile.vue	Fri Nov 23 11:19:56 2018 +0100
@@ -12,8 +12,10 @@
             v-if="showSplitscreen">
             <font-awesome-icon icon="times" />
         </button>
-        <div class="profile bg-white position-relative d-flex flex-column pr-5">
-            <h5 class="mb-0 mt-2">{{ selectedBottleneck }} ({{ selectedSurvey.date_info }})</h5>
+        <div class="profile bg-white position-relative d-flex flex-column">
+            <h5 class="headline border-bottom mb-0 py-2">
+              {{ selectedBottleneck }} ({{ selectedSurvey.date_info }})
+            </h5>
             <div class="d-flex flex-fill">
                 <div class="fairwayprofile m-3 mt-0 bg-white flex-grow-1"></div>
                 <div class="additionalsurveys d-flex flex-column">
@@ -95,10 +97,11 @@
   height: 0
   overflow: hidden
   z-index: 2
+  .headline
+    border-top: solid 3px $color-info
 
 .splitscreen-toggle,
 .clear-selection
-  right: $icon-width + $offset
   width: $icon-width
   height: $icon-height
   margin-top: 8px
@@ -107,8 +110,11 @@
   svg path
     fill: #666
 
+.splitscreen-toggle
+  right: $small-offset + $icon-width
+
 .clear-selection
-  right: $offset
+  right: $small-offset
 
 .show
   .profile
--- a/client/src/components/map/toolbar/Toolbar.vue	Fri Nov 23 11:17:44 2018 +0100
+++ b/client/src/components/map/toolbar/Toolbar.vue	Fri Nov 23 11:19:56 2018 +0100
@@ -9,7 +9,7 @@
             <Pdftool></Pdftool>
         </div>
         <div @click="$store.commit('application/expandToolbar', !expandToolbar)" class="toolbar-button bg-info text-white">
-            <font-awesome-icon icon="angle-down"></font-awesome-icon>
+            <font-awesome-icon :icon="expandToolbar ? 'angle-up' : 'angle-down'"></font-awesome-icon>
         </div>
     </div>
 </template>