libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge branch 'master' of https://github.com/cardosogabriel/keycloak into cardosogabriel-master

Browse source 
Conflicts:
	forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
This commit is contained in:
Stian Thorgersen 2013-12-11 14:47:18 +00:00
commit a144ab07f2
11 changed files with 64 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
View file

@ -143,90 +143,6 @@ body {
min-height: 42px;
max-width: 1170px;
}
.header.rcue .navbar.primary .nav > li {
/*
.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;
}
}
*/
}
.header.rcue .navbar.primary .nav > li .dropdown-label {
font-size: 0.84615384615385em;
color: #dbdada;
@ -402,7 +318,8 @@ body {
display: inline-table;
width: 20em;
}
#content-area #content .input-group input[type="text"] {
#content-area #content .input-group input[type="text"],
#content-area #content .input-group input[type="number"] {
border-radius: 2px 0 0 2px;
}
#content-area #content .input-group button {
@ -417,6 +334,9 @@ body {
display: inline-block;
margin-top: 1.36363636363636em;
}
#content-area #content .form-group > label + span {
margin-top: 0;
}
.tooltip {
font-family: "Open Sans", sans-serif;
font-size: 1.1em;

89
admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
View file

@ -252,88 +252,6 @@ body {
.tooltip {
font-size: 0.84615384615385em;
}
/*
.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 {
@ -473,7 +391,8 @@ body {
display: inline-table;
width: 20em;
input[type="text"] {
input[type="text"],
input[type="number"] {
border-radius: 2px 0 0 2px;
}
@ -492,6 +411,10 @@ body {
display: inline-block;
margin-top: 1.36363636363636em;
}
.form-group > label + span {
margin-top: 0;
}
}
}

13
admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
View file

@ -315,6 +315,19 @@ button.primary:focus,
width: 20em;
font-weight: normal;
}
.search-comp + span {
font-size: 1.1em;
font-weight: normal;
color: #A1A1A1;
}
.search-comp + span span {
margin-left: 0.45454545454545em;
margin-right: 0.45454545454545em;
display: inline-block;
}
.search-comp + span .link {
font-size: 0.90909090909091em;
}
.feedback-aligner {
position: fixed;
top: 1.5em;

16
admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
View file

@ -323,6 +323,22 @@ button.primary,
font-weight: normal;
}
}
&+ span {
font-size: 1.1em;
font-weight: normal;
color: #A1A1A1;
span {
margin-left: 0.45454545454545em;
margin-right: 0.45454545454545em;
display: inline-block;
}
.link {
font-size: 0.90909090909091em;
}
}
}
.feedback-aligner {

6
admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/tables.css
View file

@ -24,9 +24,11 @@ table thead tr th {
padding: 1px;
border-top: none;
}
/*
.rcue-table-actions span:last-child {
float: right;
}
*/
.rcue-table-actions {
padding: 1px;
}
@ -62,6 +64,10 @@ table tbody tr td:first-child {
table thead tr th:last-child {
border-right: none;
}
table thead tr th button,
table thead tr th .button {
margin-left: 0.72727272727273em;
}
table tbody tr:first-child td {
border-top: 1px solid #f2f2f2;
/* padding-top: 9px; */

7
admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/tables.less
View file

@ -31,9 +31,11 @@ table thead tr th {
border-top: none;
}
/*
.rcue-table-actions span:last-child {
float: right;
}
*/
.rcue-table-actions {
padding: 1px;
@ -82,6 +84,11 @@ table thead tr th:last-child {
border-right: none;
}
table thead tr th button,
table thead tr th .button {
margin-left: 0.72727272727273em;
}
table tbody tr:first-child td {
border-top: 1px solid #f2f2f2;
/* padding-top: 9px; */

2
admin-ui/src/main/resources/META-INF/resources/admin/js/app.js
View file

@ -648,7 +648,7 @@ module.directive('kcSave', function ($compile, Notifications) {
form.find('.ng-valid').removeClass('error');
$scope['save']();
} else {
Notifications.error("Missing or invalid field")
Notifications.error("Missing or invalid field(s). Please verify the fields in red.")
form.find('.ng-invalid').addClass('error');
form.find('.ng-valid').removeClass('error');
}

2
admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-list.html
View file

@ -24,7 +24,7 @@
<input type="text" placeholder="Search..." class="search"
onkeyup="if(event.keyCode == 13){$(this).next('button').click();}">
<button class="icon-search" tooltip-placement="right"
tooltip="Search by oauth client name.">
tooltip="Search by oauth client name">
Icon: search
</button>
</div>

2
admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html
View file

@ -27,8 +27,8 @@
Icon: search
</button>
</div>
<span><span>or</span><button class="link" ng-click="search = null; searchQuery()">View all users</button></span>
<div class="actions">
<button ng-click="search = null; searchQuery()">View all</button>
<a class="button" href="#/create/user/{{realm.id}}">Add User</a>
</div>
</th>

8
forms/src/main/resources/META-INF/resources/forms/theme/default/css/login-register.css
View file

@ -133,6 +133,7 @@ body {
.rcue-login-register form > input[type="submit"]{
float: right;
margin-top: 0.76923076923077em;
margin-left: 0.90909090909091em;
/* 10px */
}
@ -393,6 +394,13 @@ a.zocial:before {
.rcue-login-register.totp ol li form {
width: 357px;
}
.rcue-login-register.totp ol li form input[type="text"] {
width: 22em;
}
.rcue-login-register.totp ol li form input[type="submit"] {
float: right;
}
.rcue-login-register.totp ol li:last-child {
margin-bottom: 0;
}

3
forms/src/main/resources/META-INF/resources/forms/theme/default/login-update-profile.ftl
View file

@ -30,9 +30,6 @@
<label for="lastName">${rb.getString('lastName')}</label><input type="text" id="lastName" name="lastName" value="${user.lastName!''}" />
</div>
<div class="aside-btn">
</div>
<input class="btn-primary" type="submit" value="Submit" />
</form>
</div>