Skip to content

Commit 95cbf7e

Browse files
committed
Migrate MapMixin.css to SCSS
1 parent c7ff116 commit 95cbf7e

File tree

7 files changed

+62
-49
lines changed

7 files changed

+62
-49
lines changed

src/components/datatypes/GeoJsonEditor.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ export default {
5353
}
5454
</script>
5555

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

src/components/datatypes/MapAreaSelect.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,4 @@ export default {
147147
}
148148
</script>
149149

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

src/components/maps/GeoJsonMapEditor.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export default {
153153
}
154154
</script>
155155

156-
<style src="../maps/MapMixin.css"></style>
156+
<style src="../maps/MapMixin.scss" lang="scss"></style>
157157

158158
<style lang="scss">
159159
.geojson-map-editor {

src/components/maps/MapExtentViewer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,4 @@ export default {
6161
}
6262
</script>
6363

64-
<style src="./MapMixin.css"></style>
64+
<style src="./MapMixin.scss" lang="scss"></style>

src/components/maps/MapMixin.css

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/components/maps/MapMixin.scss

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/* Customize layerswitcher control */
2+
.ol-layerswitcher > button {
3+
font-size: 1.14em;
4+
background-color: rgba(0,60,136,.5);
5+
6+
&:before,
7+
&:after {
8+
background: transparent;
9+
background-image: none;
10+
box-shadow: none;
11+
position: inherit;
12+
transform: none;
13+
display: inline-block;
14+
width: auto;
15+
height: auto;
16+
}
17+
18+
&:after {
19+
font-family: "Font Awesome\ 5 Free";
20+
content: "\f5fd";
21+
font-weight: 900;
22+
left: 1px;
23+
top: 1px;
24+
}
25+
}
26+
27+
/* Customize scale line control */
28+
.ol-scale-line {
29+
background-color: rgba(0,60,136,.5);
30+
}
31+
.ol-scale-line-inner {
32+
color: #fff;
33+
border-color: #fff;
34+
}
35+
36+
.ol-unselectable,
37+
.ol-control {
38+
z-index: 2;
39+
40+
&.ol-timeline {
41+
z-index: 1;
42+
43+
.ol-buttons {
44+
width: auto;
45+
font-size: 0.8em;
46+
47+
> button {
48+
display: inline-block;
49+
}
50+
51+
.timeline-date-label {
52+
width: 7em;
53+
font-weight: normal;
54+
}
55+
}
56+
}
57+
}

src/components/viewer/MapViewer.vue

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ export default {
231231
}
232232
</script>
233233

234-
<style src="../maps/MapMixin.css"></style>
234+
<style src="../maps/MapMixin.scss" lang="scss"></style>
235235

236236
<style lang="scss">
237237
.map-viewer {
@@ -260,9 +260,4 @@ export default {
260260
top: 0.5em;
261261
left: 3em;
262262
}
263-
.ol-control.ol-timeline .timeline-date-label {
264-
width: 7em;
265-
font-size: 0.8em;
266-
font-weight: normal;
267-
}
268263
</style>

0 commit comments

Comments
 (0)