Skip to content

Commit 6aab6b5

Browse files
committed
style(admin): lock screen style
1 parent 702981b commit 6aab6b5

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/main/resources/static/apps/admin/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,10 +385,10 @@ app.controller('LayoutCtrl', ['$http', '$scope', '$state', 'appDialog',
385385
$scope.unlockScreenError = false;
386386
$scope.unlockScreen = function() {
387387
if (!$scope.password) {
388+
$scope.unlockScreenError = true;
388389
return;
389390
}
390391

391-
$scope.unlockScreenError = false;
392392
if ($scope.username && $scope.password) {
393393
$http.post('/api/core/users/login', { username: $scope.username, password: $scope.password }).then(function(res) {
394394
$scope.password = '';

src/main/resources/static/apps/admin/assets/css/style.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/resources/static/apps/admin/assets/css/style.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ html, body {
157157
z-index: 9999;
158158

159159
.error-message {
160-
position: absolute;
161-
margin-top: .5rem;
160+
position: relative;
161+
margin-top: -1rem;
162162
}
163163

164164
.lockscreen-wrapper {

src/main/resources/templates/sso/lockscreens.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<button type="submit" class="btn"><i class="fa fa-arrow-right text-muted"></i></button>
2727
</div>
2828
</div>
29-
<div class="error-message text-danger" ng-if="unlockScreenError" th:text="#{sso.invalidPassword}"></div>
3029
</form>
3130
</div>
31+
<div class="error-message text-center text-danger" ng-if="unlockScreenError" th:text="#{sso.invalidPassword}"></div>
3232
<div class="help-block text-center" th:text="#{sso.lockScreenTip}"></div>
3333
<div class="text-center">
3434
<a href="/sso/login" th:text="#{sso.orSwitchUser}"></a>

0 commit comments

Comments
 (0)