From 5c8344d21659aff865f1beb64434900ff129ee9c Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 13 Feb 2013 02:06:25 -0800 Subject: [PATCH] Ticket #268: More style improvements. --- guacamole/src/main/webapp/admin.xhtml | 4 +-- guacamole/src/main/webapp/styles/ui.css | 33 ++++++++++++++----------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/guacamole/src/main/webapp/admin.xhtml b/guacamole/src/main/webapp/admin.xhtml index cfe059036..32c5d3e81 100644 --- a/guacamole/src/main/webapp/admin.xhtml +++ b/guacamole/src/main/webapp/admin.xhtml @@ -40,7 +40,7 @@

Users

-
+

Click or tap on a user below to manage that user. Depending @@ -58,7 +58,7 @@

Connections

-
+

Click or tap on a connection below to manage that connection. diff --git a/guacamole/src/main/webapp/styles/ui.css b/guacamole/src/main/webapp/styles/ui.css index c17a5feab..fc681bbc0 100644 --- a/guacamole/src/main/webapp/styles/ui.css +++ b/guacamole/src/main/webapp/styles/ui.css @@ -159,12 +159,6 @@ div.section { padding: 0.1em; cursor: pointer; - -moz-border-radius: 0.2em; - -webkit-border-radius: 0.2em; - -khtml-border-radius: 0.2em; - border-radius: 0.2em; - border: 1px solid rgba(0, 0, 0, 0); - position: relative; } @@ -180,6 +174,7 @@ div.section { background-position: center center; opacity: 0.5; display: inline-block; + vertical-align: middle; } .list-item * { @@ -199,7 +194,6 @@ div.section { .list-item.selected { background: #DEB; - border: 1px solid rgba(0, 0, 0, 0.25); } .list-item.selected .icon { @@ -327,7 +321,18 @@ div.section { #connections input.name, #users input.name { - max-width: 20em; + max-width: 80%; + width: 20em; +} + +#connection-list, +#user-list { + border: 1px solid rgba(0, 0, 0, 0.25); + min-height: 20em; + -moz-border-radius: 0.2em; + -webkit-border-radius: 0.2em; + -khtml-border-radius: 0.2em; + border-radius: 0.2em; } #connections #add-connection, @@ -335,20 +340,20 @@ div.section { font-size: 0.8em; } -body:not(.manage-connections) .require-manage-connections { - display: none; +#connection-add-form, +#user-add-form { + margin: 0.5em; } +body:not(.manage-connections) .require-manage-connections, body:not(.manage-users) .require-manage-users { display: none; } -body:not(.add-connections) #connection-add-form { - display: none; -} - +body:not(.add-connections) #connection-add-form, body:not(.add-users) #user-add-form { display: none; + display: none; } div#logout-panel {