Merge branch 'master' of github.com:mattcook/MobileTurk

mattcook · Jan 18, 2015 · 3072125 · 3072125
2 parents 0b40dde + d1180ec
commit 3072125
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/www/index.html b/www/index.html
@@ -1,9 +1,10 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta name="apple-mobile-web-app-capable" content="yes">
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
-    <title></title>
+    <title>Taskify</title>
 
     <link href="css/ionic.app.css" rel="stylesheet">
 

diff --git a/www/js/controllers.js b/www/js/controllers.js
@@ -227,7 +227,7 @@ angular.module('starter.controllers', ['firebase'])
 .controller('InfoSearchCtrl', ['currentAuth', '$scope', '$state', '$stateParams', '$ionicModal', '$firebase',
 function(auth, $scope, $state, $stateParams, $ionicModal, $firebase) {
   $scope.openGoogle = function(){
-    window.open('http://google.com', '_system', 'location=yes');
+    window.open('http://google.com', '_target');
   };
 
   var uid = verifyAuth(auth, $scope, $state);

diff --git a/www/templates/types/categorization.html b/www/templates/types/categorization.html
@@ -5,7 +5,7 @@
         <h2>Choose the Best Category</h2>
         <i class="icon ion-ios7-help-outline" ng-click="openModal()"></i>
       </div>
-        <div class="bounding-box" style="height: 145px; background-image: url({{category.val.image}})">
+        <div class="bounding-box" style="height: 125px; background-image: url({{category.val.image}})">
         </div>
         <ion-list>
         <label class="item item-radio" ng-repeat="cat in category.val.categories" ng-hide='{{cat == undefined}}'>