Merge 1.0.0 changes back to master.

This commit is contained in:
Nick Couchman
2018-07-26 06:15:30 -04:00
12 changed files with 482 additions and 82 deletions

View File

@@ -17,10 +17,6 @@
* under the License.
*/
.settings .header {
margin-bottom: 0;
}
.settings table.properties th {
text-align: left;
font-weight: normal;

View File

@@ -1,7 +1,7 @@
<div class="view">
<div class="header">
<div class="header tabbed">
<h2>{{'SETTINGS.SECTION_HEADER_SETTINGS' | translate}}</h2>
<guac-user-menu></guac-user-menu>
</div>