Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bill Burke 2014-05-23 18:22:34 -04:00
commit 81083ef470
3 changed files with 8 additions and 4 deletions

View file

@ -54,7 +54,7 @@
</div>
</div>
<div class="select-title">
<label class="control-label" for="realm-composite">Composite Scope Mappings</label>
<label class="control-label" for="realm-composite">Effective Roles</label>
<select id="realm-composite" class="form-control" multiple size=5
ng-disabled="true"
ng-model="dummymodel"
@ -109,7 +109,7 @@
-
</div>
<div class="select-title">
<label class="control-label" for="app-composite">Composite Role Mappings</label>
<label class="control-label" for="app-composite">Effective Roles</label>
<select id="app-composite" class="form-control" multiple size=5
ng-disabled="true"
ng-model="dummymodel"

View file

@ -49,7 +49,7 @@
-
</div>
<div class="select-title">
<label class="control-label" for="realm-composite">Composite Role Mappings</label>
<label class="control-label" for="realm-composite">Effective Roles</label>
<select id="realm-composite" class="form-control" multiple size=5
ng-disabled="true"
ng-model="dummymodel"
@ -104,7 +104,7 @@
-
</div>
<div class="select-title">
<label class="control-label" for="app-composite">Composite Role Mappings</label>
<label class="control-label" for="app-composite">Effective Roles</label>
<select id="app-composite" class="form-control" multiple size=5
ng-disabled="true"
ng-model="dummymodel"

View file

@ -642,6 +642,10 @@ legend .kc-icon-collapse {
/* Left-Rigth selector form */
.changing-selectors .select-title label {
text-align: left;
}
.changing-selectors .select-title {
display: inline-block;
}