Skip to content

Commit

Permalink
Migrate MapMixin.css to SCSS
Browse files Browse the repository at this point in the history
  • Loading branch information
m-mohr committed Sep 19, 2022
1 parent c7ff116 commit 95cbf7e
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 49 deletions.
2 changes: 1 addition & 1 deletion src/components/datatypes/GeoJsonEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ export default {
}
</script>

<style src="../maps/MapMixin.css"></style>
<style src="../maps/MapMixin.scss" lang="scss"></style>
2 changes: 1 addition & 1 deletion src/components/datatypes/MapAreaSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,4 @@ export default {
}
</script>

<style src="../maps/MapMixin.css"></style>
<style src="../maps/MapMixin.scss" lang="scss"></style>
2 changes: 1 addition & 1 deletion src/components/maps/GeoJsonMapEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export default {
}
</script>

<style src="../maps/MapMixin.css"></style>
<style src="../maps/MapMixin.scss" lang="scss"></style>

<style lang="scss">
.geojson-map-editor {
Expand Down
2 changes: 1 addition & 1 deletion src/components/maps/MapExtentViewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ export default {
}
</script>

<style src="./MapMixin.css"></style>
<style src="./MapMixin.scss" lang="scss"></style>
39 changes: 0 additions & 39 deletions src/components/maps/MapMixin.css

This file was deleted.

57 changes: 57 additions & 0 deletions src/components/maps/MapMixin.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/* Customize layerswitcher control */
.ol-layerswitcher > button {
font-size: 1.14em;
background-color: rgba(0,60,136,.5);

&:before,
&:after {
background: transparent;
background-image: none;
box-shadow: none;
position: inherit;
transform: none;
display: inline-block;
width: auto;
height: auto;
}

&:after {
font-family: "Font Awesome\ 5 Free";
content: "\f5fd";
font-weight: 900;
left: 1px;
top: 1px;
}
}

/* Customize scale line control */
.ol-scale-line {
background-color: rgba(0,60,136,.5);
}
.ol-scale-line-inner {
color: #fff;
border-color: #fff;
}

.ol-unselectable,
.ol-control {
z-index: 2;

&.ol-timeline {
z-index: 1;

.ol-buttons {
width: auto;
font-size: 0.8em;

> button {
display: inline-block;
}

.timeline-date-label {
width: 7em;
font-weight: normal;
}
}
}
}
7 changes: 1 addition & 6 deletions src/components/viewer/MapViewer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ export default {
}
</script>

<style src="../maps/MapMixin.css"></style>
<style src="../maps/MapMixin.scss" lang="scss"></style>

<style lang="scss">
.map-viewer {
Expand Down Expand Up @@ -260,9 +260,4 @@ export default {
top: 0.5em;
left: 3em;
}
.ol-control.ol-timeline .timeline-date-label {
width: 7em;
font-size: 0.8em;
font-weight: normal;
}
</style>

0 comments on commit 95cbf7e

Please sign in to comment.