Merge pull request #93 from jbelien/master

Fix position of ScaleLine Control (OL3)
Turbo87 · Oct 12, 2016 · 9fe8ae3 · 9fe8ae3
2 parents 3b1dbec + 1d5f6b6
commit 9fe8ae3
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/css/ol3-sidebar.css b/css/ol3-sidebar.css
@@ -179,6 +179,25 @@
   .sidebar-left.collapsed ~ .sidebar-map .ol-zoom {
     margin-left: 52px; } }
 
+.sidebar-left ~ .sidebar-map .ol-scale-line {
+  margin-left: 46px; }
+  @media (min-width: 768px) {
+    .sidebar-left ~ .sidebar-map .ol-scale-line {
+      transition: margin-left 500ms; } }
+  @media (min-width: 768px) and (max-width: 991px) {
+    .sidebar-left ~ .sidebar-map .ol-scale-line {
+      margin-left: 317px; } }
+  @media (min-width: 992px) and (max-width: 1199px) {
+    .sidebar-left ~ .sidebar-map .ol-scale-line {
+      margin-left: 402px; } }
+  @media (min-width: 1200px) {
+    .sidebar-left ~ .sidebar-map .ol-scale-line {
+      margin-left: 472px; } }
+
+@media (min-width: 768px) {
+  .sidebar-left.collapsed ~ .sidebar-map .ol-scale-line {
+    margin-left: 52px; } }
+
 .sidebar-right ~ .sidebar-map .ol-rotate,
 .sidebar-right ~ .sidebar-map .ol-attribution,
 .sidebar-right ~ .sidebar-map .ol-full-screen {

diff --git a/css/ol3-sidebar.min.css b/css/ol3-sidebar.min.css
diff --git a/scss/ol3-sidebar.scss b/scss/ol3-sidebar.scss
@@ -7,7 +7,7 @@ $sidebar-inner-border-radius: 2px !default;
 
     & ~ .sidebar-map {
 
-        .ol-zoom {
+        .ol-zoom, .ol-scale-line {
             margin-left: $tab-size + $sidebar-border-width * 2;
 
             @media(min-width: $threshold-sm) {
@@ -30,7 +30,7 @@ $sidebar-inner-border-radius: 2px !default;
 
     &.collapsed ~ .sidebar-map {
 
-        .ol-zoom {
+        .ol-zoom, .ol-scale-line {
             @media(min-width:$threshold-sm) {
                 margin-left: $tab-size + $sidebar-margins + $sidebar-border-width * 2;
             }