# HG changeset patch # User Markus Kottlaender # Date 1542633181 -3600 # Node ID 9d93968db2cdb09c77d2f07c2d378e8b683047aa # Parent 387826a2efd318a132d35c17d9c172a1ad941bb0 replaced custom css with bootstrap classes diff -r 387826a2efd3 -r 9d93968db2cd client/src/application/Search.vue --- a/client/src/application/Search.vue Mon Nov 19 13:48:50 2018 +0100 +++ b/client/src/application/Search.vue Mon Nov 19 14:13:01 2018 +0100 @@ -43,13 +43,13 @@ box-shadow: none !important &.rounded-top-right border-radius: 0 !important - border-top-right-radius: 0.25rem !important + border-top-right-radius: $border-radius !important .searchlabel background-color: white !important &.rounded-top-left border-radius: 0 !important - border-top-left-radius: 0.25rem !important + border-top-left-radius: $border-radius !important .input-group-text height: $icon-height diff -r 387826a2efd3 -r 9d93968db2cd client/src/application/Sidebar.vue --- a/client/src/application/Sidebar.vue Mon Nov 19 13:48:50 2018 +0100 +++ b/client/src/application/Sidebar.vue Mon Nov 19 14:13:01 2018 +0100 @@ -2,7 +2,7 @@
@@ -110,7 +110,7 @@ }, sidebarStyle() { return [ - "ui-element position-relative sidebar shadow d-print-none mb-auto", + "ui-element position-relative sidebar rounded shadow d-print-none mb-auto", { sidebarcollapsed: !this.showSidebar, sidebarextended: this.showSidebar @@ -160,7 +160,6 @@ .menubutton background-color: white padding: $small-offset - border-radius: $border-radius height: $icon-height width: $icon-width top: 0 @@ -179,7 +178,6 @@ background-color: #ffffff padding-top: $large-offset opacity: $slight-transparent - border-radius: $border-radius .sidebarcollapsed height: 30px diff -r 387826a2efd3 -r 9d93968db2cd client/src/application/assets/application.sass --- a/client/src/application/assets/application.sass Mon Nov 19 13:48:50 2018 +0100 +++ b/client/src/application/assets/application.sass Mon Nov 19 14:13:01 2018 +0100 @@ -14,7 +14,7 @@ */ $basic-shadow-light: 1px 1px 12px 1px rgba(235, 235, 235, 0.75) $basic-shadow: 1px 3px 8px 2px rgba(220, 220, 220, 0.75) -$border-radius: 5px +$border-radius: 0.25rem $icon-height: 2rem $icon-width: 2rem $large-offset: 2rem diff -r 387826a2efd3 -r 9d93968db2cd client/src/bottlenecks/Bottlenecks.vue --- a/client/src/bottlenecks/Bottlenecks.vue Mon Nov 19 13:48:50 2018 +0100 +++ b/client/src/bottlenecks/Bottlenecks.vue Mon Nov 19 14:13:01 2018 +0100 @@ -106,7 +106,7 @@ ...mapState("map", ["openLayersMap"]), bottlenecksStyle() { return [ - "ui-element shadow bottlenecks border-top", + "ui-element shadow bottlenecks rounded-bottom border-top", { bottleneckscollapsed: !this.showBottlenecks, bottlenecksextended: this.showBottlenecks @@ -240,8 +240,6 @@ background-color: #ffffff padding-top: $offset opacity: $slight-transparent - border-bottom-left-radius: $border-radius - border-bottom-right-radius: $border-radius transition: left 0.3s ease overflow: hidden background: #fff @@ -260,7 +258,6 @@ z-index: 2 right: 0 top: 7px - border-radius: $border-radius height: $icon-width width: $icon-height display: none diff -r 387826a2efd3 -r 9d93968db2cd client/src/drawtool/Drawtool.vue --- a/client/src/drawtool/Drawtool.vue Mon Nov 19 13:48:50 2018 +0100 +++ b/client/src/drawtool/Drawtool.vue Mon Nov 19 14:13:01 2018 +0100 @@ -1,12 +1,12 @@