Mercurial > gemma

changeset 3384:4ed940b0f0ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged
author Sascha Wilde <wilde@intevation.de>
date Wed, 22 May 2019 15:57:37 +0200
parents 194feb1a7e37 (current diff) 2d90ec061458 (diff)
children e994565a59a1
files
diffstat 3 files changed, 12 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/fairway/AvailableFairwayDepthLNWL.vue	Wed May 22 15:56:33 2019 +0200
+++ b/client/src/components/fairway/AvailableFairwayDepthLNWL.vue	Wed May 22 15:57:37 2019 +0200
@@ -513,8 +513,7 @@
         })
         .attr("width", this.barsWidth)
         .attr("fill", d => {
-          if (d.level === "LDC") return "#aaaaaa";
-          return "#3333cc";
+          return this.$options.LWNLCOLORS[d.level];
         });
     },
     drawScaleLabel() {
@@ -550,6 +549,10 @@
     }
   },
   LEGEND: app.$gettext("Percent"),
-  AFDCOLORS: ["#33333", "#666666", "#999999"]
+  AFDCOLORS: ["#782121", "#ff6c6c", "#3675ff"],
+  LWNLCOLORS: {
+    LDC: "#aaaaaa",
+    HDC: "#ff6600"
+  }
 };
 </script>
--- a/client/src/components/map/styles.js	Wed May 22 15:56:33 2019 +0200
+++ b/client/src/components/map/styles.js	Wed May 22 15:57:37 2019 +0200
@@ -253,21 +253,14 @@
         }),
         text: new Text({
           font: '10px "Open Sans", "sans-serif"',
-          offsetY: 14,
+          offsetY: 15,
           fill: new Fill({
-            color: isLegend ? "transparent" : "white"
+            color: "black"
           }),
-          text
-        })
-      }),
-      new Style({
-        text: new Text({
-          font: '10px "Open Sans", "sans-serif"',
-          offsetY: 13,
-          offsetX: -1,
-          fill: new Fill({
-            color: isLegend ? "transparent" : "black"
+          backgroundFill: new Fill({
+            color: "rgba(255, 255, 255, 0.7)"
           }),
+          padding: [2, 2, 2, 2],
           text
         })
       })
--- a/client/src/store/fairwayavailability.js	Wed May 22 15:56:33 2019 +0200
+++ b/client/src/store/fairwayavailability.js	Wed May 22 15:57:37 2019 +0200
@@ -231,7 +231,7 @@
       });
     },
     loadAvailableFairwayDepthLNWLDiagram: ({ commit, dispatch }, options) => {
-      dispatch("loadAvailableFairwayDepthLNWL", options).then(response => {
+      dispatch("loadAvailableFairwayDepthLNWL", options).then(() => {
         //const data = response;
         let data = LNWLDIAGRAMMOCKDATA;
         Object.keys(data).forEach(diagramComponent => {