Skip to content

Commit 325f554

Browse files
committed
feat(App): fix bugs
1 parent b95f49a commit 325f554

File tree

3 files changed

+28
-12
lines changed

3 files changed

+28
-12
lines changed

src/pages/Maps/Maps.vue

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div>
33
<b-breadcrumb>
44
<b-breadcrumb-item>YOU ARE HERE</b-breadcrumb-item>
5-
<b-breadcrumb-item active>Maps</b-breadcrumb-item>
5+
<b-breadcrumb-item active>Google Maps</b-breadcrumb-item>
66
</b-breadcrumb>
77
<h1 class="page-title">
88
Google <span class="fw-semi-bold">Maps</span>
@@ -17,6 +17,7 @@
1717
:center="{lat: -37.813179, lng: 144.950259}"
1818
:zoom="12"
1919
style="width: 100%; height: 60vh"
20+
:options="options"
2021
>
2122
<GmapMarker
2223
:position="{lat: -37.813179, lng: 144.950259}"
@@ -33,6 +34,21 @@
3334
3435
export default {
3536
name: 'Maps',
37+
data() {
38+
return {
39+
options: {},
40+
}
41+
},
42+
created() {
43+
this.$gmapApiPromiseLazy().then(() => {
44+
this.options = {
45+
mapTypeControl: true,
46+
mapTypeControlOptions: {
47+
style: google.maps.MapTypeControlStyle.DEFAULT
48+
}
49+
}
50+
})
51+
},
3652
components: { Widget }
3753
};
3854
</script>

src/pages/Notifications/Notifications.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
.location-selector {
44
width: 100%;
55
height: 220px;
6-
border: 1px dashed #bbb;
7-
background-color: $white;
6+
border: 1px dashed $location-selector-border;
7+
background-color: $location-selector-bg;
88
position: relative;
99
}
1010

1111
.location-selector .bit {
1212
@include transition(background-color 0.15s ease-in-out);
1313

14-
background-color: $gray-400;
14+
background-color: $location-selector-bit-bg;
1515
cursor: pointer;
1616
position: absolute;
1717
}
1818

1919
.location-selector .bit:hover {
20-
background-color: $gray-600;
20+
background-color: darken($location-selector-bit-bg, 20%);
2121
}
2222

2323
.location-selector .bit.top,

src/pages/Tables/Tables.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
</small>
5151
</p>
5252
</td>
53-
<td class="text-semi-muted">
53+
<td class="text-muted">
5454
{{parseDate(row.date)}}
5555
</td>
56-
<td class="text-semi-muted">
56+
<td class="text-muted">
5757
{{row.size}}
5858
</td>
5959
<td class="width-150">
@@ -173,28 +173,28 @@
173173
<td>Mark</td>
174174
<td>Otto</td>
175175
<td><a href="#">ottoto@example.com</a></td>
176-
<td><b-badge variant="gray" class="text-gray" pill>Pending</b-badge></td>
176+
<td><b-badge variant="gray" pill>Pending</b-badge></td>
177177
</tr>
178178
<tr>
179179
<td>2</td>
180180
<td>Jacob</td>
181181
<td>Thornton</td>
182182
<td><a href="#">fat.thor@example.com</a></td>
183-
<td><b-badge variant="gray" class="text-gray-light" pill>Unconfirmed</b-badge></td>
183+
<td><b-badge variant="gray" pill>Unconfirmed</b-badge></td>
184184
</tr>
185185
<tr>
186186
<td>3</td>
187187
<td>Larry</td>
188188
<td>the Bird</td>
189189
<td><a href="#">larry@example.com</a></td>
190-
<td><b-badge variant="gray" class="text-gray" pill>New</b-badge></td>
190+
<td><b-badge variant="primary" pill>New</b-badge></td>
191191
</tr>
192192
<tr>
193193
<td>4</td>
194194
<td>Peter</td>
195195
<td>Horadnia</td>
196196
<td><a href="#">peter@example.com</a></td>
197-
<td><b-badge variant="gray" class="text-gray-light" pill>Active</b-badge></td>
197+
<td><b-badge variant="success" pill>Active</b-badge></td>
198198
</tr>
199199
</tbody>
200200
</table>
@@ -322,7 +322,7 @@
322322
Just wrap the table with simple css class <code>.widget-table-overflow</code> inside
323323
of widget
324324
</p>
325-
<div class="widget-bottom-overflow">
325+
<div class="widget-table-overflow">
326326
<table class="table table-striped table-lg mt-lg mb-0">
327327
<thead>
328328
<tr>

0 commit comments

Comments
 (0)