Skip to content

Commit

Permalink
switch to mapbox stage 1
Browse files Browse the repository at this point in the history
  • Loading branch information
mankey-ru committed May 10, 2017
1 parent 5d8f165 commit b362fdb
Show file tree
Hide file tree
Showing 13 changed files with 786 additions and 83 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"google-maps": "^3.2.1",
"less": "^2.7.2",
"less-loader": "^3.0.0",
"mapbox-gl": "^0.37.0",
"material-design-icons-iconfont": "^3.0.3",
"mini-toastr": "^0.6.3",
"quasar-framework": "^0.13.6",
Expand All @@ -51,7 +52,7 @@
"style-loader": "^0.13.2",
"superagent": "^3.5.0",
"vue": "^2.1.0",
"vue-che": "^0.2.10",
"vue-che": "^0.3.0",
"vue-loader": "^10.0.0",
"vue-router": "^2.3.0",
"vue-template-compiler": "^2.1.0",
Expand Down
8 changes: 4 additions & 4 deletions src/vue-components/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<div>
<q-layout>

<div slot="header" class="toolbar primary" v-show="$route.name!=='mainpage'">
<div slot="header" class="toolbar primary" v-show="!$route.meta.noToolbar">
<button class="hide-on-drawer-visible" v-on:click="$refs.drawer_left.open()">
<i class="mdi mdi-menu"></i>
</button>
Expand All @@ -36,8 +36,8 @@
<i class="mdi mdi-account-box"></i>
</button>
</div>
<q-drawer ref="drawer_left" v-bind:backdrop-opacity=".2"> <!-- Left Sidebar -->
<div class="toolbar light" v-show="$route.name==='mainpage'">
<q-drawer ref="drawer_left" v-bind:backdrop-opacity="0"> <!-- Left Sidebar -->
<div class="toolbar light" v-show="$route.meta.noToolbar">
<q-toolbar-title v-bind:padding="1">
{{$route.meta.title}}
</q-toolbar-title>
Expand Down Expand Up @@ -241,7 +241,7 @@
}
.__fullscreen {
position: absolute;
position: absolute !important; // override .mapboxgl-map
width: 100%;
height: 100%;
top: 0;
Expand Down
Loading

0 comments on commit b362fdb

Please sign in to comment.