Merge branch 'dev' of github.com:rstoenescu/quasar-framework into dev

quasarframework · Oct 24, 2016 · 989d48d · 989d48d
2 parents 59f56cc + ffd07a7
commit 989d48d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/build/script.build.javascript.js b/build/script.build.javascript.js
@@ -29,13 +29,11 @@ var
   },
   external = [
     'fastclick',
-    'hammerjs',
     'moment',
     'velocity-animate'
   ],
   globals = {
     fastclick: 'FastClick',
-    hammerjs: 'Hammer',
     moment: 'moment',
     'velocity-animate': 'Velocity'
   },

diff --git a/src/theme.js b/src/theme.js
@@ -30,7 +30,7 @@ export function set (theme) {
 
     if (Platform.is.winphone) {
       // <meta name="msapplication-navbutton-color" content="#4285f4">
-      metaTag.setAttribute('name', 'msapplicaiton-navbutton-color')
+      metaTag.setAttribute('name', 'msapplication-navbutton-color')
     }
 
     // Chrome, Firefox OS, Opera, Vivaldi