Mercurial > gemma

changeset 1259:f80d1fd54806

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed duplicated css and added comment
author Markus Kottlaender <markus@intevation.de>
date Wed, 21 Nov 2018 12:44:04 +0100
parents d1114305a311
children 3e7f92182983
files client/src/application/assets/application.sass client/src/toolbar/Toolbar.vue
diffstat 2 files changed, 3 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/application/assets/application.sass	Wed Nov 21 12:38:39 2018 +0100
+++ b/client/src/application/assets/application.sass	Wed Nov 21 12:44:04 2018 +0100
@@ -64,20 +64,3 @@
   max-width: 999px
   margin-left: 0.5rem
   margin-right: 0.5rem
-
-.toolbar-button
-  height: $icon-width
-  width: $icon-height
-  align-items: center
-  justify-content: center
-  display: flex
-  background: #fff
-  margin-bottom: $offset
-  border-radius: $border-radius
-  box-shadow: $shadow-xs
-  z-index: 2
-  pointer-events: auto
-  .inverted
-    color: #07f
-  .grey
-    color: #ddd
--- a/client/src/toolbar/Toolbar.vue	Wed Nov 21 12:38:39 2018 +0100
+++ b/client/src/toolbar/Toolbar.vue	Wed Nov 21 12:44:04 2018 +0100
@@ -2,15 +2,16 @@
     <div class="ml-2">
         <Identify></Identify>
         <Layers></Layers>
+        <Cuttool></Cuttool>
         <Linetool></Linetool>
         <Polygontool></Polygontool>
-        <Cuttool></Cuttool>
         <Pdftool></Pdftool>
     </div>
 </template>
 
 <style lang="sass">
 // not scoped to affect nested components
+// doen't work when put in application/assets/application.sass... why??? o_O
 .toolbar-button
   height: $icon-width
   width: $icon-height
@@ -20,7 +21,7 @@
   background: #fff
   margin-bottom: $offset
   border-radius: $border-radius
-  box-shadow: 0 0.1rem 0.3rem rgba(0, 0, 0, 0.15)
+  box-shadow: $shadow-xs
   z-index: 2
   pointer-events: auto
   .inverted