From 581a7cb47a6289b19484292a855420f82c2a2679 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 13 Jun 2021 21:24:05 -0700 Subject: [PATCH 1/6] GUACAMOLE-680: Refactor repeated modal structures to common directive. --- .../app/index/controllers/indexController.js | 73 +++++++++++++++++-- .../frontend/src/app/index/styles/cloak.css | 27 +++++++ .../src/app/index/styles/fatal-page-error.css | 15 +--- .../frontend/src/app/index/styles/status.css | 46 +----------- .../app/notification/directives/guacModal.js | 29 ++++++++ .../src/app/notification/styles/modal.css | 41 +++++++++++ .../app/notification/templates/guacModal.html | 3 + guacamole/src/main/frontend/src/index.html | 50 ++++++------- 8 files changed, 192 insertions(+), 92 deletions(-) create mode 100644 guacamole/src/main/frontend/src/app/index/styles/cloak.css create mode 100644 guacamole/src/main/frontend/src/app/notification/directives/guacModal.js create mode 100644 guacamole/src/main/frontend/src/app/notification/styles/modal.css create mode 100644 guacamole/src/main/frontend/src/app/notification/templates/guacModal.html diff --git a/guacamole/src/main/frontend/src/app/index/controllers/indexController.js b/guacamole/src/main/frontend/src/app/index/controllers/indexController.js index 9b9078235..532f0db65 100644 --- a/guacamole/src/main/frontend/src/app/index/controllers/indexController.js +++ b/guacamole/src/main/frontend/src/app/index/controllers/indexController.js @@ -69,6 +69,46 @@ angular.module('index').controller('indexController', ['$scope', '$injector', */ $scope.expectedCredentials = null; + /** + * Possible overall states of the client side of the web application. + * + * @enum {string} + */ + var ApplicationState = { + + /** + * The application has fully loaded but is awaiting credentials from + * the user before proceeding. + */ + AWAITING_CREDENTIALS : 'awaitingCredentials', + + /** + * A fatal error has occurred that will prevent the client side of the + * application from functioning properly. + */ + FATAL_ERROR : 'fatalError', + + /** + * The application has just started within the user's browser and has + * not yet settled into any specific state. + */ + LOADING : 'loading', + + /** + * The application has fully loaded and the user has logged in + */ + READY : 'ready' + + }; + + /** + * The current overall state of the client side of the application. + * Possible values are defined by {@link ApplicationState}. + * + * @type string + */ + $scope.applicationState = ApplicationState.LOADING; + /** * Basic page-level information. */ @@ -103,7 +143,7 @@ angular.module('index').controller('indexController', ['$scope', '$injector', // Do not handle key events if not logged in or if a notification is // shown - if ($scope.expectedCredentials || guacNotification.getStatus()) + if ($scope.applicationState !== ApplicationState.READY || guacNotification.getStatus()) return true; // Warn of pending keydown @@ -122,7 +162,7 @@ angular.module('index').controller('indexController', ['$scope', '$injector', // Do not handle key events if not logged in or if a notification is // shown - if ($scope.expectedCredentials || guacNotification.getStatus()) + if ($scope.applicationState !== ApplicationState.READY || guacNotification.getStatus()) return; // Warn of pending keyup @@ -168,32 +208,52 @@ angular.module('index').controller('indexController', ['$scope', '$injector', }, true); + /** + * Reloads the current route and controller, effectively forcing + * reauthentication. If the user is not logged in, this will result in + * the login screen appearing. + */ + $scope.reAuthenticate = function reAuthenticate() { + $scope.reAuthenticating = true; + $route.reload(); + }; + // Display login screen if a whole new set of credentials is needed $scope.$on('guacInvalidCredentials', function loginInvalid(event, parameters, error) { + + $scope.applicationState = ApplicationState.AWAITING_CREDENTIALS; $scope.page.title = 'APP.NAME'; $scope.page.bodyClassName = ''; + $scope.loginHelpText = null; $scope.acceptedCredentials = {}; $scope.expectedCredentials = error.expected; - $scope.fatalError = null; + }); // Prompt for remaining credentials if provided credentials were not enough $scope.$on('guacInsufficientCredentials', function loginInsufficient(event, parameters, error) { + + $scope.applicationState = ApplicationState.AWAITING_CREDENTIALS; $scope.page.title = 'APP.NAME'; $scope.page.bodyClassName = ''; + $scope.loginHelpText = error.translatableMessage; $scope.acceptedCredentials = parameters; $scope.expectedCredentials = error.expected; - $scope.fatalError = null; + }); // Replace absolutely all content with an error message if the page itself // cannot be displayed due to an error $scope.$on('guacFatalPageError', function fatalPageError(error) { + + $scope.applicationState = ApplicationState.FATAL_ERROR; $scope.page.title = 'APP.NAME'; $scope.page.bodyClassName = ''; + $scope.fatalError = error; + }); // Ensure new pages always start with clear keyboard state @@ -209,10 +269,7 @@ angular.module('index').controller('indexController', ['$scope', '$injector', // Clear login screen if route change was successful (and thus // login was either successful or not required) - $scope.loginHelpText = null; - $scope.acceptedCredentials = null; - $scope.expectedCredentials = null; - $scope.fatalError = null; + $scope.applicationState = ApplicationState.READY; // Set title var title = current.$$route.title; diff --git a/guacamole/src/main/frontend/src/app/index/styles/cloak.css b/guacamole/src/main/frontend/src/app/index/styles/cloak.css new file mode 100644 index 000000000..701107bdf --- /dev/null +++ b/guacamole/src/main/frontend/src/app/index/styles/cloak.css @@ -0,0 +1,27 @@ +/* + * 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. + */ + +/* + * Hide portions of DOM by default until Angular has finished loading, + * compiling, etc. + */ + +*[ng-cloak], .translate-cloak { + display: none !important; +} diff --git a/guacamole/src/main/frontend/src/app/index/styles/fatal-page-error.css b/guacamole/src/main/frontend/src/app/index/styles/fatal-page-error.css index 9a50e9c9b..bbfe40615 100644 --- a/guacamole/src/main/frontend/src/app/index/styles/fatal-page-error.css +++ b/guacamole/src/main/frontend/src/app/index/styles/fatal-page-error.css @@ -17,23 +17,10 @@ * under the License. */ -.fatal-page-error-outer { - display: table; - height: 100%; - width: 100%; - position: fixed; - left: 0; - top: 0; +.fatal-page-error-modal guac-modal { z-index: 30; } -.fatal-page-error-middle { - width: 100%; - text-align: center; - display: table-cell; - vertical-align: middle; -} - .fatal-page-error { display: inline-block; width: 100%; diff --git a/guacamole/src/main/frontend/src/app/index/styles/status.css b/guacamole/src/main/frontend/src/app/index/styles/status.css index a24c71a56..7fd63672d 100644 --- a/guacamole/src/main/frontend/src/app/index/styles/status.css +++ b/guacamole/src/main/frontend/src/app/index/styles/status.css @@ -17,25 +17,11 @@ * under the License. */ -.status-outer { - display: table; - height: 100%; - width: 100%; - position: fixed; - left: 0; - top: 0; +.global-status-modal guac-modal { background: rgba(0, 0, 0, 0.5); - z-index: 10; } -.status-middle { - width: 100%; - text-align: center; - display: table-cell; - vertical-align: middle; -} - -.status-middle .notification { +.global-status-modal .notification { width: 75%; max-width: 5in; @@ -47,34 +33,10 @@ } -.status-middle .notification .body { +.global-status-modal .notification .body { margin: 1.25em; } -.status-middle .notification .buttons { +.global-status-modal .notification .buttons { margin: 1em; } - -/* Fade entire status area in/out based on shown status */ - -.status-outer { - visibility: hidden; - opacity: 0; - transition: opacity, visibility; - transition-duration: 0.25s; -} - -.shown.status-outer { - visibility: visible; - opacity: 1; -} - -/* Hide dialog immediately based on status */ - -.status-middle .notification { - visibility: hidden; -} - -.shown .status-middle .notification { - visibility: visible; -} diff --git a/guacamole/src/main/frontend/src/app/notification/directives/guacModal.js b/guacamole/src/main/frontend/src/app/notification/directives/guacModal.js new file mode 100644 index 000000000..8cc6392cb --- /dev/null +++ b/guacamole/src/main/frontend/src/app/notification/directives/guacModal.js @@ -0,0 +1,29 @@ +/* + * 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. + */ + +/** + * A directive for displaying arbitrary modal content. + */ +angular.module('notification').directive('guacModal', [function guacModal() { + return { + restrict: 'E', + templateUrl: 'app/notification/templates/guacModal.html', + transclude: true + }; +}]); diff --git a/guacamole/src/main/frontend/src/app/notification/styles/modal.css b/guacamole/src/main/frontend/src/app/notification/styles/modal.css new file mode 100644 index 000000000..ad35bb472 --- /dev/null +++ b/guacamole/src/main/frontend/src/app/notification/styles/modal.css @@ -0,0 +1,41 @@ +/* + * 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-modal { + display: table; + height: 100%; + width: 100%; + position: fixed; + left: 0; + top: 0; + z-index: 10; +} + +guac-modal .modal-contents { + width: 100%; + text-align: center; + display: table-cell; + vertical-align: middle; +} + +guac-modal { + animation: fadein 0.125s linear; + -moz-animation: fadein 0.125s linear; + -webkit-animation: fadein 0.125s linear; +} diff --git a/guacamole/src/main/frontend/src/app/notification/templates/guacModal.html b/guacamole/src/main/frontend/src/app/notification/templates/guacModal.html new file mode 100644 index 000000000..57a1b5a46 --- /dev/null +++ b/guacamole/src/main/frontend/src/app/notification/templates/guacModal.html @@ -0,0 +1,3 @@ +
+ +
diff --git a/guacamole/src/main/frontend/src/index.html b/guacamole/src/main/frontend/src/index.html index 2f0f39cfe..e8dbdb82a 100644 --- a/guacamole/src/main/frontend/src/index.html +++ b/guacamole/src/main/frontend/src/index.html @@ -38,41 +38,35 @@ - - -
- - -
- - -
-
- -
-
- -
-
- -
- - - - -
+ -
-
+
+

+ +
+ + + + + +
+ + + + + + +
+
From 823970eb7f62d20eb29248eb41ee1b6831c2b7a9 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 13 Jun 2021 21:25:37 -0700 Subject: [PATCH 2/6] GUACAMOLE-680: Display status message upon logout (rather than immediately reauthenticating). The former behavior (immediately reauthenticating) typically results in the login screen appearing, but will also instantly sign the user back in if a single sign-on solution is being used. This results in the logout action appearing to have no effect when SSO is involved. --- .../client/controllers/clientController.js | 5 +--- .../app/index/controllers/indexController.js | 20 ++++++++++++++++ .../src/app/index/styles/logged-out.css | 23 +++++++++++++++++++ .../app/navigation/directives/guacUserMenu.js | 8 +------ guacamole/src/main/frontend/src/index.html | 11 +++++++++ .../main/frontend/src/translations/en.json | 2 ++ 6 files changed, 58 insertions(+), 11 deletions(-) create mode 100644 guacamole/src/main/frontend/src/app/index/styles/logged-out.css diff --git a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js index 782167614..1bc5dd6fa 100644 --- a/guacamole/src/main/frontend/src/app/client/controllers/clientController.js +++ b/guacamole/src/main/frontend/src/app/client/controllers/clientController.js @@ -167,10 +167,7 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams className : "logout button", callback : function logoutCallback() { authenticationService.logout() - ['catch'](requestService.IGNORE) - ['finally'](function logoutComplete() { - $location.url('/'); - }); + ['catch'](requestService.IGNORE); } }; diff --git a/guacamole/src/main/frontend/src/app/index/controllers/indexController.js b/guacamole/src/main/frontend/src/app/index/controllers/indexController.js index 532f0db65..51f129a3f 100644 --- a/guacamole/src/main/frontend/src/app/index/controllers/indexController.js +++ b/guacamole/src/main/frontend/src/app/index/controllers/indexController.js @@ -25,6 +25,7 @@ angular.module('index').controller('indexController', ['$scope', '$injector', // Required services var $document = $injector.get('$document'); + var $route = $injector.get('$route'); var $window = $injector.get('$window'); var clipboardService = $injector.get('clipboardService'); var guacNotification = $injector.get('guacNotification'); @@ -50,6 +51,13 @@ angular.module('index').controller('indexController', ['$scope', '$injector', */ $scope.loginHelpText = null; + /** + * Whether the user has selected to log back in after having logged out. + * + * @type boolean + */ + $scope.reAuthenticating = false; + /** * The credentials that the authentication service is has already accepted, * pending additional credentials, if any. If the user is logged in, or no @@ -94,6 +102,11 @@ angular.module('index').controller('indexController', ['$scope', '$injector', */ LOADING : 'loading', + /** + * The user has manually logged out. + */ + LOGGED_OUT : 'loggedOut', + /** * The application has fully loaded and the user has logged in */ @@ -256,6 +269,13 @@ angular.module('index').controller('indexController', ['$scope', '$injector', }); + // Replace the overall user interface with an informational message if the + // user has manually logged out + $scope.$on('guacLogout', function loggedOut() { + $scope.applicationState = ApplicationState.LOGGED_OUT; + $scope.reAuthenticating = false; + }); + // Ensure new pages always start with clear keyboard state $scope.$on('$routeChangeStart', function routeChanging() { keyboard.reset(); diff --git a/guacamole/src/main/frontend/src/app/index/styles/logged-out.css b/guacamole/src/main/frontend/src/app/index/styles/logged-out.css new file mode 100644 index 000000000..89f02c09d --- /dev/null +++ b/guacamole/src/main/frontend/src/app/index/styles/logged-out.css @@ -0,0 +1,23 @@ +/* + * 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. + */ + +.logged-out-modal guac-modal { + background: white; + z-index: 20; +} diff --git a/guacamole/src/main/frontend/src/app/navigation/directives/guacUserMenu.js b/guacamole/src/main/frontend/src/app/navigation/directives/guacUserMenu.js index c6630e72b..44a2fb5a7 100644 --- a/guacamole/src/main/frontend/src/app/navigation/directives/guacUserMenu.js +++ b/guacamole/src/main/frontend/src/app/navigation/directives/guacUserMenu.js @@ -140,13 +140,7 @@ angular.module('navigation').directive('guacUserMenu', [function guacUserMenu() */ $scope.logout = function logout() { authenticationService.logout() - ['catch'](requestService.IGNORE) - ['finally'](function logoutComplete() { - if ($location.path() !== '/') - $location.url('/'); - else - $route.reload(); - }); + ['catch'](requestService.IGNORE); }; /** diff --git a/guacamole/src/main/frontend/src/index.html b/guacamole/src/main/frontend/src/index.html index e8dbdb82a..01ae99ac4 100644 --- a/guacamole/src/main/frontend/src/index.html +++ b/guacamole/src/main/frontend/src/index.html @@ -40,6 +40,17 @@ + +
+ +

+

+ +

+ +
+
diff --git a/guacamole/src/main/frontend/src/translations/en.json b/guacamole/src/main/frontend/src/translations/en.json index f75914973..191921a80 100644 --- a/guacamole/src/main/frontend/src/translations/en.json +++ b/guacamole/src/main/frontend/src/translations/en.json @@ -15,6 +15,7 @@ "ACTION_DELETE_SESSIONS" : "Kill Sessions", "ACTION_DOWNLOAD" : "Download", "ACTION_LOGIN" : "Login", + "ACTION_LOGIN_AGAIN" : "Re-login", "ACTION_LOGOUT" : "Logout", "ACTION_MANAGE_CONNECTIONS" : "Connections", "ACTION_MANAGE_PREFERENCES" : "Preferences", @@ -44,6 +45,7 @@ "FORMAT_DATE_TIME_PRECISE" : "yyyy-MM-dd HH:mm:ss", "INFO_ACTIVE_USER_COUNT" : "Currently in use by {USERS} {USERS, plural, one{user} other{users}}.", + "INFO_LOGGED_OUT" : "You have been logged out.", "TEXT_ANONYMOUS_USER" : "Anonymous", "TEXT_HISTORY_DURATION" : "{VALUE} {UNIT, select, second{{VALUE, plural, one{second} other{seconds}}} minute{{VALUE, plural, one{minute} other{minutes}}} hour{{VALUE, plural, one{hour} other{hours}}} day{{VALUE, plural, one{day} other{days}}} other{}}", From 529e19729bc03f0973d876f85d20f5c54c4815a3 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 13 Jun 2021 21:27:48 -0700 Subject: [PATCH 3/6] GUACAMOLE-680: Ensure the "guacLogout" event is specific to manual logouts. --- .../app/auth/service/authenticationService.js | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/guacamole/src/main/frontend/src/app/auth/service/authenticationService.js b/guacamole/src/main/frontend/src/app/auth/service/authenticationService.js index d05a0d38c..16e781713 100644 --- a/guacamole/src/main/frontend/src/app/auth/service/authenticationService.js +++ b/guacamole/src/main/frontend/src/app/auth/service/authenticationService.js @@ -175,7 +175,7 @@ angular.module('auth').factory('authenticationService', ['$injector', // If an old token existed, request that the token be revoked if (currentToken) { - service.logout().catch(angular.noop) + service.revokeToken(currentToken).catch(angular.noop); } // Notify of login and new token @@ -252,6 +252,24 @@ angular.module('auth').factory('authenticationService', ['$injector', }; + /** + * Makes a request to revoke an authentication token using the token REST + * API endpoint, returning a promise succeeds only if the token was + * successfully revoked. + * + * @param {string} token + * The authentication token to revoke. + * + * @returns {Promise} + * A promise which succeeds only if the token was successfully revoked. + */ + service.revokeToken = function revokeToken(token) { + return requestService({ + method: 'DELETE', + url: 'api/tokens/' + token + }); + }; + /** * Makes a request to authenticate a user using the token REST API endpoint * with a username and password, ignoring any currently-stored token, @@ -276,7 +294,7 @@ angular.module('auth').factory('authenticationService', ['$injector', }; /** - * Makes a request to logout a user using the login REST API endpoint, + * Makes a request to logout a user using the token REST API endpoint, * returning a promise succeeds only if the logout operation was * successful. * @@ -294,10 +312,7 @@ angular.module('auth').factory('authenticationService', ['$injector', $rootScope.$broadcast('guacLogout', token); // Delete old token - return requestService({ - method: 'DELETE', - url: 'api/tokens/' + token - }); + return service.revokeToken(token); }; From b29c0a03ea8296967747f5fa68593a0be64a080d Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 13 Jun 2021 21:53:41 -0700 Subject: [PATCH 4/6] GUACAMOLE-680: Use common styling for all dialogs/notifications. --- .../frontend/src/app/index/styles/dialog.css | 94 ------------------- .../frontend/src/app/login/styles/dialog.css | 2 - .../src/app/login/templates/login.html | 2 +- .../app/notification/styles/notification.css | 4 +- 4 files changed, 3 insertions(+), 99 deletions(-) delete mode 100644 guacamole/src/main/frontend/src/app/index/styles/dialog.css diff --git a/guacamole/src/main/frontend/src/app/index/styles/dialog.css b/guacamole/src/main/frontend/src/app/index/styles/dialog.css deleted file mode 100644 index 18f7864b7..000000000 --- a/guacamole/src/main/frontend/src/app/index/styles/dialog.css +++ /dev/null @@ -1,94 +0,0 @@ -/* - * 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. - */ - -.dialog-container { - position: fixed; - top: 0; - left: 0; - bottom: 0; - right: 0; - background: rgba(0, 0, 0, 0.5); - padding: 1em; -} - -.dialog-outer { - display: table; - height: 100%; - width: 100%; - position: fixed; - left: 0; - top: 0; - background: rgba(0, 0, 0, 0.5); -} - -.dialog-middle { - width: 100%; - text-align: center; - display: table-cell; - vertical-align: middle; -} - -.dialog.edit { - max-height: 100%; -} - -.dialog { - - max-width: 100%; - width: 8in; - margin-left: auto; - margin-right: auto; - overflow: auto; - - border: 1px solid rgba(0, 0, 0, 0.5); - background: #E7E7E7; - - -moz-border-radius: 0.2em; - -webkit-border-radius: 0.2em; - -khtml-border-radius: 0.2em; - border-radius: 0.2em; - - box-shadow: 0.1em 0.1em 0.2em rgba(0, 0, 0, 0.6); - -} - -.dialog > * { - margin: 1em; -} - -.dialog .header { - margin: 0; -} - -.dialog td { - position: relative; -} - -.dialog .overlay { - position: fixed; - top: 0; - left: 0; - bottom: 0; - right: 0; - z-index: 1; -} - -.dialog .footer { - text-align: center; -} diff --git a/guacamole/src/main/frontend/src/app/login/styles/dialog.css b/guacamole/src/main/frontend/src/app/login/styles/dialog.css index e83353331..48c583ef0 100644 --- a/guacamole/src/main/frontend/src/app/login/styles/dialog.css +++ b/guacamole/src/main/frontend/src/app/login/styles/dialog.css @@ -36,8 +36,6 @@ max-width: 3in; text-align: left; padding: 1em; - border: 1px solid rgba(0, 0, 0, 0.25); - box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.25); font-size: 1.25em; display: inline-block; diff --git a/guacamole/src/main/frontend/src/app/login/templates/login.html b/guacamole/src/main/frontend/src/app/login/templates/login.html index 41bc0cd10..9a354163b 100644 --- a/guacamole/src/main/frontend/src/app/login/templates/login.html +++ b/guacamole/src/main/frontend/src/app/login/templates/login.html @@ -6,7 +6,7 @@