Details
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js
index 6907b80..d5ee251 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/js/services.js
@@ -24,7 +24,7 @@ module.service('Dialog', function($dialog) {
}, {
result : 'ok',
label : 'Delete this ' + type,
- cssClass : 'btn-primary'
+ cssClass : 'destructive'
} ];
$dialog.messageBox(title, msg, btns).open().then(function(result) {
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-social.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-social.html
index a102740..3844c6b 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-social.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-social.html
@@ -92,7 +92,7 @@
<div ng-include src="'partials/provider/'+ helpPId +'-help.html'"></div>
</div>
<div class="modal-footer">
- <button class="btn" ng-click="closeHelp()">Close</button>
+ <button ng-click="closeHelp()">Close</button>
</div>
</div>
</div>
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
index c339f2f..3dc6177 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
@@ -469,6 +469,42 @@ table + .feedback.inline.warning {
td.token-cell button {
margin-top: -1px;
}
+/* Modal boxes */
+.modal .modal-dialog {
+ padding-top: 10em;
+}
+.modal .modal-content {
+ box-shadow: none;
+ border-radius: 0;
+ border: 1px solid #666;
+}
+.modal .modal-header {
+ background-color: #f8f8f8;
+ padding: 1.5em 2em;
+ border-bottom: none;
+}
+.modal .modal-header h3 {
+ font-size: 1.3em;
+ font-weight: bold;
+ font-family: "Open Sans", sans-serif;
+ margin: 0;
+}
+.modal .modal-body p {
+ font-size: 1.1em;
+}
+.modal .modal-body p.primary {
+ font-size: 1.1em;
+ font-weight: bold;
+ margin-bottom: 0.45454545454545em;
+}
+.modal .modal-footer {
+ border-top: 0;
+}
+.modal .modal-footer .primary,
+.modal .modal-footer .destructive {
+ float: right;
+ margin-left: 0.90909090909091em;
+}
/* Page: User Account */
.user form fieldset div:first-child {
margin-top: 1em;
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
index 4cca051..928a3f3 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
@@ -567,6 +567,59 @@ td.token-cell button {
}
+/* Modal boxes */
+
+.modal {
+
+ .modal-dialog {
+ padding-top: 10em;
+ }
+
+ .modal-content {
+ box-shadow: none;
+ border-radius: 0;
+ border: 1px solid #666;
+ }
+
+ .modal-header {
+ background-color: #f8f8f8;
+ padding: 1.5em 2em;
+ border-bottom: none;
+
+ h3 {
+ font-size: 1.3em;
+ font-weight: bold;
+ font-family: @open-sans;
+ margin: 0;
+ }
+ }
+
+ .modal-body {
+
+ p {
+ font-size: 1.1em;
+
+ &.primary {
+ font-size: 1.1em;
+ font-weight: bold;
+ margin-bottom: 0.45454545454545em;
+ }
+ }
+ }
+
+ .modal-footer {
+ border-top: 0;
+
+ .primary,
+ .destructive {
+ float: right;
+ margin-left: 0.90909090909091em;
+ }
+
+ }
+}
+
+
/* Page: User Account */
.user {
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
index 8d99830..89e22f6 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
@@ -788,7 +788,8 @@ input[type="email"].tiny {
margin-top: 3em;
margin-bottom: 5em;
}
-.form-actions .primary {
+.form-actions .primary,
+.form-actions .destructive {
float: right;
margin-left: 0.90909090909091em;
}
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
index c965f0e..15bed0f 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
@@ -940,7 +940,8 @@ input[type="email"] {
margin-top: 3em;
margin-bottom: 5em;
- .primary {
+ .primary,
+ .destructive {
float: right;
margin-left: 0.90909090909091em;
}
diff --git a/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css b/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
index 8fa9b44..94e62db 100644
--- a/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
+++ b/forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
@@ -120,7 +120,6 @@ body {
.rcue-login-register form > div.aside-btn input[type="checkbox"] {
margin-bottom: 0.54545454545455em;
/* 6px */
-
}
.rcue-login-register form > input[type="button"],
.rcue-login-register form > input[type="submit"]{
@@ -137,13 +136,10 @@ body {
top: -0.636363636363636em;
}
.rcue-login-register .feedback.bottom-left {
- left: 32.7em;
+ left: 35.7em;
top: -9.2em;
min-width: 35em;
}
-.rcue-login-register.reset .feedback.bottom-left {
- left: 35.7em;
-}
.rcue-login-register input.error[type="text"],
.rcue-login-register input.error[type="password"],
.rcue-login-register input.error[type="email"] {
