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 c339f2f424..3dc6177e35 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 4cca051cdc..928a3f35b5 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 8d99830881..89e22f66e6 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 c965f0e552..15bed0f503 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/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.css b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.css
deleted file mode 100644
index edb5894afb..0000000000
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.css
+++ /dev/null
@@ -1,284 +0,0 @@
-body {
- font-size: 62.5%;
- min-height: 60em;
- min-width: 120em;
-}
-.rcue-login-register {
- background-color: #1D2226;
- background-image: url("img/login-screen-background.jpg");
- background-position: top left;
- background-size: auto;
- background-repeat: no-repeat;
- color: #fff;
- /*
- .form-area {
- background-image: url(img/login-register-separator.svg);
- background-repeat: no-repeat;
- background-position: 40.2em center;
- }
- */
-
- /* Login area */
-
- /* Social login area */
-
- /* Info area */
-
-}
-.rcue-login-register h1 a {
- position: absolute;
- top: 5em;
- right: 6.4em;
-}
-.rcue-login-register .content {
- position: absolute;
- bottom: 10%;
- width: 100%;
- min-width: 76em;
-}
-.rcue-login-register h2 {
- padding-left: 4.34782608695652em;
- font-family: "Overpass", sans-serif;
- font-size: 2.3em;
- font-weight: 100;
- text-transform: uppercase;
- letter-spacing: 0.005em;
-}
-.rcue-login-register h2 strong {
- font-weight: bold;
-}
-.rcue-login-register .background-area {
- border-top: 0.1em rgba(255, 255, 255, 0.05) solid;
- border-bottom: 0.1em rgba(255, 255, 255, 0.05) solid;
- background-color: rgba(0, 0, 0, 0.3);
- padding: 3em 0 3em 10em;
- margin-top: 2.7em;
- width: 100%;
- min-width: 120em;
-}
-.rcue-login-register .background-area section {
- float: left;
- padding: 1.5em 4.5em 1.5em 4.6em;
- width: auto;
- position: relative;
-}
-.rcue-login-register .background-area section h3 {
- display: none;
-}
-.rcue-login-register .background-area section:first-child {
- padding-right: 4.5em;
-}
-.rcue-login-register .form-area.social {
- background-image: url(img/login-register-social-separators.svg);
- background-position: 39.6em center;
-}
-.rcue-login-register section.app-form {
- padding-left: 0;
- position: relative;
-}
-.rcue-login-register form > div {
- margin-bottom: 1em;
-}
-.rcue-login-register label,
-.rcue-login-register .social-login > p {
- display: inline-block;
- font-size: 1.4em;
- font-weight: 400;
-}
-.rcue-login-register label {
- width: 6.07142857142857em;
- /* 85px */
-
-}
-.rcue-login-register label.two-lines {
- float: left;
- margin-top: -0.28571428571429em;
- /* -4px */
-
- line-height: 1.1em;
-}
-.rcue-login-register input[type="text"],
-.rcue-login-register input[type="password"] {
- width: 24.7272727272727em;
- /* 272px */
-
-}
-.rcue-login-register form > div.aside-btn {
- float: left;
- font-size: 1.1em;
- margin-left: 7.72727272727273em;
- /* 85px */
-
- margin-top: 0.90909090909091em;
- /* 10px */
-
- margin-bottom: 0;
-}
-.rcue-login-register form > div.aside-btn label {
- font-size: 1em;
- width: auto;
-}
-.rcue-login-register form > div.aside-btn input[type="checkbox"] {
- margin-bottom: 0.54545454545455em;
- /* 6px */
-
-}
-.rcue-login-register form > input[type="button"] {
- float: right;
- margin-top: 0.76923076923077em;
- /* 10px */
-
-}
-.rcue-login-register p.subtitle {
- font-size: 1.1em;
- color: #999;
- position: absolute;
- right: 4.09090909090909em;
- top: -0.636363636363636em;
-}
-.rcue-login-register .feedback {
- left: 32.7em;
- top: -9.2em;
- min-width: 35em;
-}
-.rcue-login-register.reset .feedback {
- left: 35.7em;
-}
-.rcue-login-register section.social-login > span {
- display: none;
-}
-.rcue-login-register section.social-login > p {
- float: left;
- margin-top: 0.28571428571429em;
- /* 14px */
-
- width: 6.78571428571429em;
- /* 95px */
-
-}
-.rcue-login-register section.social-login > ul {
- float: left;
-}
-.rcue-login-register section.social-login li {
- margin-bottom: 2em;
-}
-.rcue-login-register section.social-login li:last-child {
- margin-bottom: 0;
-}
-.rcue-login-register section.info-area {
- padding-right: 0;
-}
-.rcue-login-register section.info-area p,
-.rcue-login-register section.info-area li {
- font-size: 1.4em;
- margin-bottom: 1.64285714285714em;
- /* 23px */
-
-}
-.rcue-login-register section.info-area li {
- color: #999;
- margin-bottom: 1em;
-}
-.rcue-login-register section.info-area li:last-child {
- margin-bottom: 0;
-}
-@media screen and (min-width: 1280px) {
- .rcue-login-register {
- background-size: 100% auto;
- }
-}
-/* Social buttons */
-.zocial,
-a.zocial {
- padding: 0;
- line-height: 2.3em;
- height: 2.3em;
- width: 131px;
- border-radius: 2px;
- box-shadow: none;
- background-image: none;
- text-shadow: none;
-}
-.zocial .text,
-a.zocial .text {
- font-size: 1.2em;
- line-height: 1.25em;
- text-align: center;
- display: block;
- font-family: "Open Sans", sans-serif;
- font-weight: normal;
- border-left: 1px solid rgba(0, 0, 0, 0.15);
- margin-left: 3em;
- /* 36 px */
-
- margin-top: 0.25em;
- /* 3px */
-
-}
-.zocial:hover,
-a.zocial:hover,
-.zocial:active,
-a.zocial:active,
-.zocial:focus,
-a.zocial:focus {
- text-decoration: none;
- background-image: none;
-}
-.zocial:hover,
-a.zocial:hover {
- background-image: linear-gradient(rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0.1) 100%);
-}
-.zocial:before,
-a.zocial:before {
- margin: 0;
- padding: 0;
- box-shadow: none;
- border: none;
- width: 3em;
- /* 36px */
-
-}
-.zocial.facebook:before {
- width: 2.66666666666667em;
- /* 32px */
-}
-/* Register page */
-.rcue-login-register.register label {
- width: 7.5em;
- /* 105px */
-
-}
-.rcue-login-register.register input[type="text"],
-.rcue-login-register.register input[type="email"],
-.rcue-login-register.register input[type="password"] {
- width: 22.9090909090909em;
- /* 252px */
-
-}
-.rcue-login-register.register form > div.aside-btn {
- margin-left: 9.54545454545454em;
- /* 105px */
-
- width: 12.5454545454546em;
- /* 138px */
-
-}
-.rcue-login-register.register form > div.aside-btn p {
- line-height: 1.3em;
-}
-/* Customer login */
-.rcue-login-register.customer {
- background-image: url("img/customer-login-screen-bg2.jpg");
-}
-.rcue-login-register.customer p.powered {
- font-size: 1.1em;
- margin-top: 1.27272727272727em;
- text-align: right;
- margin-right: 5.81818181818182em;
-}
-.rcue-login-register.customer p.powered a {
- color: #666;
-}
-.rcue-login-register.customer p.powered a:hover {
- color: #0099D3;
-}
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.less b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.less
deleted file mode 100644
index 33c5e76683..0000000000
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/login-register.less
+++ /dev/null
@@ -1,322 +0,0 @@
-body {
- font-size: 62.5%;
- min-height: 60em;
- min-width: 120em;
-}
-
-.rcue-login-register {
- background-color: #1D2226;
- background-image: url("img/login-screen-background.jpg");
- background-position: top left;
- background-size: auto;
- background-repeat: no-repeat;
- color: #fff;
-
- h1 a {
- position: absolute;
- top: 5em;
- right: 6.4em;
- }
-
- .content {
- position: absolute;
- bottom: 10%;
- width: 100%;
- min-width: 76em;
- }
-
- h2 {
- padding-left: 4.34782608695652em;
- font-family: "Overpass", sans-serif;
- font-size: 2.3em;
- font-weight: 100;
- text-transform: uppercase;
- letter-spacing: 0.005em;
-
- strong {
- font-weight: bold;
- }
- }
-
- .background-area {
- border-top: 0.1em rgba(255, 255, 255, 0.05) solid;
- border-bottom: 0.1em rgba(255, 255, 255, 0.05) solid;
- background-color: rgba(0, 0, 0, 0.3);
- padding: 3em 0 3em 10em;
- margin-top: 2.7em;
- width: 100%;
- min-width: 120em;
-
- section {
- float: left;
- padding: 1.5em 4.5em 1.5em 4.6em;
- width: auto;
- position: relative;
-
- h3 {
- display: none;
- }
-
- &:first-child {
- padding-right: 4.5em;
- }
-
- }
-
- }
-
- /*
- .form-area {
- background-image: url(img/login-register-separator.svg);
- background-repeat: no-repeat;
- background-position: 40.2em center;
- }
- */
-
- .form-area.social {
- background-image: url(img/login-register-social-separators.svg);
- background-position: 39.6em center;
- }
-
-
- /* Login area */
-
- section.app-form {
- padding-left: 0;
- position: relative;
- }
-
- form > div {
- margin-bottom: 1em;
- }
-
- label,
- .social-login > p {
- display: inline-block;
- font-size: 1.4em;
- font-weight: 400;
- }
-
- label {
- width: 6.07142857142857em; /* 85px */
- }
-
- label.two-lines {
- float: left;
- margin-top: -0.28571428571429em; /* -4px */
- line-height: 1.1em;
- }
-
- input[type="text"],
- input[type="password"] {
- width: 24.7272727272727em; /* 272px */
- }
-
- form > div.aside-btn {
- float: left;
- font-size: 1.1em;
- margin-left: 7.72727272727273em; /* 85px */
- margin-top: 0.90909090909091em; /* 10px */
- margin-bottom: 0;
-
- label {
- font-size: 1em;
- width: auto;
- }
-
- input[type="checkbox"] {
- margin-bottom: 0.54545454545455em; /* 6px */
- }
-
- }
-
- form > input[type="button"] {
- float: right;
- margin-top: 0.76923076923077em; /* 10px */
- }
-
- p.subtitle {
- font-size: 1.1em;
- color: #999;
- position: absolute;
- right: 4.09090909090909em;
- top: -0.636363636363636em;
- }
-
- .feedback {
- left: 32.7em;
- top: -9.2em;
- min-width: 35em;
- }
-
- &.reset .feedback {
- left: 35.7em;
- }
-
-
- /* Social login area */
-
- section.social-login {
-
- > span {
- display: none;
- }
-
- > p {
- float: left;
- margin-top: 0.28571428571429em; /* 14px */
- width: 6.78571428571429em; /* 95px */
- }
-
- > ul {
- float: left;
- }
-
- li {
- margin-bottom: 2em;
-
- &:last-child {
- margin-bottom: 0;
- }
-
- }
-
- }
-
- /* Info area */
-
- section.info-area {
-
- padding-right: 0;
-
- p,
- li {
- font-size: 1.4em;
- margin-bottom: 1.64285714285714em; /* 23px */
- }
-
- li {
- color: #999;
- margin-bottom: 1em;
- }
-
- li:last-child {
- margin-bottom: 0;
- }
-
- }
-
-}
-
-@media screen and (min-width: 1280px) {
- .rcue-login-register {
- background-size: 100% auto;
- }
-}
-
-
-/* Social buttons */
-
-.zocial,
-a.zocial {
- padding: 0;
- line-height: 2.3em;
- height: 2.3em;
- width: 131px;
- border-radius: 2px;
- box-shadow: none;
- background-image: none;
- text-shadow: none;
-
- .text {
- font-size: 1.2em;
- line-height: 1.25em;
- text-align: center;
- display: block;
- font-family: "Open Sans", sans-serif;
- font-weight: normal;
- border-left: 1px solid rgba(0, 0, 0, 0.15);
- margin-left: 3em; /* 36 px */
- margin-top: 0.25em; /* 3px */
- }
-
- &:hover,
- &:active,
- &:focus {
- text-decoration: none;
- background-image: none;
- }
-
- &:hover {
- background-image: linear-gradient(rgba(0, 0, 0, 0.1) 0%, rgba(0, 0, 0, 0.1) 100%);
- }
-
- &:before {
- margin: 0;
- padding: 0;
- box-shadow: none;
- border: none;
- width: 3em; /* 36px */
- }
-}
-
-.zocial.facebook:before {
- width: 2.66666666666667em; /* 32px */
-}
-
-
-/* Register page */
-
-.rcue-login-register.register {
-
- label {
- width: 7.5em; /* 105px */
- }
-
- input[type="text"],
- input[type="email"],
- input[type="password"] {
- width: 22.9090909090909em; /* 252px */
- }
-
- form > div.aside-btn {
- margin-left: 9.54545454545454em; /* 105px */
- width: 12.5454545454546em; /* 138px */
-
- p {
- line-height: 1.3em;
- }
-
- }
-
-}
-
-
-/* Customer login */
-
-.rcue-login-register.customer {
- background-image: url("img/customer-login-screen-bg2.jpg");
-
- p.powered {
- font-size: 1.1em;
- margin-top: 1.27272727272727em;
- text-align: right;
- margin-right: 5.81818181818182em;
-
- a {
- color: #666;
-
- &:hover {
- color: #0099D3;
- }
- }
-
- }
-
-}
-
-
-
-
-
-
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 6907b80340..d5ee251668 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 a102740feb..3844c6bf3c 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 @@
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 8fa9b44377..94e62db55e 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"] {