Regroup SCSS .ol-zoom, .ol-scale-line (OL3)

Turbo87 · Oct 12, 2016 · 1d5f6b6 · 1d5f6b6
1 parent 5f87cf0
commit 1d5f6b6
Showing 1 changed file with 2 additions and 28 deletions.
diff --git a/scss/ol3-sidebar.scss b/scss/ol3-sidebar.scss
@@ -7,27 +7,7 @@ $sidebar-inner-border-radius: 2px !default;
 
     & ~ .sidebar-map {
 
-        .ol-zoom {
-            margin-left: $tab-size + $sidebar-border-width * 2;
-
-            @media(min-width: $threshold-sm) {
-                transition: margin-left $sidebar-transition;
-            }
-
-            @media(min-width: $threshold-sm) and (max-width: $threshold-md - 1px) {
-                margin-left: $width-sm + $sidebar-margins + $sidebar-border-width * 2;
-            }
-
-            @media(min-width: $threshold-md) and (max-width: $threshold-lg - 1px) {
-                margin-left: $width-md + $sidebar-margins + $sidebar-border-width * 2;
-            }
-
-            @media(min-width: $threshold-lg) {
-                margin-left: $width-lg + $sidebar-margins + $sidebar-border-width * 2;
-            }
-        }
-
-        .ol-scale-line {
+        .ol-zoom, .ol-scale-line {
             margin-left: $tab-size + $sidebar-border-width * 2;
 
             @media(min-width: $threshold-sm) {
@@ -50,13 +30,7 @@ $sidebar-inner-border-radius: 2px !default;
 
     &.collapsed ~ .sidebar-map {
 
-        .ol-zoom {
-            @media(min-width:$threshold-sm) {
-                margin-left: $tab-size + $sidebar-margins + $sidebar-border-width * 2;
-            }
-        }
-
-        .ol-scale-line {
+        .ol-zoom, .ol-scale-line {
             @media(min-width:$threshold-sm) {
                 margin-left: $tab-size + $sidebar-margins + $sidebar-border-width * 2;
             }