moonlight-stream/moonlight-chrome
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-chrome.git synced 2025-08-17 16:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/abdallahsoliman/moonlight-chrome into abdallahsoliman-master

Browse Source
This commit is contained in:
R. Aidan Campbell 2016-08-27 09:09:14 -04:00
commit ed649b386b
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
static/css/style.css
View File

@ -1,5 +1,6 @@
.mdl-layout__header-row { .mdl-layout__header-row {
color: #fff; color: #fff;
margin: 0 72px;
} }
.mdl-button { .mdl-button {
color: #fff !important; color: #fff !important;
@ -23,9 +24,9 @@
cursor: pointer; cursor: pointer;
} }
.mdl-dialog { .mdl-dialog {
border: none; 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); 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; width: 400px;
} }
.mdl-dialog__title { .mdl-dialog__title {
padding: 24px 24px 0; padding: 24px 24px 0;
@ -72,9 +73,9 @@ main {
padding: 50px 100px; padding: 50px 100px;
} }
#bitrateField { #bitrateField {
text-align: center; text-align: center;
display: block; display: block;
padding-top: 15px; padding-top: 15px;
} }
#hostSettings { #hostSettings {
padding: 5px 10px; padding: 5px 10px;
@ -144,7 +145,7 @@ main {
border: 3px solid green; border: 3px solid green;
} }
.not-current-game { .not-current-game {
border: 1px solid black; border: 1px solid black;
} }
.game-title { .game-title {
color: #000; color: #000;
@ -177,20 +178,17 @@ main {
width: 80px;; width: 80px;;
margin-bottom: 10px; margin-bottom: 10px;
} }
.cancel-cell { .cancel-current:hover {
/*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 {
cursor: pointer; 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;
}

6
static/js/index.js
View File

@ -336,10 +336,8 @@ function showApps() {
console.log(api.toString()); console.log(api.toString());
}); });
}); });
if ($('quitCurrentApp').length === 0) { // also prevent duplicate quit buttons from showing up $(".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"})));
$("#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"}))); $('#quitCurrentApp').on('click', function() {api.quitApp(); api.refreshServerInfo(); });
$('#quitCurrentApp').on('click', function() {api.quitApp(); api.refreshServerInfo(); });
}
}, function (failedAppList) { }, function (failedAppList) {
console.log('Failed to get applist from host: ' + api.address); console.log('Failed to get applist from host: ' + api.address);