diff --git a/lib/gui.js b/lib/gui.js index a8faab2..8def2fd 100644 --- a/lib/gui.js +++ b/lib/gui.js @@ -63,7 +63,7 @@ function (d3Interpolate, Map, Sidebar, Tabs, Container, Legend, Linklist, contentDiv.appendChild(buttons); var buttonToggle = document.createElement('button'); - buttonToggle.classList.add('ion-eye', 'shadow'); + buttonToggle.classList.add('ion-eye'); buttonToggle.setAttribute('data-tooltip', _.t('button.switchView')); buttonToggle.onclick = function onclick() { var data; diff --git a/lib/map/button.js b/lib/map/button.js index e2199e4..aee508c 100644 --- a/lib/map/button.js +++ b/lib/map/button.js @@ -28,7 +28,7 @@ define(['map/clientlayer', 'map/labellayer', 'leaflet', 'map/locationmarker'], var LocateButton = ButtonBase.extend({ onAdd: function () { - var button = L.DomUtil.create('button', 'ion-locate shadow'); + var button = L.DomUtil.create('button', 'ion-locate'); button.setAttribute('data-tooltip', _.t('button.tracking')); L.DomEvent.disableClickPropagation(button); L.DomEvent.addListener(button, 'click', this.onClick, this); @@ -45,7 +45,7 @@ define(['map/clientlayer', 'map/labellayer', 'leaflet', 'map/locationmarker'], var CoordsPickerButton = ButtonBase.extend({ onAdd: function () { - var button = L.DomUtil.create('button', 'ion-pin shadow'); + var button = L.DomUtil.create('button', 'ion-pin'); button.setAttribute('data-tooltip', _.t('button.location')); // Click propagation isn't disabled as this causes problems with the diff --git a/lib/sidebar.js b/lib/sidebar.js index d9742fb..b252126 100644 --- a/lib/sidebar.js +++ b/lib/sidebar.js @@ -17,7 +17,7 @@ define(function () { var button = document.createElement('button'); sidebar.appendChild(button); - button.classList.add('sidebarhandle', 'shadow'); + button.classList.add('sidebarhandle'); button.onclick = function onclick() { sidebar.classList.toggle('hidden'); }; diff --git a/scss/main.scss b/scss/main.scss index 5af40ee..351edeb 100644 --- a/scss/main.scss +++ b/scss/main.scss @@ -3,7 +3,6 @@ @import 'custom/variables'; // Mixins -@import 'mixins/shadow'; @import 'mixins/icon'; @import 'mixins/font'; diff --git a/scss/mixins/_shadow.scss b/scss/mixins/_shadow.scss deleted file mode 100644 index 1275832..0000000 --- a/scss/mixins/_shadow.scss +++ /dev/null @@ -1,14 +0,0 @@ -// Original is in LESS and can be found here: https://gist.github.com/gefangenimnetz/3ef3e18364edf105c5af -@mixin shadow($level: 1) { - @if $level == 1 { - box-shadow: 0 1px 3px transparentize($color-black, .88), 0 1px 2px transparentize($color-black, .76); - } @else if $level == 2 { - box-shadow: 0 3px 6px transparentize($color-black, .84), 0 3px 6px transparentize($color-black, .77); - } @else if $level == 3 { - box-shadow: 0 10px 20px transparentize($color-black, .81), 0 6px 6px transparentize($color-black, .77); - } @else if $level == 4 { - box-shadow: 0 14px 28px transparentize($color-black, .75), 0 10px 10px transparentize($color-black, .78); - } @else if $level == 5 { - box-shadow: 0 19px 38px transparentize($color-black, .7), 0 15px 12px transparentize($color-black, .78); - } -} diff --git a/scss/modules/_button.scss b/scss/modules/_button.scss index 21a7cb5..4df73b5 100644 --- a/scss/modules/_button.scss +++ b/scss/modules/_button.scss @@ -37,20 +37,6 @@ button { color: $color-primary; } - @if $shadows == 1 { - &.shadow { - @include shadow(1); - - &:hover { - @include shadow(2); - } - - &:active { - box-shadow: inset 0 5px 20px transparentize($color-black, .81), inset 0 3px 6px transparentize($color-black, .77); - } - } - } - // Tooltip &[data-tooltip] { &::after { @@ -78,9 +64,6 @@ button { &.close { background-color: transparent; border-radius: 0; - @if $shadows == 1 { - box-shadow: none; - } color: transparentize($color-black, .5); float: right; font-size: $button-font-size; diff --git a/scss/modules/_sidebar.scss b/scss/modules/_sidebar.scss index bc021f3..cbb13f1 100644 --- a/scss/modules/_sidebar.scss +++ b/scss/modules/_sidebar.scss @@ -64,12 +64,8 @@ } .container { - @if $shadows == 1 { - @include shadow(2); - } @else { - border-right: 1px solid darken($color-white, 10%); - } background: transparentize($color-white, .03); + border-right: 1px solid darken($color-white, 10%); min-height: 100vh; overflow-y: visible; @@ -91,9 +87,6 @@ .container, .infobox { border-radius: 0; - @if $shadows == 1 { - box-shadow: none; - } margin: 0; } } @@ -120,7 +113,7 @@ left: $sidebar-width + 2 * $button-distance; position: fixed; top: $button-distance; - transition: left .5s, box-shadow .5s, color .5s, transform .5s; + transition: left .5s, color .5s, transform .5s; z-index: 1010; &::after { diff --git a/scss/modules/_tabs.scss b/scss/modules/_tabs.scss index 2065139..ee21caf 100644 --- a/scss/modules/_tabs.scss +++ b/scss/modules/_tabs.scss @@ -1,11 +1,7 @@ .tabs { - @if $shadows == 1 { - @include shadow(1); - } @else { - border: 0 solid darken($color-white, 10%); - border-bottom-width: 1px; - } background: transparentize($color-black, .98); + border: 0 solid darken($color-white, 10%); + border-bottom-width: 1px; display: flex; display: -webkit-flex; // sass-lint:disable-line no-vendor-prefixes no-duplicate-properties list-style: none; diff --git a/scss/modules/_variables.scss b/scss/modules/_variables.scss index 6e405eb..8992af2 100644 --- a/scss/modules/_variables.scss +++ b/scss/modules/_variables.scss @@ -43,8 +43,5 @@ $grid-breakpoints: ( $sidebar-width: map-get($grid-breakpoints, xl) * .45 !default; $sidebar-width-small: map-get($grid-breakpoints, lg) * .45 !default; -// En/disable box-shadows -$shadows: 0 !default; - // En/disable included font $use-included-font: 1 !default; diff --git a/scss/night.scss b/scss/night.scss index e942057..38a7adf 100644 --- a/scss/night.scss +++ b/scss/night.scss @@ -1,4 +1,4 @@ -// Overwrite normal style (colors) - shadows are ignored +// Overwrite normal style (colors) @import 'modules/variables'; @import 'custom/variables';