Details
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
index 6786466..2d0c9bd 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/menu.html
@@ -19,16 +19,25 @@
</div>
</div>
<div class="navbar primary">
- <div class="navbar-inner" data-ng-controller="RealmDropdownCtrl">
- <ul class="nav pull-right" data-ng-show="auth.loggedIn">
- <li class="divider-vertical-left" data-ng-class="path[0] == 'create' && path[1] == 'realm' && 'active'"
- data-ng-show="auth.loggedIn"><a href="#/create/realm">New Realm</a></li>
- </ul>
- <ul class="nav" >
- <li data-ng-show="showNav()"><a href="#/realms/{{current.realm.id}}">Realm</a></li>
- <li class="select-rcue" data-ng-show="showNav()"><select ng-change="changeRealm()" ng-model="current.realm" ng-options="r.realm for r in current.realms">
- </select></li>
+ <div class="navbar-inner clearfix" data-ng-controller="RealmDropdownCtrl">
+ <ul class="nav pull-left">
+ <li>
+ <span class="dropdown-label" data-ng-show="showNav()">Realm:</span>
+ <div class="dropdown" data-ng-show="showNav()">
+ <a data-toggle="dropdown" class="dropdown-toggle" href="#">My First Realm</a>
+ <ul class="dropdown-menu">
+ <li class="selected"><a href="#">My First Realm</a></li>
+ <li><a href="#">Another Realm</a></li>
+ <li><a href="#">Some realm with a freaking gigantic name</a></li>
+ </ul>
+ </div>
+ <!-- This component should be replaced by the dropdown-menu above --> <li class="select-rcue" data-ng-show="showNav()"><select ng-change="changeRealm()" ng-model="current.realm" ng-options="r.realm for r in current.realms"></select></li>
+ </li>
</ul>
+ <div class="pull-right" data-ng-show="auth.loggedIn">
+ <a class="button primary" href="#/create/realm" data-ng-class="path[0] == 'create' && path[1] == 'realm' && 'active'"
+ data-ng-show="auth.loggedIn">Add Realm</a>
+ </div>
</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 596fdfc..acc7fb4 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
@@ -5,6 +5,92 @@ body {
color: #4d5258;
font-family: "Open Sans", sans-serif;
}
+.feedback-aligner {
+ top: 0.9em;
+}
+/* Header */
+.header.rcue .navbar.primary .navbar-inner {
+ min-height: 42px;
+}
+.header.rcue .navbar.primary .nav > li .dropdown-label {
+ font-size: 0.84615384615385em;
+ color: #dbdada;
+ margin-left: 1.36363636363636em;
+ display: inline-block;
+}
+.header.rcue .navbar.primary .nav > li .dropdown {
+ display: inline-block;
+ margin-left: 0.53846153846154em;
+ margin-top: 0.46153846153846em;
+ min-width: 15.3846153846154em;
+ width: auto;
+}
+.header.rcue .navbar.primary .nav > li .dropdown .dropdown-toggle {
+ font-size: 0.84615384615385em;
+ color: #fff;
+ display: inline-block;
+ line-height: 2.36363636363636em;
+ border: 1px solid #676c6e;
+ border-radius: 2px;
+ padding: 0 0.54545454545455em;
+ background: #555a5e url(img/sprite-arrow-down.svg) no-repeat right -26px;
+ display: block;
+}
+.header.rcue .navbar.primary .nav > li .dropdown .dropdown-toggle:hover,
+.header.rcue .navbar.primary .nav > li .dropdown .dropdown-toggle:focus {
+ text-decoration: none;
+}
+.header.rcue .navbar.primary .nav > li .dropdown .dropdown-toggle:hover {
+ border-color: #7e8385;
+}
+.header.rcue .navbar.primary .nav > li .dropdown .dropdown-menu {
+ left: 0;
+ min-width: 0;
+ width: 100%;
+ overflow: hidden;
+}
+.header.rcue .navbar.primary .nav > li .dropdown .dropdown-menu li,
+.header.rcue .navbar.primary .nav > li .dropdown .dropdown-menu li.selected {
+ width: auto;
+}
+.header.rcue .navbar.primary .nav > li .dropdown .dropdown-menu li a,
+.header.rcue .navbar.primary .nav > li .dropdown .dropdown-menu li.selected a {
+ width: auto;
+ border-top: 1px solid transparent;
+ border-bottom: 1px solid transparent;
+}
+.header.rcue .navbar.primary .nav > li .dropdown .dropdown-menu li a:hover,
+.header.rcue .navbar.primary .nav > li .dropdown .dropdown-menu li.selected a:hover {
+ background-color: #D5ECF9;
+ background-image: none;
+ border-bottom: 1px solid #A7D7F1;
+ border-top: 1px solid #A7D7F1;
+ color: #4D5258;
+}
+.header.rcue .navbar.primary .nav > li .dropdown .dropdown-menu li.selected a {
+ background-color: #2B99C0;
+ background-image: linear-gradient(top, #2ea1ca 0%, #2792b6 100%);
+ background-image: -o-linear-gradient(top, #2ea1ca 0%, #2792b6 100%);
+ background-image: -moz-linear-gradient(top, #2ea1ca 0%, #2792b6 100%);
+ background-image: -webkit-linear-gradient(top, #2ea1ca 0%, #2792b6 100%);
+ background-image: -ms-linear-gradient(top, #2ea1ca 0%, #2792b6 100%);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #2ea1ca), color-stop(1, 0, #2792b6));
+ background-repeat: repeat-x;
+ color: #FFFFFF;
+}
+.header.rcue .navbar.primary .nav > li .dropdown.open .dropdown-toggle {
+ text-decoration: none;
+ box-shadow: inset 0px 2px 5px rgba(0, 0, 0, 0.2);
+ border-color: #7e8385;
+}
+.header.rcue .navbar.primary .button {
+ font-size: 0.84615384615385em;
+ margin-right: 1.36363636363636em;
+ margin-top: 0.63636363636364em;
+}
+.header.rcue .navbar.primary .button:focus {
+ text-decoration: none;
+}
.bs-sidebar {
background-color: #f9f9f9;
padding-top: 4.3em;
@@ -197,6 +283,7 @@ table a:hover {
width: 30.8em;
padding-left: 1.5em;
padding-right: 1.5em;
+ padding-top: .5em;
background-color: #fff;
border: 1px solid #b6b6b6;
border-top: none;
@@ -221,6 +308,118 @@ table a:hover {
td.token-cell button {
margin-top: -1px;
}
+/* Page: User Account */
+.user form fieldset div:first-child {
+ margin-top: 1em;
+}
+.user form fieldset p + div {
+ margin-top: 2.5em;
+}
+.user .bs-sidebar {
+ padding-top: 3.3em;
+}
+.user p.info {
+ font-size: 1.1em;
+}
+table.list {
+ border-left: none;
+ border-right: none;
+ margin-top: 1.5em;
+ border-color: #ededed;
+}
+table.list caption {
+ display: none;
+}
+table.list tbody tr:first-child td {
+ border-top: 1px solid #ededed;
+}
+table.list tbody tr:nth-child(2n) {
+ background-color: #fff;
+}
+table.list tbody tr td {
+ border-right: none;
+ border-left: none;
+}
+table.list tbody tr td.provider {
+ font-weight: bold;
+ font-size: 1.2em;
+}
+table.list tbody tr td.provider a {
+ padding-top: 0.41666666666667em;
+ padding-bottom: 0.33333333333333em;
+ display: inline-block;
+}
+table.list tbody tr td.soft {
+ color: #a1a1a1;
+}
+table.list tbody tr td.action {
+ text-align: right;
+ font-size: 1em;
+}
+table.list tbody tr.expanded {
+ background-color: #f6f6f6;
+}
+table.list tbody tr.expanded .provider {
+ font-size: 1.39130434782609em;
+ padding-top: 0.5em;
+ display: block;
+}
+table.list tbody tr.expanded p {
+ margin-top: 1.30434782608696em;
+ margin-bottom: 1.73913043478261em;
+}
+table.list tbody tr.expanded ul li {
+ margin-left: 1.30434782608696em;
+}
+table.list tbody tr.expanded ul li .item,
+table.list tbody tr.expanded ul li .status {
+ margin-right: 2.60869565217391em;
+}
+table.list tbody tr.expanded ul li .red {
+ color: #BA1212;
+}
+table.list tbody tr.expanded .form-actions {
+ font-size: 0.8695652173913em;
+ margin-top: 0.5em;
+ margin-bottom: 1.5em;
+}
+/* Page: TOTP setup */
+.totp ol li {
+ margin-bottom: 2.5em;
+ margin-left: 2.4em;
+ width: 100%;
+}
+.totp ol li p {
+ font-size: 1.3em;
+ margin-bottom: 1.53846153846154em;
+}
+.totp ol li p strong {
+ text-indent: -1em;
+ float: left;
+ font-size: 1.84615384615385em;
+ font-weight: normal;
+ margin-top: -0.375em;
+ color: #999;
+}
+.totp ol li img {
+ width: 136px;
+}
+.totp ol li .code {
+ font-size: 1.3em;
+ margin-left: 1.53846153846154em;
+ vertical-align: bottom;
+}
+.totp ol li:last-child {
+ margin-bottom: 0;
+}
+.totp ol li .form-actions {
+ margin-right: 2.4em;
+}
+.totp ol li .form-actions input[type="button"],
+.totp ol li .form-actions button,
+.totp ol li .form-actions a.button {
+ font-size: 1.1em;
+}
/* Break Points */
@media (max-width: 1200px) {
#container-right-bg {
@@ -229,11 +428,13 @@ td.token-cell button {
}
}
@media (max-width: 992px) {
- .bs-sidebar {
+ .bs-sidebar,
+ .user .bs-sidebar {
padding-top: 2em;
width: 100%;
}
- .bs-sidebar ul li a {
+ .bs-sidebar ul li a,
+ .user .bs-sidebar ul li a {
border-width: 1px;
}
#content-area .top-nav {
@@ -243,6 +444,9 @@ td.token-cell button {
margin-left: 0;
width: 750px;
}
+ .user #content-area #content {
+ border-top: 1px solid #cecece;
+ }
}
@media (max-width: 768px) {
.container {
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 409a44c..5fa386a 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
@@ -15,6 +15,121 @@ body {
font-family: @open-sans;
}
+.feedback-aligner {
+ top: 0.9em;
+}
+
+
+/* Header */
+
+.header.rcue .navbar.primary {
+
+ .navbar-inner {
+ min-height: 42px;
+ }
+
+ .nav > li {
+
+ .dropdown-label {
+ font-size: 0.84615384615385em;
+ color: #dbdada;
+ margin-left: 1.36363636363636em;
+ display: inline-block;
+ }
+
+ .dropdown {
+ display: inline-block;
+ margin-left: 0.53846153846154em;
+ margin-top: 0.46153846153846em;
+ min-width: 15.3846153846154em;
+ width: auto;
+
+ .dropdown-toggle {
+ font-size: 0.84615384615385em;
+ color: #fff;
+ display: inline-block;
+ line-height: 2.36363636363636em;
+ border: 1px solid #676c6e;
+ border-radius: 2px;
+ padding: 0 0.54545454545455em;
+ background: #555a5e url(img/sprite-arrow-down.svg) no-repeat right -26px;
+ display: block;
+
+ &:hover,
+ &:focus {
+ text-decoration: none;
+ }
+
+ &:hover {
+ border-color: #7e8385;
+ }
+ }
+
+ .dropdown-menu {
+
+ left: 0;
+ min-width: 0;
+ width: 100%;
+ overflow: hidden;
+
+ li,
+ li.selected {
+ width: auto;
+
+ a {
+ width: auto;
+ border-top: 1px solid transparent;
+ border-bottom: 1px solid transparent;
+
+ &:hover {
+ background-color: #D5ECF9;
+ background-image: none;
+ border-bottom: 1px solid #A7D7F1;
+ border-top: 1px solid #A7D7F1;
+ color: #4D5258;
+ }
+ }
+ }
+
+ li.selected a {
+ background-color: #2B99C0;
+ background-image: linear-gradient(top, #2EA1CA 0%, #2792B6 100%);
+ background-image: -o-linear-gradient(top, #2EA1CA 0%, #2792B6 100%);
+ background-image: -moz-linear-gradient(top, #2EA1CA 0%, #2792B6 100%);
+ background-image: -webkit-linear-gradient(top, #2EA1CA 0%, #2792B6 100%);
+ background-image: -ms-linear-gradient(top, #2EA1CA 0%, #2792B6 100%);
+ background-image: -webkit-gradient(
+ linear,
+ left top,
+ left bottom,
+ color-stop(0.0, #2EA1CA),
+ color-stop(1,0, #2792B6)
+ );
+ background-repeat: repeat-x;
+ color: #FFFFFF;
+ }
+ }
+
+ &.open .dropdown-toggle {
+ text-decoration: none;
+ box-shadow: inset 0px 2px 5px rgba(0,0,0,0.2);
+ border-color: #7e8385;
+ }
+ }
+ }
+
+ .button {
+ font-size: 0.84615384615385em;
+ margin-right: 1.36363636363636em;
+ margin-top: 0.63636363636364em;
+
+ &:focus {
+ text-decoration: none;
+ }
+ }
+}
+
+
.bs-sidebar {
background-color: @bg-grey;
padding-top: 4.3em;
@@ -256,6 +371,7 @@ table {
width: 30.8em;
padding-left: 1.5em;
padding-right: 1.5em;
+ padding-top: .5em;
background-color: #fff;
border: 1px solid #b6b6b6;
border-top: none;
@@ -287,6 +403,158 @@ td.token-cell button {
}
+/* Page: User Account */
+
+.user {
+
+ form fieldset div:first-child {
+ margin-top: 1em;
+ }
+
+ form fieldset p + div {
+ margin-top: 2.5em;
+ }
+
+ .bs-sidebar {
+ padding-top: 3.3em;
+ }
+
+ p.info {
+ font-size: 1.1em;
+ }
+}
+
+table.list {
+
+ border-left: none;
+ border-right: none;
+ margin-top: 1.5em;
+ border-color: #ededed;
+
+ caption {
+ display: none;
+ }
+
+ tbody tr {
+
+ &:first-child td {
+ border-top: 1px solid #ededed;
+ }
+
+ &:nth-child(2n) {
+ background-color: #fff;
+ }
+
+ td {
+ border-right: none;
+ border-left: none;
+
+ &.provider {
+ font-weight: bold;
+ font-size: 1.2em;
+
+ a {
+ padding-top: 0.41666666666667em;
+ padding-bottom: 0.33333333333333em;
+ display: inline-block;
+ }
+ }
+
+ &.soft {
+ color: #a1a1a1;
+ }
+
+ &.action {
+ text-align: right;
+ font-size: 1em;
+ }
+ }
+
+ &.expanded {
+
+ background-color: #f6f6f6;
+
+ .provider {
+ font-size: 1.39130434782609em;
+ padding-top: 0.5em;
+ display: block;
+ }
+
+ p {
+ margin-top: 1.30434782608696em;
+ margin-bottom: 1.73913043478261em;
+ }
+
+ ul li {
+ margin-left: 1.30434782608696em;
+
+ .item,
+ .status {
+ margin-right: 2.60869565217391em;
+ }
+
+ .red {
+ color: #BA1212;
+ }
+ }
+
+ .form-actions {
+ font-size: 0.8695652173913em;
+ margin-top: 0.5em;
+ margin-bottom: 1.5em;
+ }
+ }
+ }
+}
+
+/* Page: TOTP setup */
+
+.totp ol li {
+ margin-bottom: 2.5em;
+ margin-left: 2.4em;
+ width: 100%;
+
+ p {
+ font-size: 1.3em;
+ margin-bottom: 1.53846153846154em;
+
+ strong {
+ text-indent: -1em;
+ float: left;
+ font-size: 1.84615384615385em;
+ font-weight: normal;
+ margin-top: -0.375em;
+ color: #999;
+ }
+ }
+
+ img {
+ width: 136px;
+ }
+
+ .code {
+ font-size: 1.3em;
+ margin-left: 1.53846153846154em;
+ vertical-align: bottom;
+ }
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ .form-actions {
+ margin-right: 2.4em;
+
+ input[type="button"],
+ button,
+ a.button {
+ font-size: 1.1em;
+ }
+ }
+}
+
+
+
/* Break Points */
@media (max-width: 1200px) {
@@ -299,7 +567,8 @@ td.token-cell button {
@media (max-width: 992px) {
- .bs-sidebar {
+ .bs-sidebar,
+ .user .bs-sidebar {
padding-top: 2em;
width: 100%;
@@ -316,6 +585,10 @@ td.token-cell button {
margin-left: 0;
width: 750px;
}
+
+ .user #content-area #content {
+ border-top: 1px solid #cecece;
+ }
}
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 5f105e2..5394d3b 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
@@ -33,7 +33,6 @@ input[type="text"].error,
input[type="password"].error,
input[type="email"].error {
border-color: #ba1212;
- background-color: #f8e7e7;
transition: all 0.33s ease-in-out;
-moz-transition: all 0.33s ease-in-out;
-webkit-transition: all 0.33s ease-in-out;
@@ -143,7 +142,8 @@ a.button {
padding-bottom: 0;
line-height: 2.18181818181818em;
}
-button.primary {
+button.primary,
+.button.primary {
border-color: #21799e;
background-image: linear-gradient(top, #00a9ec 0%, #009bd3 100%);
background-image: -o-linear-gradient(top, #00a9ec 0%, #009bd3 100%);
@@ -154,14 +154,37 @@ button.primary {
color: #fff;
}
button.primary:hover,
-button.primary:focus {
+button.primary:focus,
+.button.primary:hover,
+.button.primary:focus {
background-color: #009BD3;
}
-button.primary:enabled:active {
+button.primary:enabled:active,
+.button.primary:enabled:active {
background-color: #0099d4;
box-shadow: inset 0 0 5px 3px #0074ae;
}
/* Code from Gabriel */
+button.primary,
+.button.primary {
+ background-color: #00a2df;
+}
+button.primary:hover,
+.button.primary:hover,
+button.primary:active,
+.button.primary:active,
+button.primary:focus,
+.button.primary:focus {
+ background-image: none;
+ color: #fff;
+}
+.rcue-login-register.register .two-fields input[type="text"] {
+ width: 121px;
+ min-width: 0;
+}
+.rcue-login-register.register .two-fields input + input {
+ margin-left: 10px;
+}
.search-comp {
position: relative;
display: inline-block;
@@ -187,6 +210,23 @@ button.primary:enabled:active {
width: 20em;
font-weight: normal;
}
+.feedback-aligner {
+ position: absolute;
+ top: 1.5em;
+ text-align: center;
+ width: 100%;
+ height: 0;
+ z-index: 100;
+}
+.feedback-aligner .feedback {
+ position: relative;
+ display: inline-block;
+ text-align: left;
+ border-width: 1px;
+}
+.feedback-aligner .feedback p {
+ border-width: 1px;
+}
.feedback {
position: absolute;
opacity: 0;
@@ -194,30 +234,49 @@ button.primary:enabled:active {
-moz-transition: opacity 0.33s ease-in-out;
-webkit-transition: opacity 0.33s ease-in-out;
}
+.feedback p {
+ padding: 0.90909090909091em 3.63636363636364em;
+ border-style: solid;
+ border-width: 1px 1px 0px 1px;
+ background-repeat: no-repeat;
+ background-position: 1.27272727272727em center;
+ font-size: 1.1em;
+ line-height: 1.4em;
+ border-radius: 2px;
+ color: #4d5258;
+ margin-bottom: 0;
+}
.feedback.show {
opacity: 1;
}
-.feedback.error {
- background-image: url(img/feedback-error-arrow-down.svg);
+.feedback.bottom-left {
background-position: left bottom;
background-repeat: no-repeat;
padding-bottom: 1em;
}
+.feedback.bottom-left p {
+ background-position: 1.27272727272727em 1.63636363636364em;
+}
+.feedback.error {
+ background-image: url(img/feedback-error-arrow-down.svg);
+}
.feedback.error p {
border-color: #b91415;
background-image: url(img/feedback-error-sign.svg);
background-color: #f8e7e7;
- color: #4d5258;
}
-.feedback p {
- padding: 1em 3.63636363636364em;
- border-style: solid;
- border-width: 1px 1px 0px 1px;
- background-repeat: no-repeat;
- background-position: 1.27272727272727em 1.63636363636364em;
- font-size: 1.1em;
- line-height: 1.27272727272727em;
- border-radius: 2px;
+.feedback.success {
+ background-image: url(img/feedback-success-arrow-down.svg);
+}
+.feedback.success p {
+ border-color: #4b9e39;
+ background-image: url(img/feedback-success-sign.svg);
+ background-color: #e4f1e1;
+}
+.feedback.warning p {
+ border-color: #f17528;
+ background-image: url(img/feedback-warning-sign.svg);
+ background-color: #fef1e9;
}
button,
a.button {
@@ -240,6 +299,20 @@ button[class^="icon-"] {
button[class^="icon-"]:hover {
background-image: url(img/sprites.png);
}
+button.link {
+ border: none;
+ background-color: transparent;
+ background: none;
+ box-shadow: none;
+ font-weight: normal;
+ font-size: 1em;
+ color: #0099D3;
+ letter-spacing: 0;
+ padding: 0;
+}
+button.link:hover {
+ text-decoration: underline;
+}
legend {
font-size: 1em;
border-width: 1px 0 0 0;
@@ -266,6 +339,12 @@ legend .icon-info {
legend .icon-info:hover {
background-image: url(img/sprites.png);
}
+fieldset.border-top {
+ border-width: 1px 0 0 0;
+ border-style: solid;
+ border-color: #e9e8e8;
+ padding-top: 2em;
+}
.form-group {
display: block;
margin-bottom: 1em;
@@ -295,14 +374,15 @@ legend .icon-info:hover {
margin-top: 4px;
}
.form-group .required {
- position: absolute;
- left: 10em;
font-size: 1.1em;
color: #CB2915;
}
legend + .form-group {
padding-top: 1em;
}
+legend + table {
+ margin-top: 1em;
+}
.code {
font-family: Courier, monospace;
}
@@ -437,6 +517,11 @@ input[type="email"].tiny {
.select-rcue option:hover {
background-color: #d5ecf9;
}
+.select2-container {
+ float: left;
+ margin-top: 0.3em;
+ margin-bottom: 0.3em;
+}
.select2-container .select2-choice > .select2-chosen {
line-height: 2.1em;
padding-left: 0.90909090909091em;
@@ -448,13 +533,18 @@ input[type="email"].tiny {
.select2-container .select2-choice .select2-arrow {
display: none;
}
+.select2-dropdown-open {
+ background-color: #fff;
+}
.select2-dropdown-open .select2-choice,
.select2-dropdown-open .select2-choices {
- background-image: url(img/chosen-arrow-down.png), -moz-linear-gradient(center top, #eeeeee 0%, #ffffff 50%);
border-bottom: none;
border-radius: 2px 2px 0 0;
+ background-image: url(img/chosen-arrow-down.png);
+ background-color: transparent;
background-repeat: no-repeat;
background-position: right top;
+ box-shadow: none;
}
.select2-dropdown-open .select2-choice,
.select2-dropdown-open.select2-drop-above .select2-choice,
@@ -467,24 +557,53 @@ input[type="email"].tiny {
}
.select2-drop-active {
border-radius: 0 0 2px 2px;
- margin-top: -3px;
- padding-top: 3px;
+ margin-top: -1px;
+ padding-top: 4px;
}
.select2-container.select2-drop-above .select2-choice {
border-radius: 0 0 2px 2px;
- background-image: url(img/chosen-arrow-up.png), -moz-linear-gradient(center top, #eeeeee 0%, #ffffff 50%);
+ background-image: url(img/chosen-arrow-up.png);
background-repeat: no-repeat;
- background-position: right -1px;
+ background-position: right 0;
+ box-shadow: none;
}
.select2-drop.select2-drop-above {
border-radius: 2px 2px 0 0;
padding-top: 0;
- margin-top: 0;
+ margin-top: 2px;
}
.select2-drop.select2-drop-above.select2-drop-active,
.select2-drop-active {
border-color: #62AFDB;
}
+.select2-results {
+ padding-left: 0;
+ margin-right: 0;
+}
+.select2-results li {
+ border-top: 1px solid transparent;
+ border-bottom: 1px solid transparent;
+}
+.select2-results .select2-result-label,
+.select2-results .select2-no-results,
+.select2-results .select2-searching,
+.select2-results .select2-selection-limit {
+ font-size: 1.1em;
+ padding-left: 1.09090909090909em;
+}
+.select2-results .select2-no-results,
+.select2-results .select2-searching,
+.select2-results .select2-selection-limit {
+ color: #838383;
+ padding-top: 3px;
+ padding-bottom: 4px;
+}
+.select2-results .select2-highlighted {
+ background-color: #d5ecf9;
+ border-top: 1px solid #a7d7f1;
+ border-bottom: 1px solid #a7d7f1;
+ color: #4d5258;
+}
.input-group input + .select-rcue {
border-radius: 0 2px 2px 0;
border-left: 0;
@@ -543,6 +662,7 @@ input[type="email"].tiny {
margin: 0.272727272727273em 0;
box-shadow: none;
outline: 0 none;
+ float: left;
}
.tokenfield.form-control:hover {
border-color: #62afdb;
@@ -552,7 +672,7 @@ input[type="email"].tiny {
box-shadow: #62afdb 0 0 5px;
}
.token {
- display: inline-block;
+ float: left;
background-color: #d4ecf8;
border: 1px solid #a3d7f0;
border-radius: 1px;
@@ -563,12 +683,12 @@ input[type="email"].tiny {
outline: 0 none;
}
.token span {
- display: inline-block;
+ float: left;
font-size: 1.1em;
line-height: 1.45454545454545em;
}
.token .close {
- text-indent: -99999em;
+ text-indent: -9999999em;
width: 1.6em;
height: 1.6em;
line-height: 1.6em;
@@ -586,5 +706,9 @@ input[type="email"].tiny {
}
.form-actions .primary {
float: right;
- margin-left: 8px;
+ margin-left: 0.90909090909091em;
+}
+.form-actions a {
+ font-size: 1.1em;
+ margin-right: 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 dfc353d..516dd6f 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
@@ -35,7 +35,6 @@ input[type="email"],
&.error {
border-color: #ba1212;
- background-color: #f8e7e7;
transition: all .33s ease-in-out;
-moz-transition: all .33s ease-in-out;
-webkit-transition: all .33s ease-in-out;
@@ -150,7 +149,8 @@ a.button {
line-height: 2.18181818181818em;
}
-button.primary {
+button.primary,
+.button.primary {
border-color: #21799e;
background-image: linear-gradient(top, #00A9EC 0%, #009BD3 100%);
background-image: -o-linear-gradient(top, #00A9EC 0%, #009BD3 100%);
@@ -168,11 +168,14 @@ button.primary {
}
button.primary:hover,
-button.primary:focus {
+button.primary:focus,
+.button.primary:hover,
+.button.primary:focus {
background-color: #009BD3;
}
-button.primary:enabled:active {
+button.primary:enabled:active,
+.button.primary:enabled:active {
background-color: #0099d4;
box-shadow: inset 0 0 5px 3px #0074ae;
}
@@ -180,6 +183,30 @@ button.primary:enabled:active {
/* Code from Gabriel */
+button.primary,
+.button.primary {
+ background-color: #00a2df;
+
+ &:hover,
+ &:active,
+ &:focus {
+ background-image: none;
+ color: #fff;
+ }
+}
+
+.rcue-login-register.register .two-fields {
+
+ input[type="text"] {
+ width: 121px;
+ min-width: 0;
+ }
+
+ input + input {
+ margin-left: 10px;
+ }
+}
+
.search-comp {
position: relative;
display: inline-block;
@@ -210,40 +237,88 @@ button.primary:enabled:active {
}
}
+.feedback-aligner {
+ position: absolute;
+ top: 1.5em;
+ text-align: center;
+ width: 100%;
+ height: 0;
+ z-index: 100;
+
+ .feedback {
+ position: relative;
+ display: inline-block;
+ text-align: left;
+ border-width: 1px;
+
+ p {
+ border-width: 1px;
+ }
+ }
+}
+
.feedback {
position: absolute;
opacity: 0;
transition: opacity .33s ease-in-out;
-moz-transition: opacity .33s ease-in-out;
-webkit-transition: opacity .33s ease-in-out;
+
+ p {
+ padding: 0.90909090909091em 3.63636363636364em;
+ border-style: solid;
+ border-width: 1px 1px 0px 1px;
+ background-repeat: no-repeat;
+ background-position: 1.27272727272727em center;
+ font-size: 1.1em;
+ line-height: 1.4em;
+ border-radius: 2px;
+ color: #4d5258;
+ margin-bottom: 0;
+ }
&.show {
opacity: 1;
}
-
- &.error {
- background-image: url(img/feedback-error-arrow-down.svg);
+
+ &.bottom-left {
background-position: left bottom;
background-repeat: no-repeat;
padding-bottom: 1em;
p {
+ background-position: 1.27272727272727em 1.63636363636364em;
+ }
+ }
+
+ &.error {
+ background-image: url(img/feedback-error-arrow-down.svg);
+
+ p {
border-color: #b91415;
background-image: url(img/feedback-error-sign.svg);
background-color: #f8e7e7;
- color: #4d5258;
}
}
- p {
- padding: 1em 3.63636363636364em;
- border-style: solid;
- border-width: 1px 1px 0px 1px;
- background-repeat: no-repeat;
- background-position: 1.27272727272727em 1.63636363636364em;
- font-size: 1.1em;
- line-height: 1.27272727272727em;
- border-radius: 2px;
+ &.success {
+ background-image: url(img/feedback-success-arrow-down.svg);
+
+ p {
+ border-color: #4b9e39;
+ background-image: url(img/feedback-success-sign.svg);
+ background-color: #e4f1e1;
+ }
+ }
+
+ &.warning {
+
+ p {
+ border-color: #f17528;
+ background-image: url(img/feedback-warning-sign.svg);
+ background-color: #fef1e9;
+ }
+
}
}
@@ -273,6 +348,22 @@ button[class^="icon-"] {
}
}
+button.link {
+ border: none;
+ background-color: transparent;
+ background: none;
+ box-shadow: none;
+ font-weight: normal;
+ font-size: 1em;
+ color: #0099D3;
+ letter-spacing: 0;
+ padding: 0;
+
+ &:hover {
+ text-decoration: underline;
+ }
+}
+
legend {
font-size: 1em;
border-width: 1px 0 0 0;
@@ -304,6 +395,13 @@ legend {
}
}
+fieldset.border-top {
+ border-width: 1px 0 0 0;
+ border-style: solid;
+ border-color: #e9e8e8;
+ padding-top: 2em;
+}
+
.form-group {
display: block;
margin-bottom: 1em;
@@ -338,8 +436,6 @@ legend {
}
.required {
- position: absolute;
- left: 10em;
font-size: 1.1em;
color: #CB2915;
}
@@ -349,6 +445,10 @@ legend + .form-group {
padding-top: 1em;
}
+legend + table {
+ margin-top: 1em;
+}
+
.code {
font-family: Courier, monospace;
}
@@ -521,32 +621,42 @@ input[type="email"] {
}
}
-.select2-container .select2-choice {
+.select2-container {
+ float: left;
+ margin-top: 0.3em;
+ margin-bottom: 0.3em;
- &> .select2-chosen {
- line-height: 2.1em;
- padding-left: 0.90909090909091em;
- margin-right: 0;
- font-size: 1.1em;
- padding-right: 2.36363636363636em;
- padding-right: 26px;
- }
+ .select2-choice {
- .select2-arrow {
- display: none;
+ &> .select2-chosen {
+ line-height: 2.1em;
+ padding-left: 0.90909090909091em;
+ margin-right: 0;
+ font-size: 1.1em;
+ padding-right: 2.36363636363636em;
+ padding-right: 26px;
+ }
+
+ .select2-arrow {
+ display: none;
+ }
}
}
.select2-dropdown-open {
-
+
.select2-choice,
.select2-choices {
- background-image: url(img/chosen-arrow-down.png), -moz-linear-gradient(center top , #eee 0%, #fff 50%);
border-bottom: none;
border-radius: 2px 2px 0 0;
+ background-image: url(img/chosen-arrow-down.png);
+ background-color: transparent;
background-repeat: no-repeat;
background-position: right top;
+ box-shadow: none;
}
+
+ background-color: #fff;
}
.select2-dropdown-open,
@@ -564,21 +674,22 @@ input[type="email"] {
.select2-drop-active {
border-radius: 0 0 2px 2px;
- margin-top: -3px;
- padding-top: 3px;
+ margin-top: -1px;
+ padding-top: 4px;
}
.select2-container.select2-drop-above .select2-choice {
border-radius: 0 0 2px 2px;
- background-image: url(img/chosen-arrow-up.png), -moz-linear-gradient(center top , #eee 0%, #fff 50%);
+ background-image: url(img/chosen-arrow-up.png);
background-repeat: no-repeat;
- background-position: right -1px;
+ background-position: right 0;
+ box-shadow: none;
}
.select2-drop.select2-drop-above {
border-radius: 2px 2px 0 0;
padding-top: 0;
- margin-top: 0;
+ margin-top: 2px;
}
.select2-drop.select2-drop-above.select2-drop-active,
@@ -586,6 +697,39 @@ input[type="email"] {
border-color: #62AFDB;
}
+.select2-results {
+ padding-left: 0;
+ margin-right: 0;
+
+ li {
+ border-top: 1px solid transparent;
+ border-bottom: 1px solid transparent;
+ }
+
+ .select2-result-label,
+ .select2-no-results,
+ .select2-searching,
+ .select2-selection-limit {
+ font-size: 1.1em;
+ padding-left: 1.09090909090909em;
+ }
+
+ .select2-no-results,
+ .select2-searching,
+ .select2-selection-limit {
+ color: #838383;
+ padding-top: 3px;
+ padding-bottom: 4px;
+ }
+
+ .select2-highlighted {
+ background-color: #d5ecf9;
+ border-top: 1px solid #a7d7f1;
+ border-bottom: 1px solid #a7d7f1;
+ color: #4d5258;
+ }
+}
+
.input-group input + .select-rcue {
border-radius: 0 2px 2px 0;
border-left: 0;
@@ -649,6 +793,7 @@ input[type="email"] {
margin: 0.272727272727273em 0;
box-shadow: none;
outline: 0 none;
+ float: left;
}
&:hover {
@@ -662,7 +807,7 @@ input[type="email"] {
}
.token {
- display: inline-block;
+ float: left;
background-color: #d4ecf8;
border: 1px solid #a3d7f0;
border-radius: 1px;
@@ -673,13 +818,13 @@ input[type="email"] {
outline: 0 none;
span {
- display: inline-block;
+ float: left;
font-size: 1.1em;
line-height: 1.45454545454545em;
}
.close {
- text-indent: -99999em;
+ text-indent: -9999999em;
width: 1.6em;
height: 1.6em;
line-height: 1.6em;
@@ -699,6 +844,12 @@ input[type="email"] {
.primary {
float: right;
- margin-left: 8px;
+ margin-left: 0.90909090909091em;
}
+
+ a {
+ font-size: 1.1em;
+ margin-right: 0.90909090909091em;
+ }
+
}
\ No newline at end of file
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/img/sprite-arrow-down.png b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/img/sprite-arrow-down.png
new file mode 100644
index 0000000..fb65819
Binary files /dev/null and b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/img/sprite-arrow-down.png differ
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/img/sprite-arrow-down.svg b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/img/sprite-arrow-down.svg
new file mode 100644
index 0000000..87c4cda
--- /dev/null
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/img/sprite-arrow-down.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="22px" height="52px" viewBox="0 0 22 52" enable-background="new 0 0 22 52" xml:space="preserve">
+<polygon fill="#828487" points="11,16 6.818,11.818 7.525,11.111 11,14.586 14.475,11.111 15.182,11.818 "/>
+<polygon fill="#DBDADA" points="11,42 6.818,37.818 7.525,37.111 11,40.586 14.475,37.111 15.182,37.818 "/>
+</svg>
