Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix position of ScaleLine Control (OL3) #93

Merged
merged 3 commits into from
Oct 12, 2016
Merged

Fix position of ScaleLine Control (OL3) #93

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99e06dd
Fix position of ScaleLine Control when Sidebar-v2 is used with OpenLa…
jbelien Oct 12, 2016
5f87cf0
Fix position of ScaleLineControl (OL3)
jbelien Oct 12, 2016
1d5f6b6
Regroup SCSS .ol-zoom, .ol-scale-line (OL3)
jbelien Oct 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions scss/ol3-sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,26 @@ $sidebar-inner-border-radius: 2px !default;
margin-left: $width-lg + $sidebar-margins + $sidebar-border-width * 2;
}
}

.ol-scale-line {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we use .ol-zoom, .ol-scale-line { above to reduce code duplication?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Of course, stupid me !
Fix in a few seconds !

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;
}
}
}

&.collapsed ~ .sidebar-map {
Expand All @@ -35,6 +55,12 @@ $sidebar-inner-border-radius: 2px !default;
margin-left: $tab-size + $sidebar-margins + $sidebar-border-width * 2;
}
}

.ol-scale-line {
@media(min-width:$threshold-sm) {
margin-left: $tab-size + $sidebar-margins + $sidebar-border-width * 2;
}
}
}
}

Expand Down