summaryrefslogtreecommitdiffstats
path: root/remoting/webapp/main.css
diff options
context:
space:
mode:
authorjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 20:42:28 +0000
committerjamiewalch@google.com <jamiewalch@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-24 20:42:28 +0000
commit67ff2c1ad446e67a33c473cae63c8561de4f9c74 (patch)
tree1dcbaddc72559c7f3f511ae7ddf7b731484cf5b7 /remoting/webapp/main.css
parent5ebdd25b944aa04746730f43472e3a7a79fde8f3 (diff)
downloadchromium_src-67ff2c1ad446e67a33c473cae63c8561de4f9c74.zip
chromium_src-67ff2c1ad446e67a33c473cae63c8561de4f9c74.tar.gz
chromium_src-67ff2c1ad446e67a33c473cae63c8561de4f9c74.tar.bz2
Move NAT message inside host dialog.
BUG=115350 TEST=Manual Review URL: https://chromiumcodereview.appspot.com/9447065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp/main.css')
-rw-r--r--remoting/webapp/main.css15
1 files changed, 11 insertions, 4 deletions
diff --git a/remoting/webapp/main.css b/remoting/webapp/main.css
index 6212769..c276b8e 100644
--- a/remoting/webapp/main.css
+++ b/remoting/webapp/main.css
@@ -4812,8 +4812,8 @@ td {
margin-__MSG_@@bidi_end_edge__: 0.5ex;
}
-#host-dialog-and-nat {
- width: 504px;
+#host-dialog {
+ width: 500px;
}
#host-plugin-container {
@@ -4830,8 +4830,15 @@ td {
margin-__MSG_@@bidi_start_edge__: 40px;
}
-#nat-box-container {
- margin-top: 40px;
+#nat-box {
+ margin-top: 30px;
+}
+
+/* The NAT traversal state is independent of the app mode, and both need
+ * to be combined to determine the visibility of the butter bar. We use
+ * a style for the former and the 'hidden' property for the latter. */
+#nat-box.traversal-enabled {
+ display: none;
}
#session-mode {