diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock index 8850085..ae1741f 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin index 0a261c0..23007e1 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin index 3a4115c..fc184d8 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ diff --git a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin index 6d83b63..0360b76 100644 Binary files a/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ diff --git a/platforms/android/assets/www/css/main.css b/platforms/android/assets/www/css/main.css index e3d0b94..e32f3e4 100644 --- a/platforms/android/assets/www/css/main.css +++ b/platforms/android/assets/www/css/main.css @@ -113,6 +113,7 @@ body { .badge-img { border: 2px solid green; + margin-bottom: 10px; } #terrain-image { @@ -191,11 +192,17 @@ body { background: rgba(0,0,0,.8); } -.chatbox #chatmsgs .chat-username { +.chat-username { color: green; font-weight: bold; } +.chat-username-admin { + color: red; + font-weight: bold; + font-style: italic; +} + #buttons { position: absolute; right: 0px; @@ -227,4 +234,40 @@ body { .scrollable-box { overflow-y: auto; +} + +#player-name { + padding-left: 5px; + border-left: 1px solid white; +} + +#player-level { + font-size: 120%; + color: #d5d5d5; + font-style: italic; + padding-left: 5px; + padding-top: 10px; + margin-top: -10px; + border-left: 1px solid white; + border-bottom: 1px solid white; + padding-right: 100px; + width: fit-content; +} + +#badge-header { + padding-top: 5px; + border-top: 1px solid white; + border-right: 1px solid white; +} + +#badges { + border-right: 1px solid white; + padding-top: 10px; + margin-top: -10px; +} + +#loading-badges { + border-right: 1px solid white; + padding-top: 10px; + margin-top: -10px; } \ No newline at end of file diff --git a/platforms/android/assets/www/js/user.js b/platforms/android/assets/www/js/user.js index d82001f..9576f31 100644 --- a/platforms/android/assets/www/js/user.js +++ b/platforms/android/assets/www/js/user.js @@ -40,7 +40,11 @@ function getChat() { data = sortResults(data, 'time', true); var content = ""; data.forEach(function (msg) { - content += "" + msg.username + " " + msg.message + "
"; + var usernameclass = "chat-username"; + if (msg.username === 'skylarmt') { + usernameclass = "chat-username-admin" + } + content += "" + msg.username + " " + msg.message + "
"; }); $('#chatmsgs').html(content); }); diff --git a/platforms/android/assets/www/screens/profile.html b/platforms/android/assets/www/screens/profile.html index bf5f477..228df26 100644 --- a/platforms/android/assets/www/screens/profile.html +++ b/platforms/android/assets/www/screens/profile.html @@ -1,63 +1,71 @@ -
-
-

-
Badges
-
- Loading... -
-
-
+
+
+
Badges
+
+ Loading... +
+
+
-
- -
\ No newline at end of file + } + ).fail( + function (err) { + $('#loading-badges').html('Loading failed. Reload"'); + } + ); + } + \ No newline at end of file diff --git a/platforms/browser/www/css/main.css b/platforms/browser/www/css/main.css index e3d0b94..e32f3e4 100644 --- a/platforms/browser/www/css/main.css +++ b/platforms/browser/www/css/main.css @@ -113,6 +113,7 @@ body { .badge-img { border: 2px solid green; + margin-bottom: 10px; } #terrain-image { @@ -191,11 +192,17 @@ body { background: rgba(0,0,0,.8); } -.chatbox #chatmsgs .chat-username { +.chat-username { color: green; font-weight: bold; } +.chat-username-admin { + color: red; + font-weight: bold; + font-style: italic; +} + #buttons { position: absolute; right: 0px; @@ -227,4 +234,40 @@ body { .scrollable-box { overflow-y: auto; +} + +#player-name { + padding-left: 5px; + border-left: 1px solid white; +} + +#player-level { + font-size: 120%; + color: #d5d5d5; + font-style: italic; + padding-left: 5px; + padding-top: 10px; + margin-top: -10px; + border-left: 1px solid white; + border-bottom: 1px solid white; + padding-right: 100px; + width: fit-content; +} + +#badge-header { + padding-top: 5px; + border-top: 1px solid white; + border-right: 1px solid white; +} + +#badges { + border-right: 1px solid white; + padding-top: 10px; + margin-top: -10px; +} + +#loading-badges { + border-right: 1px solid white; + padding-top: 10px; + margin-top: -10px; } \ No newline at end of file diff --git a/platforms/browser/www/js/user.js b/platforms/browser/www/js/user.js index d82001f..9576f31 100644 --- a/platforms/browser/www/js/user.js +++ b/platforms/browser/www/js/user.js @@ -40,7 +40,11 @@ function getChat() { data = sortResults(data, 'time', true); var content = ""; data.forEach(function (msg) { - content += "" + msg.username + " " + msg.message + "
"; + var usernameclass = "chat-username"; + if (msg.username === 'skylarmt') { + usernameclass = "chat-username-admin" + } + content += "" + msg.username + " " + msg.message + "
"; }); $('#chatmsgs').html(content); }); diff --git a/platforms/browser/www/screens/profile.html b/platforms/browser/www/screens/profile.html index bf5f477..228df26 100644 --- a/platforms/browser/www/screens/profile.html +++ b/platforms/browser/www/screens/profile.html @@ -1,63 +1,71 @@ -
-
-

-
Badges
-
- Loading... -
-
-
+
+
+
Badges
+
+ Loading... +
+
+
-
- -
\ No newline at end of file + } + ).fail( + function (err) { + $('#loading-badges').html('Loading failed. Reload"'); + } + ); + } + \ No newline at end of file diff --git a/www/css/main.css b/www/css/main.css index e3d0b94..e32f3e4 100644 --- a/www/css/main.css +++ b/www/css/main.css @@ -113,6 +113,7 @@ body { .badge-img { border: 2px solid green; + margin-bottom: 10px; } #terrain-image { @@ -191,11 +192,17 @@ body { background: rgba(0,0,0,.8); } -.chatbox #chatmsgs .chat-username { +.chat-username { color: green; font-weight: bold; } +.chat-username-admin { + color: red; + font-weight: bold; + font-style: italic; +} + #buttons { position: absolute; right: 0px; @@ -227,4 +234,40 @@ body { .scrollable-box { overflow-y: auto; +} + +#player-name { + padding-left: 5px; + border-left: 1px solid white; +} + +#player-level { + font-size: 120%; + color: #d5d5d5; + font-style: italic; + padding-left: 5px; + padding-top: 10px; + margin-top: -10px; + border-left: 1px solid white; + border-bottom: 1px solid white; + padding-right: 100px; + width: fit-content; +} + +#badge-header { + padding-top: 5px; + border-top: 1px solid white; + border-right: 1px solid white; +} + +#badges { + border-right: 1px solid white; + padding-top: 10px; + margin-top: -10px; +} + +#loading-badges { + border-right: 1px solid white; + padding-top: 10px; + margin-top: -10px; } \ No newline at end of file diff --git a/www/js/user.js b/www/js/user.js index d82001f..9576f31 100644 --- a/www/js/user.js +++ b/www/js/user.js @@ -40,7 +40,11 @@ function getChat() { data = sortResults(data, 'time', true); var content = ""; data.forEach(function (msg) { - content += "" + msg.username + " " + msg.message + "
"; + var usernameclass = "chat-username"; + if (msg.username === 'skylarmt') { + usernameclass = "chat-username-admin" + } + content += "" + msg.username + " " + msg.message + "
"; }); $('#chatmsgs').html(content); }); diff --git a/www/screens/profile.html b/www/screens/profile.html index bf5f477..228df26 100644 --- a/www/screens/profile.html +++ b/www/screens/profile.html @@ -1,63 +1,71 @@ -
-
-

-
Badges
-
- Loading... -
-
-
+
+
+
Badges
+
+ Loading... +
+
+
-
- -
\ No newline at end of file + } + ).fail( + function (err) { + $('#loading-badges').html('Loading failed. Reload"'); + } + ); + } + \ No newline at end of file