Skip to content

Commit

Permalink
UI-2423: fix glitches with 2 column control
Browse files Browse the repository at this point in the history
  • Loading branch information
JRMaitre committed Oct 11, 2016
1 parent 1238912 commit 46a343f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 15 deletions.
1 change: 0 additions & 1 deletion submodules/devices/devices.css
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,6 @@

.voip-edit-device-popup .edit-device .content .codec-selector .box-selector:first-child {
margin-left: 40px;
margin-right: 40px;
}
.voip-edit-device-popup .edit-device .content .codec-selector .box-selector ul {
height: 327px;
Expand Down
28 changes: 14 additions & 14 deletions views/groups-creation.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@
</form>

<div class="items-selector clearfix" id="group_user_selector">
<div class="box-selector">
<div class="box-title">{{ i18n.groups.dialogCreationGroup.availableUsers }}</div>
<ul class="available-users connectedSortable">
{{#each extra.listUsers}}
<li class="item-selector" data-user_id="{{this.id}}"><div class="item-handle"></div>{{ this.first_name }} {{ this.last_name }}</li>
{{/each}}
</ul>
</div>
<div class="box-selector">
<div class="box-title">{{ i18n.groups.dialogCreationGroup.availableUsers }}</div>
<ul class="available-users box-content connectedSortable">
{{#each extra.listUsers}}
<li class="item-selector" data-user_id="{{this.id}}"><div class="item-handle"></div>{{ this.first_name }} {{ this.last_name }}</li>
{{/each}}
</ul>
</div>

<div class="box-selector">
<div class="box-title">{{ i18n.groups.dialogCreationGroup.selectedUsers }}</div>
<ul class="selected-users connectedSortable">
</ul>
</div>
</div>
<div class="box-selector">
<div class="box-title">{{ i18n.groups.dialogCreationGroup.selectedUsers }}</div>
<ul class="selected-users box-content connectedSortable">
</ul>
</div>
</div>

<div class="dialog-buttons-wrapper">
<button id="create_group" class="monster-button monster-button-success">{{ i18n.groups.dialogCreationGroup.createGroup }}</button>
Expand Down

0 comments on commit 46a343f

Please sign in to comment.