# HG changeset patch # User Sascha L. Teichmann # Date 1543567553 -3600 # Node ID e94f3074f14cd23cba931a3203602a852d4f6092 # Parent d349618c6b506de910843b4aa4ab04be8bcf5a9d# Parent 59c9dbb26bb02441ab9443b4d6b33c607f965dd0 Merged default back into 'bulkreview' branch. diff -r d349618c6b50 -r e94f3074f14c client/src/components/map/toolbar/Profiles.vue --- a/client/src/components/map/toolbar/Profiles.vue Fri Nov 30 09:44:50 2018 +0100 +++ b/client/src/components/map/toolbar/Profiles.vue Fri Nov 30 09:45:53 2018 +0100 @@ -1,5 +1,5 @@ diff -r d349618c6b50 -r e94f3074f14c client/src/components/map/toolbar/Toolbar.vue --- a/client/src/components/map/toolbar/Toolbar.vue Fri Nov 30 09:44:50 2018 +0100 +++ b/client/src/components/map/toolbar/Toolbar.vue Fri Nov 30 09:45:53 2018 +0100 @@ -1,14 +1,16 @@ @@ -20,10 +22,9 @@ overflow: hidden transition: max-height 0.4s margin-bottom: auto - border-radius: $border-radius .toolbar-collapsed - max-height: (3 * $icon-height) + 1.2rem + max-height: 3 * $icon-height .toolbar-expanded max-height: 100%