changeset 1287:54b7d8e2b224

merge
author Markus Kottlaender <markus@intevation.de>
date Thu, 22 Nov 2018 11:48:54 +0100
parents ac6edfb83cf1 (current diff) f674ce380de1 (diff)
children 9f7dc950ffd2
files client/src/assets/application.sass
diffstat 3 files changed, 27 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/assets/application.sass	Thu Nov 22 11:48:30 2018 +0100
+++ b/client/src/assets/application.sass	Thu Nov 22 11:48:54 2018 +0100
@@ -38,6 +38,9 @@
 .w-90
   width: 90%
 
+.w-95
+  width: 95%
+
 .debug
   border: 1px solid red
 
--- a/client/src/components/map/contextbox/ImportSoundingresults.vue	Thu Nov 22 11:48:30 2018 +0100
+++ b/client/src/components/map/contextbox/ImportSoundingresults.vue	Thu Nov 22 11:48:54 2018 +0100
@@ -4,7 +4,7 @@
             <i class="fa fa-upload mr-2"></i>
             Import Soundingresults
         </h6>
-        <div v-if="editState" class="ml-auto mr-auto mt-4 w-90">
+        <div v-if="editState" class="ml-auto mr-auto mt-4 w-95">
             <div class="d-flex flex-row input-group mb-4">
                 <div class="offset-r">
                     <label for="bottleneck" class="label-text" id="bottlenecklabel">Bottleneck</label>
@@ -32,10 +32,11 @@
                     aria-describedby="bottlenecklabel"
                     v-model="importDate"
                 >
-            </div>
-            <div class="d-flex flex-row input-group mb-4">
                 <div class="offset-r">
-                    <label class="label-text" for="depthreference">Depth reference</label>
+                    <label
+                        class="label-text w-100 depthreferencelabel"
+                        for="depthreference"
+                    >Depthreference</label>
                 </div>
                 <select v-model="depthReference" class="custom-select" id="depthreference">
                     <option
@@ -45,7 +46,7 @@
                 </select>
             </div>
         </div>
-        <div class="w-90 ml-auto mr-auto mt-4 mb-4">
+        <div class="w-95 ml-auto mr-auto mt-4 mb-4">
             <div v-if="uploadState" class="d-flex flex-row input-group mb-4">
                 <div class="custom-file">
                     <input
@@ -260,14 +261,17 @@
 </script>
 
 <style lang="sass" scoped>
+.depthreferencelabel
+  margin-left: $small-offset
+
 .offset-r
-  margin-right: $large-offset
+  margin-right: $small-offset
 
 .buttons button
   margin-left: $offset !important
 
 .label-text
-  width: 10rem
+  width: 5rem
   text-align: left
   line-height: 2.25rem
 </style>
--- a/schema/isrs.sql	Thu Nov 22 11:48:30 2018 +0100
+++ b/schema/isrs.sql	Thu Nov 22 11:48:54 2018 +0100
@@ -1,3 +1,16 @@
+-- This is Free Software under GNU Affero General Public License v >= 3.0
+-- without warranty, see README.md and license for details.
+
+-- SPDX-License-Identifier: AGPL-3.0-or-later
+-- License-Filename: LICENSES/AGPL-3.0.txt
+
+-- Copyright (C) 2018 by via donau
+--   – Österreichische Wasserstraßen-Gesellschaft mbH
+-- Software engineering by Intevation GmbH
+
+-- Author(s):
+--  * Tom Gottfried <tom.gottfried@intevation.de>
+
 --
 -- Types and functions for ISRS location codes
 --