From 9fe78243f6a3864f8629b799706c369fa55fc7f7 Mon Sep 17 00:00:00 2001
From: Abdallah Soliman <abdallah.soliman@case.edu>
Date: Fri, 26 Aug 2016 22:54:03 -0500
Subject: [PATCH 1/2] changed cancel current button placement and style

---
 static/css/style.css | 42 ++++++++++++++++++++----------------------
 static/js/index.js   |  2 +-
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/static/css/style.css b/static/css/style.css
index c6c4f6b..cc4702b 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1,5 +1,6 @@
 .mdl-layout__header-row {
     color: #fff;
+    margin: 0 72px;
 }
 .mdl-button {
     color: #fff !important;
@@ -23,9 +24,9 @@
     cursor: pointer;
 }
 .mdl-dialog {
-  border: none;
-  box-shadow: 0 9px 46px 8px rgba(0, 0, 0, 0.14), 0 11px 15px -7px rgba(0, 0, 0, 0.12), 0 24px 38px 3px rgba(0, 0, 0, 0.2);
-  width: 400px; 
+    border: none;
+    box-shadow: 0 9px 46px 8px rgba(0, 0, 0, 0.14), 0 11px 15px -7px rgba(0, 0, 0, 0.12), 0 24px 38px 3px rgba(0, 0, 0, 0.2);
+    width: 400px; 
 }
 .mdl-dialog__title {
     padding: 24px 24px 0;
@@ -72,9 +73,9 @@ main {
     padding: 50px 100px;
 }
 #bitrateField {
-  text-align: center;
-  display: block;
-  padding-top: 15px;
+    text-align: center;
+    display: block;
+    padding-top: 15px;
 }
 #hostSettings {
     padding: 5px 10px;
@@ -144,7 +145,7 @@ main {
     border: 3px solid green;
 }
 .not-current-game {
-  border: 1px solid black;
+    border: 1px solid black;
 }
 .game-title {
     color: #000;
@@ -177,20 +178,17 @@ main {
     width: 80px;;
     margin-bottom: 10px;
 }
-.cancel-cell {
-    /*display: inline-block;*/
-    background-color: #000;
-    box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.34);
-}
-.cancel-cell > img {
-    padding: 0;
-    margin: 0;
-    width: 100%;
-    height: 100%;
-    -webkit-box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.34);
-    -moz-box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.34);
-    box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.34);
-}
-.cancel-cell:hover > img {
+.cancel-current:hover {
     cursor: pointer;
 }
+.cancel-current {
+    border: 2px solid white;
+    padding: 5px;
+    border-radius: 5px;
+}
+.cancel-current img {
+    margin-right: 5px;
+}
+.cancel-current .game-title {
+    color: #fff;
+}
diff --git a/static/js/index.js b/static/js/index.js
index 08d52c0..75c9204 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -334,7 +334,7 @@ function showApps() {
             }); 
         });
 
-        $("#game-grid").append($("<div>", {html:$("<img src=static\\res\\ic_remove_circle_white_24px.svg id=quitCurrentApp\>"), class: 'cancel-cell mdl-cell mdl-cell--3-col'}).append($("<span>", {html: 'Quit Current App', class:"game-title"})));
+        $(".mdl-layout__header-row").append($("<div>", {html:$("<img src=static\\res\\ic_remove_circle_white_24px.svg id=quitCurrentApp\>"), class: 'cancel-current'}).append($("<span>", {html: 'Quit Current App', class:"game-title"})));
         $('#quitCurrentApp').on('click', function() {api.quitApp(); api.refreshServerInfo(); });
 
     }, function (failedAppList) {

From d8400edb0479c1fc9cfb2e54d8df1ada15388608 Mon Sep 17 00:00:00 2001
From: Abdallah Soliman <abdallah.soliman@case.edu>
Date: Fri, 26 Aug 2016 23:05:41 -0500
Subject: [PATCH 2/2] added id quitCurrentApp to div.cancel-current

---
 static/js/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/index.js b/static/js/index.js
index 75c9204..e2bc9d0 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -334,7 +334,7 @@ function showApps() {
             }); 
         });
 
-        $(".mdl-layout__header-row").append($("<div>", {html:$("<img src=static\\res\\ic_remove_circle_white_24px.svg id=quitCurrentApp\>"), class: 'cancel-current'}).append($("<span>", {html: 'Quit Current App', class:"game-title"})));
+        $(".mdl-layout__header-row").append($("<div>", {html:$("<img src=static\\res\\ic_remove_circle_white_24px.svg\>"), class: 'cancel-current', id: 'quitCurrentApp'}).append($("<span>", {html: 'Quit Current App', class:"game-title"})));
         $('#quitCurrentApp').on('click', function() {api.quitApp(); api.refreshServerInfo(); });
 
     }, function (failedAppList) {