safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-10-28 07:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #174 from glyptodon/friendlier-css

Browse Source 
GUAC-587: Make DOM/CSS friendlier for theming
This commit is contained in:
James Muehlner
2015-05-05 20:09:37 -07:00
parent 0ed3b9a992 d8512531c6
commit f0cd211043
4 changed files with 131 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
guacamole/src/main/webapp/app/client/styles/menu.css
View File

@@ -127,12 +127,6 @@
flex: 0 0 auto;
}
#menu h3 {
margin: 0;
padding: 0;
padding-bottom: 1em;
}
#menu .content {
padding: 0;
@@ -165,7 +159,13 @@
}
#menu .content + h3 {
.menu-section h3 {
margin: 0;
padding: 0;
padding-bottom: 1em;
}
.menu-section ~ .menu-section h3 {
padding-top: 1em;
}

18
guacamole/src/main/webapp/app/client/templates/client.html
View File

@@ -66,21 +66,26 @@
<div class="menu-body" guac-touch-drag="menuDrag" guac-scroll="menu.scrollState">
<!-- Clipboard -->
<div class="menu-section" id="clipboard-settings">
<h3>{{'CLIENT.SECTION_HEADER_CLIPBOARD' | translate}}</h3>
<div class="content" id="clipboard-settings">
<div class="content">
<p class="description">{{'CLIENT.HELP_CLIPBOARD' | translate}}</p>
<textarea ng-model="client.clipboardData" rows="10" cols="40" id="clipboard"></textarea>
</div>
</div>
<!-- File transfers -->
<div class="menu-section" id="file-transfers">
<h3 guac-marker="menu.fileTransferMarker">{{'CLIENT.SECTION_HEADER_FILE_TRANSFERS' | translate}}</h3>
<div class="content" id="file-transfers">
<div class="content">
<guac-file-transfer-manager client="client"></guac-file-transfer-manager>
</div>
</div>
<!-- Input method -->
<div class="menu-section" id="keyboard-settings">
<h3>{{'CLIENT.SECTION_HEADER_INPUT_METHOD' | translate}}</h3>
<div class="content" id="keyboard-settings">
<div class="content">
<!-- No IME -->
<div class="choice">
@@ -102,10 +107,12 @@
</div>
</div>
</div>
<!-- Mouse mode -->
<div class="menu-section" id="mouse-settings">
<h3>{{'CLIENT.SECTION_HEADER_MOUSE_MODE' | translate}}</h3>
<div class="content" id="mouse-settings">
<div class="content">
<p class="description">{{'CLIENT.HELP_MOUSE_MODE' | translate}}</p>
<!-- Touchscreen -->
@@ -127,8 +134,10 @@
</div>
</div>
</div>
<!-- Display options -->
<div class="menu-section" id="display-settings">
<h3>{{'CLIENT.SECTION_HEADER_DISPLAY' | translate}}</h3>
<div class="content">
<div id="zoom-settings">
@@ -138,6 +147,7 @@
</div>
<div><label><input ng-model="menu.autoFit" ng-change="changeAutoFit()" ng-disabled="autoFitDisabled()" type="checkbox" id="auto-fit"/> {{'CLIENT.TEXT_ZOOM_AUTO_FIT' | translate}}</label></div>
</div>
</div>
</div>

57
guacamole/src/main/webapp/app/index/styles/buttons.css
View File

@@ -79,35 +79,62 @@ input[type="submit"]:disabled, button:disabled, button.danger:disabled {
opacity: 0.75;
}
.button.logout, .button.manage, .button.back, .button.home, .button.change-password,
button.logout, button.manage, button.back, button.home, button.change-password {
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.5em 0.45em;
.button.logout,
button.logout,
.button.manage,
button.manage,
.button.back,
button.back,
.button.home,
button.home,
.button.change-password,
button.change-password {
position: relative;
padding-left: 1.8em;
}
.button.logout,
button.logout {
.button.logout::before,
button.logout::before,
.button.manage::before,
button.manage::before,
.button.back::before,
button.back::before,
.button.home::before,
button.home::before,
.button.change-password::before,
button.change-password::before {
content: ' ';
position: absolute;
left: 0;
top: 0;
bottom: 0;
width: 1.8em;
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.5em 0.45em;
}
.button.logout::before,
button.logout::before {
background-image: url('images/action-icons/guac-logout.png');
}
.button.manage,
button.manage {
.button.manage::before,
button.manage::before {
background-image: url('images/action-icons/guac-config.png');
}
.button.back,
button.back {
.button.back::before,
button.back::before {
background-image: url('images/action-icons/guac-back.png');
}
.button.home,
button.home {
.button.home::before,
button.home::before {
background-image: url('images/action-icons/guac-home.png');
}
.button.change-password,
button.change-password {
.button.change-password::before,
button.change-password::before {
background-image: url('images/action-icons/guac-key.png');
}

44
guacamole/src/main/webapp/app/settings/styles/buttons.css
View File

@@ -24,37 +24,35 @@ button.add-user,
a.button.add-connection,
a.button.add-connection-group {
font-size: 0.8em;
padding-left: 1.8em;
position: relative;
}
button.add-user {
button.add-user::before,
a.button.add-connection::before,
a.button.add-connection-group::before {
content: ' ';
position: absolute;
width: 1.8em;
top: 0;
bottom: 0;
left: 0;
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.5em 0.45em;
}
button.add-user::before {
background-image: url('images/action-icons/guac-user-add.png');
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.5em 0.45em;
padding-left: 1.8em;
}
a.button.add-connection {
a.button.add-connection::before {
background-image: url('images/action-icons/guac-monitor-add.png');
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.5em 0.45em;
padding-left: 1.8em;
}
a.button.add-connection-group {
a.button.add-connection-group::before {
background-image: url('images/action-icons/guac-group-add.png');
background-repeat: no-repeat;
background-size: 1em;
background-position: 0.5em 0.45em;
padding-left: 1.8em;
}