From dde1cda2d98e81186d1c5062c1446aaeeab3225b Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 19 Apr 2015 21:55:42 -0700 Subject: [PATCH] GUAC-1053: Clean up styles. Fix copyright dates. --- .../app/settings/styles/input-method.css | 2 +- .../webapp/app/settings/styles/mouse-mode.css | 2 +- .../app/settings/styles/update-password.css | 26 +++++++++++++++++++ .../templates/settingsPreferences.html | 2 +- 4 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 guacamole/src/main/webapp/app/settings/styles/update-password.css diff --git a/guacamole/src/main/webapp/app/settings/styles/input-method.css b/guacamole/src/main/webapp/app/settings/styles/input-method.css index c6e750507..39e12e323 100644 --- a/guacamole/src/main/webapp/app/settings/styles/input-method.css +++ b/guacamole/src/main/webapp/app/settings/styles/input-method.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Glyptodon LLC + * Copyright (C) 2015 Glyptodon LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/guacamole/src/main/webapp/app/settings/styles/mouse-mode.css b/guacamole/src/main/webapp/app/settings/styles/mouse-mode.css index 739048406..801635b64 100644 --- a/guacamole/src/main/webapp/app/settings/styles/mouse-mode.css +++ b/guacamole/src/main/webapp/app/settings/styles/mouse-mode.css @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Glyptodon LLC + * Copyright (C) 2015 Glyptodon LLC * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/guacamole/src/main/webapp/app/settings/styles/update-password.css b/guacamole/src/main/webapp/app/settings/styles/update-password.css new file mode 100644 index 000000000..3cf4d6332 --- /dev/null +++ b/guacamole/src/main/webapp/app/settings/styles/update-password.css @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2015 Glyptodon LLC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +.preferences .update-password .form { + padding-left: 0.5em; + border-left: 3px solid rgba(0, 0, 0, 0.125); +} diff --git a/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html b/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html index 0deeabe3b..0e0b34ac2 100644 --- a/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html +++ b/guacamole/src/main/webapp/app/settings/templates/settingsPreferences.html @@ -22,7 +22,7 @@ --> -
+

{{'SETTINGS_PREFERENCES.HELP_UPDATE_PASSWORD' | translate}}