Merge pull request #6 from wells/v1.1.2-dev

v1.1.2 dev
wells · Dec 27, 2016 · ae5057a · ae5057a
2 parents 1b595c9 + dac0409
commit ae5057a
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 15 deletions.
diff --git a/public/build/js/app-47eeed0b62.js → public/build/js/app-1943400d38.js b/public/build/js/app-47eeed0b62.js → public/build/js/app-1943400d38.js
diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json
@@ -1,4 +1,4 @@
 {
   "css/app.css": "css/app-c6da92f35b.css",
-  "js/app.js": "js/app-47eeed0b62.js"
+  "js/app.js": "js/app-1943400d38.js"
 }
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/resources/assets/js/components/App.vue b/resources/assets/js/components/App.vue
@@ -1,5 +1,6 @@
 <template>
-<div id="app" :class="{ 'toggle-menu' : showMenu, 'toggle-search' : showSearch  }">
+<div id="app" 
+    :class="{ 'toggle-menu' : showMenu, 'toggle-search' : showSearch  }">
   <!-- header -->
   <div id="header">
     <a class="button button-mobile" 
@@ -34,25 +35,32 @@
 
   <!-- menu -->
   <div id="navigation">
-    <a class="button button-mobile" @click.prevent="hideMenu">
+    <a class="button button-mobile" 
+        @click.prevent="hideMenu">
       <i class="material-icons">&#xE314;</i>
     </a>
 
     <ul>
-      <router-link tag="li" to="/movies">
-          <a @click="hideMenu">
-            <i class="material-icons">&#xE02C;</i>
-            Movies
-          </a>
+      <router-link tag="li" 
+          to="/movies" 
+          @click.native="hideMenu">
+        <a>
+          <i class="material-icons">&#xE02C;</i>
+          Movies
+        </a>
       </router-link>
-      <router-link tag="li" to="/shows">
-        <a @click="hideMenu">
+      <router-link tag="li" 
+          to="/shows" 
+          @click.native="hideMenu">
+        <a>
           <i class="material-icons">&#xE639;</i>
           Shows
         </a>
       </router-link>
-      <router-link tag="li" to="/settings">
-        <a @click="hideMenu">
+      <router-link tag="li" 
+          to="/settings" 
+          @click.native="hideMenu">
+        <a>
           <i class="material-icons">&#xE8B8;</i>
           Settings
         </a>
@@ -61,7 +69,9 @@
   </div>
 
   <!-- overlay -->
-  <a id="overlay" @click.prevent="toggleMenu"></a>
+  <a id="overlay" 
+      @click.prevent="toggleMenu">
+  </a>
 
   <!-- main view -->
   <div id="content">