Group Manager Design fixes

This commit is contained in:
Zacharie
2020-06-23 12:48:15 +02:00
parent 380129c051
commit d1601ede5f
3 changed files with 23 additions and 8 deletions
+2 -1
View File
@@ -168,8 +168,9 @@ var setupGroupBox = function (groupBox) {
});
/* Set the rename action */
groupBox.find(".Group-name .icon-pencil").on("click", function () {
groupBox.find(".Group-name .icon-pencil, #GroupEdit").on("click", function () {
displayRenameForm(true, id);
setTimeout(() => {groupBox.find("#GroupOptions").hide()}, 10)
});
groupBox.find(".group-rename .validate").on("click", function () {
+6 -5
View File
@@ -55,9 +55,10 @@ var rootUrl = '{$ROOT_URL}'
<div class="icon-ellipsis-vert group-dropdown-options not-in-selection-mode">
<div id="GroupOptions">
<option class="icon-docs group-dropdown-option" id="GroupDuplicate" value="duplicate">{'Duplicate'|@translate}</option>
<option class="icon-trash group-dropdown-option" id="GroupDelete" value="delete">{'Delete'|@translate}</option>
<option class="icon-star group-dropdown-option" id="GroupDefault" value="delete"></option>
<option class="icon-pencil group-dropdown-option" id="GroupEdit">{'Edit'|@translate}</option>
<option class="icon-docs group-dropdown-option" id="GroupDuplicate">{'Duplicate'|@translate}</option>
<option class="icon-trash group-dropdown-option" id="GroupDelete">{'Delete'|@translate}</option>
<option class="icon-star group-dropdown-option" id="GroupDefault"></option>
</div>
</div>
@@ -93,7 +94,7 @@ var rootUrl = '{$ROOT_URL}'
<div class="titrePage">
<h2>{'Group management'|@translate}</h2>
<h2>{'Group manager'|@translate}</h2>
</div>
<div class="selection-mode-group-manager">
@@ -116,7 +117,7 @@ var rootUrl = '{$ROOT_URL}'
</div>
</div>
<button id="MergeSelectionMode" class="icon-object-group unavailable">{'Merge'|@translate}</button>
<button id="MergeSelectionMode" class="icon-object-group unavailable" title="{'At least 2 selected groups are needed to merge'|@translate}">{'Merge'|@translate}</button>
<button id="DeleteSelectionMode" class="icon-trash-1 unavailable">{'Delete'|@translate}</button>
</div>
+15 -2
View File
@@ -2580,6 +2580,19 @@ input:checked + .slider:before {
content: "";
position: absolute;
display: none;
animation: checkmark-appear 0.3s ease;
}
@keyframes checkmark-appear {
0% {
transform: rotate(45deg) scale(0);
}
75% {
transform: rotate(45deg) scale(1.5);
}
100% {
transform: rotate(45deg);
}
}
.groups .Group-checkbox input:checked ~ .group-checkmark:after {
@@ -2784,7 +2797,7 @@ input:checked + .slider:before {
#UserList .group-name-block .UserNumberBadge{
padding:3px 9px;
border-radius:8px;
border-radius:15px;
background-color: rgb(44,132,195);
color: #CDE9FD;
font-size:10px;
@@ -2828,7 +2841,7 @@ input:checked + .slider:before {
#UserList .AddUserBlock button{
font-size: 12px;
font-weight: 700;
padding: 13px 10px;
padding: 12px 10px;
border: none;
}