diff --git a/guacamole/src/main/webapp/images/checker.png b/guacamole/src/main/webapp/images/checker.png deleted file mode 100644 index 06f89032d..000000000 Binary files a/guacamole/src/main/webapp/images/checker.png and /dev/null differ diff --git a/guacamole/src/main/webapp/images/guacamole-64-icon.png b/guacamole/src/main/webapp/images/guacamole-64-icon.png deleted file mode 100644 index 02897db2e..000000000 Binary files a/guacamole/src/main/webapp/images/guacamole-64-icon.png and /dev/null differ diff --git a/guacamole/src/main/webapp/images/guacamole-icon-64.png b/guacamole/src/main/webapp/images/guacamole-icon-64.png deleted file mode 100644 index 02897db2e..000000000 Binary files a/guacamole/src/main/webapp/images/guacamole-icon-64.png and /dev/null differ diff --git a/guacamole/src/main/webapp/images/guacamole-logo.png b/guacamole/src/main/webapp/images/guacamole-logo-24.png similarity index 100% rename from guacamole/src/main/webapp/images/guacamole-logo.png rename to guacamole/src/main/webapp/images/guacamole-logo-24.png diff --git a/guacamole/src/main/webapp/images/guacamole-logo-64.png b/guacamole/src/main/webapp/images/guacamole-logo-64.png new file mode 100644 index 000000000..99aaf3ea9 Binary files /dev/null and b/guacamole/src/main/webapp/images/guacamole-logo-64.png differ diff --git a/guacamole/src/main/webapp/images/login-logo.png b/guacamole/src/main/webapp/images/login-logo.png deleted file mode 100644 index d20a2e730..000000000 Binary files a/guacamole/src/main/webapp/images/login-logo.png and /dev/null differ diff --git a/guacamole/src/main/webapp/images/noguacamole-logo.png b/guacamole/src/main/webapp/images/noguacamole-logo-24.png similarity index 100% rename from guacamole/src/main/webapp/images/noguacamole-logo.png rename to guacamole/src/main/webapp/images/noguacamole-logo-24.png diff --git a/guacamole/src/main/webapp/images/noimage92.png b/guacamole/src/main/webapp/images/noimage.png similarity index 100% rename from guacamole/src/main/webapp/images/noimage92.png rename to guacamole/src/main/webapp/images/noimage.png diff --git a/guacamole/src/main/webapp/images/spinner92.gif b/guacamole/src/main/webapp/images/spinner.gif similarity index 100% rename from guacamole/src/main/webapp/images/spinner92.gif rename to guacamole/src/main/webapp/images/spinner.gif diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html index 6bd09bd80..8ceeabee3 100644 --- a/guacamole/src/main/webapp/index.html +++ b/guacamole/src/main/webapp/index.html @@ -21,7 +21,7 @@ - + Guacamole @@ -32,27 +32,26 @@
- -
-

Guacamole Login

-

- - - - - - - - - -
Username
Password
+ +
+ + + + + + + + + +
Username
Password
+ + +
@@ -61,7 +60,9 @@
-
Guacamole ${project.version}
+
+ Guacamole ${project.version} +
@@ -86,7 +87,7 @@ - + AGPLv3 @@ -176,7 +177,7 @@ document.getElementById("main-guacamole-ui").style.display = "block"; var menu = document.getElementById("menu"); - var logo = document.getElementById("logo"); + var logo = document.getElementById("status-logo"); var errorDialog = document.getElementById("errorDialog"); var errorDialogText = document.getElementById("errorText"); @@ -219,7 +220,7 @@ // Cache error image (might not be available when error occurs) var guacErrorImage = new Image(); - guacErrorImage.src = "images/noguacamole-logo.png"; + guacErrorImage.src = "images/noguacamole-logo-24.png"; guac.setNameHandler(function(name) { document.title = name; diff --git a/guacamole/src/main/webapp/styles/guacamole.css b/guacamole/src/main/webapp/styles/guacamole.css index 9f9c6125f..ba7319419 100644 --- a/guacamole/src/main/webapp/styles/guacamole.css +++ b/guacamole/src/main/webapp/styles/guacamole.css @@ -25,7 +25,7 @@ body { } div#login-ui { - background: silver; + background: #BCA; height: 100%; width: 100%; position: fixed; @@ -57,17 +57,6 @@ div#login-dialog-middle { div#login-dialog { - background: white; - vertical-align: middle; - - padding: 1em; - border: 0.2em solid black; - - -khtml-border-radius: 0.5em; - -webkit-border-radius: 0.5em; - -moz-border-radius: 0.5em; - border-radius: 0.5em; - max-width: 75%; text-align: left; @@ -82,14 +71,47 @@ div#login-dialog h1 { div#login-dialog #buttons { padding-top: 0.5em; - text-align: center; + text-align: right; +} + +div#login-dialog #buttons input { + background: #9A8; + border: 1px solid #676; + color: black; + padding: 0.25em; + padding-right: 1em; + padding-left: 1em; +} + +div#login-dialog #buttons input:hover { + background: #CDB; + border: 1px solid #9A8; +} + +div#login-dialog #buttons input:active { + padding-top: 0.35em; + padding-left: 1.1em; + + padding-bottom: 0.15em; + padding-right: 0.9em; } div#login-dialog #login-fields { - border-top: 1px solid silver; - border-bottom: 1px solid silver; - padding-top: 0.5em; - padding-bottom: 0.5em; + + background: #CDB; + vertical-align: middle; + + padding: 1em; + border: 1px solid #676; + +} + +div#login-dialog #login-fields input { + border: 1px solid #676; +} + +div#login-dialog #login-fields img.logo { + float: left; } div#login-ui #version-dialog { @@ -97,6 +119,7 @@ div#login-ui #version-dialog { right: 0; bottom: 0; text-align: right; + font-style: italic; font-size: 0.75em; color: black; @@ -246,14 +269,14 @@ div#clipboardDiv textarea { .guac-display.guac-loading { border: 1px dotted gray; - background-image: url('../images/spinner92.gif'); + background-image: url('../images/spinner.gif'); background-position: center; background-repeat: no-repeat; } .guac-display.guac-error { border: 1px dotted red; - background-image: url('../images/noimage92.png'); + background-image: url('../images/noimage.png'); background-position: center; background-repeat: no-repeat; }