GUACAMOLE-723: Merge allow connection name to display cleanly in menu.

This commit is contained in:
Virtually Nick
2019-06-22 17:39:05 -04:00
committed by GitHub
4 changed files with 58 additions and 21 deletions

View File

@@ -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;
}

View File

@@ -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 {

View File

@@ -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"

View File

@@ -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;