GUACAMOLE-723: Merge allow connection name to display cleanly in menu.
diff --git a/guacamole/src/main/webapp/app/client/styles/connection-select-menu.css b/guacamole/src/main/webapp/app/client/styles/connection-select-menu.css
new file mode 100644
index 0000000..5044563
--- /dev/null
+++ b/guacamole/src/main/webapp/app/client/styles/connection-select-menu.css
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#guac-menu .header h2.connection-select-menu {
+ overflow: visible;
+}
+
+.connection-select-menu {
+ padding: 0;
+ min-width: 0;
+}
+
+.connection-select-menu .menu-dropdown {
+ border: none;
+}
+
+.connection-select-menu .menu-dropdown .menu-contents {
+ font-weight: normal;
+ font-size: 0.8em;
+ right: auto;
+ left: 0;
+}
+
+.connection-select-menu .menu-dropdown .menu-contents .filter input {
+ border-bottom: 1px solid rgba(0,0,0,0.125);
+ border-left: none;
+}
+
+.connection-select-menu .menu-dropdown .menu-contents .filter {
+ margin-bottom: 0.5em;
+ padding: 0;
+}
diff --git a/guacamole/src/main/webapp/app/client/styles/guac-menu.css b/guacamole/src/main/webapp/app/client/styles/guac-menu.css
index 48fb3b3..aa80e09 100644
--- a/guacamole/src/main/webapp/app/client/styles/guac-menu.css
+++ b/guacamole/src/main/webapp/app/client/styles/guac-menu.css
@@ -66,26 +66,10 @@
}
#guac-menu .header h2 {
- padding: 0;
-}
-
-#guac-menu .header h2 .menu-dropdown {
- border: none;
-}
-
-#guac-menu .header h2 .menu-contents {
- font-weight: normal;
- font-size: 0.8em;
-}
-
-#guac-menu .header .filter input {
- border-bottom: 1px solid rgba(0,0,0,0.125);
- border-left: none;
-}
-
-#guac-menu .header .filter {
- margin-bottom: 0.5em;
- padding: 0;
+ white-space: nowrap;
+ overflow: hidden;
+ width: 100%;
+ text-overflow: ellipsis;
}
#guac-menu #mouse-settings .choice {
diff --git a/guacamole/src/main/webapp/app/client/templates/client.html b/guacamole/src/main/webapp/app/client/templates/client.html
index 9d06549..446d685 100644
--- a/guacamole/src/main/webapp/app/client/templates/client.html
+++ b/guacamole/src/main/webapp/app/client/templates/client.html
@@ -53,7 +53,7 @@
<!-- Stationary header -->
<div class="header">
<h2 ng-hide="rootConnectionGroups">{{client.name}}</h2>
- <h2 ng-show="rootConnectionGroups">
+ <h2 class="connection-select-menu" ng-show="rootConnectionGroups">
<guac-menu menu-title="client.name">
<div class="all-connections">
<guac-group-list-filter connection-groups="rootConnectionGroups"
diff --git a/guacamole/src/main/webapp/app/navigation/styles/menu.css b/guacamole/src/main/webapp/app/navigation/styles/menu.css
index 1e4e75e..65e010b 100644
--- a/guacamole/src/main/webapp/app/navigation/styles/menu.css
+++ b/guacamole/src/main/webapp/app/navigation/styles/menu.css
@@ -68,6 +68,11 @@
padding: 0.5em;
padding-right: 2em;
+ white-space: nowrap;
+ overflow: hidden;
+ width: 100%;
+ text-overflow: ellipsis;
+
-ms-flex: 0 0 auto;
-moz-box-flex: 0;
-webkit-box-flex: 0;
