Mercurial > gemma

changeset 883:f237192ad94c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Bernhard Reiter <bernhard@intevation.de>
date Mon, 01 Oct 2018 17:04:57 +0200
parents 27282bfd1ba7 (current diff) 55fb73a3ebf7 (diff)
children ea580cab3ce2
files
diffstat 3 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/layers/Layers.vue	Mon Oct 01 13:51:31 2018 +0200
+++ b/client/src/layers/Layers.vue	Mon Oct 01 17:04:57 2018 +0200
@@ -6,7 +6,7 @@
             </div>
         </div>
         <div :class="layerSelectStyle">
-            <div v-if="!collapsed" class="card-body">
+            <div v-if="!collapsed" class="card-body layers">
                 <div class="headline">
                     <h4 class="card-title">Layers</h4>
                 </div>
@@ -31,13 +31,13 @@
 }
 
 .layerselectioncollapsed {
-  height: $icon-height;
+  min-height: $icon-height;
   width: $icon-width;
   transition: $transition-fast;
 }
 
 .layerselectionexpanded {
-  height: $layerselect-height;
+  min-height: $layerselect-height;
   width: $layerselect-width;
 }
 
--- a/client/src/logs/logs.vue	Mon Oct 01 13:51:31 2018 +0200
+++ b/client/src/logs/logs.vue	Mon Oct 01 17:04:57 2018 +0200
@@ -83,6 +83,10 @@
 <script>
 import { mapGetters } from "vuex";
 import { HTTP } from "../application/lib/http.js";
+import "../../node_modules/highlight.js/styles/paraiso-dark.css";
+import Vue from "vue";
+import VueHighlightJS from "vue-highlightjs";
+Vue.use(VueHighlightJS);
 
 const ACCESSLOG = "accesslog";
 const ERRORLOG = "errorlog";
--- a/client/src/main.js	Mon Oct 01 13:51:31 2018 +0200
+++ b/client/src/main.js	Mon Oct 01 17:04:57 2018 +0200
@@ -13,8 +13,6 @@
 import "../node_modules/cxlt-vue2-toastr/dist/css/cxlt-vue2-toastr.css";
 import "../node_modules/highlight.js/styles/paraiso-dark.css";
 import VTooltip from "v-tooltip";
-import VueHighlightJS from "vue-highlightjs";
-Vue.use(VueHighlightJS);
 
 Vue.use(VTooltip);