diff --git a/index.html b/index.html index f1cba8a..946eddb 100644 --- a/index.html +++ b/index.html @@ -1,24 +1,23 @@ - - - - Moonlight - - - - - -
-
-
- - Moonlight - -
-
-
-
+ + + + Moonlight + + + + +
+
+
+ + Moonlight + +
+
+
+
@@ -60,11 +59,7 @@
-
-

Select a game to run

- - - +
@@ -76,43 +71,43 @@
-
-
- - - - - - - - +
+
+ + + + + + + + - +

Pairing

- Please enter the number XXXX on the GFE dialog on the computer. This dialog will be dismissed once complete + Please enter the number XXXX on the GFE dialog on the computer. This dialog will be dismissed once complete

- + - +

Quit Running App?

- Y is already running. Would you like to quit Y to start X? + Y is already running. Would you like to quit Y to start X?

- + - +

Add PC Manually

IP Address or Hostname of Geforce PC

@@ -126,11 +121,11 @@
- + -
-
- -
- +
+
+ +
+ diff --git a/opus b/opus index 81bb160..f6f8487 160000 --- a/opus +++ b/opus @@ -1 +1 @@ -Subproject commit 81bb160d17c9542ad9cfba05067371b618d1719f +Subproject commit f6f8487b76f234437e7d4c2831e630d9d06cb074 diff --git a/static/css/style.css b/static/css/style.css index 63866ed..4571b93 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -1,3 +1,36 @@ +@font-face { + font-family: 'Material Icons'; + font-style: normal; + font-weight: 400; + src: local('Material Icons'), + local('MaterialIcons-Regular'), + url('../fonts/MaterialIcons-Regular.woff') format('woff'), +} +.material-icons { + font-family: 'Material Icons'; + font-weight: normal; + font-style: normal; + font-size: 24px; /* Preferred icon size */ + display: inline-block; + line-height: 1; + text-transform: none; + letter-spacing: normal; + word-wrap: normal; + white-space: nowrap; + direction: ltr; + + /* Support for all WebKit browsers. */ + -webkit-font-smoothing: antialiased; + /* Support for Safari and Chrome. */ + text-rendering: optimizeLegibility; + + /* Support for Firefox. */ + -moz-osx-font-smoothing: grayscale; + + /* Support for IE. */ + font-feature-settings: 'liga'; +} + .mdl-layout__header-row { color: #fff; } @@ -126,3 +159,15 @@ main { width 100%; border: none !important; } +.box-art { + background-color: transparent;; +} +.box-art > img { + padding: 0; + margin: 0; + width: 100%; + height: 100%; +} +.current-game { + border: 1px solid red; +} diff --git a/static/fonts/MaterialIcons-Regular.woff b/static/fonts/MaterialIcons-Regular.woff new file mode 100644 index 0000000..b648a3e Binary files /dev/null and b/static/fonts/MaterialIcons-Regular.woff differ diff --git a/static/js/index.js b/static/js/index.js index 02913a9..5ece85a 100644 --- a/static/js/index.js +++ b/static/js/index.js @@ -55,8 +55,8 @@ function restoreUiAfterNaClLoad() { function snackbarLog(givenMessage) { console.log(givenMessage); var data = { - message: givenMessage, - timeout: 2000 + message: givenMessage, + timeout: 2000 }; document.querySelector('#snackbar').MaterialSnackbar.showSnackbar(data); } @@ -83,11 +83,11 @@ function moduleDidLoad() { console.log('Returned error was: ' + failedCert); }).then(function (ret) { sendMessage('httpInit', [pairingCert.cert, pairingCert.privateKey, myUniqueid]).then(function (ret) { - restoreUiAfterNaClLoad(); - }, function (failedInit) { - console.log('ERROR: failed httpInit!'); - console.log('Returned error was: ' + failedInit); - }); + restoreUiAfterNaClLoad(); + }, function (failedInit) { + console.log('ERROR: failed httpInit!'); + console.log('Returned error was: ' + failedInit); + }); }); } else { @@ -106,7 +106,7 @@ function updateHost() { if (host == null || host == "") { host = $("#selectHost option:selected").val(); } - + if(api && api.address != host) { api = new NvHTTP(host, myUniqueid); } @@ -143,10 +143,10 @@ function pairTo(host, onSuccess, onFailure) { } onFailure(); } - + snackbarLog('Pairing successful'); pairingDialog.close(); - + var hostSelect = $('#selectHost')[0]; for(var i = 0; i < hostSelect.length; i++) { // check if we already have the host. if (hostSelect.options[i].value == host) onSuccess(); @@ -228,9 +228,9 @@ function continueAddHost() { var inputHost = $('#dialogInputHost').val(); pairTo(inputHost, - function() { document.querySelector('#addHostDialog').close() }, - function() {snackbarLog('pairing to ' + inputHost + ' failed!');} - ); + function() { document.querySelector('#addHostDialog').close() }, + function() {snackbarLog('pairing to ' + inputHost + ' failed!');} + ); } @@ -256,22 +256,29 @@ function showApps() { } api.getAppList().then(function (appList) { - if ($('#selectGame').has('option').length > 0 ) { - // there was already things in the dropdown. Clear it, then add the new ones. - // Most likely, the user just hit the 'retrieve app list' button again - $('#selectGame').empty(); + + // if game grid is populated, empty it + if($("#game-grid").children().length > 0) { + $("game-grid").empty(); } + appList.forEach(function (app) { - $('#selectGame').append($('