Compare Save Dialog, simplify

owncloud · Sep 8, 2022 · 4aad05a · 4aad05a
1 parent 24bf6d3
commit 4aad05a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 35 deletions.
diff --git a/packages/web-app-user-management/src/components/Groups/SideBar/EditPanel.vue b/packages/web-app-user-management/src/components/Groups/SideBar/EditPanel.vue
@@ -13,15 +13,15 @@
         :fix-message-line="true"
         @input="validateDisplayName"
       />
+      <compare-save-dialog
+        class="edit-compare-save-dialog oc-mb-l"
+        :original-object="group"
+        :compare-object="editGroup"
+        :confirm-button-disabled="invalidFormData"
+        @revert="revertChanges"
+        @confirm="$emit('confirm', editGroup)"
+      ></compare-save-dialog>
     </div>
-    <compare-save-dialog
-      class="edit-compare-save-dialog oc-pb-l oc-pt-s oc-px-m"
-      :original-object="group"
-      :compare-object="editGroup"
-      :confirm-button-disabled="invalidFormData"
-      @revert="revertChanges"
-      @confirm="$emit('confirm', editGroup)"
-    ></compare-save-dialog>
   </div>
 </template>
 <script>

diff --git a/packages/web-app-user-management/src/components/Users/SideBar/EditPanel.vue b/packages/web-app-user-management/src/components/Users/SideBar/EditPanel.vue
@@ -40,6 +40,7 @@
         </div>
         <quota-select
           v-if="showQuota"
+          class="oc-mb-s"
           :key="'quota-select-' + user.id"
           :title="$gettext('Personal quota')"
           :total-quota="editUser.drive.quota.total || 0"
@@ -49,15 +50,15 @@
           To set an individual quota, the user needs to have logged in once.
         </p>
       </div>
+      <compare-save-dialog
+        class="edit-compare-save-dialog oc-mb-l"
+        :original-object="user"
+        :compare-object="editUser"
+        :confirm-button-disabled="invalidFormData"
+        @revert="revertChanges"
+        @confirm="$emit('confirm', editUser)"
+      ></compare-save-dialog>
     </div>
-    <compare-save-dialog
-      class="edit-compare-save-dialog oc-pb-l oc-pt-s oc-px-m"
-      :original-object="user"
-      :compare-object="editUser"
-      :confirm-button-disabled="invalidFormData"
-      @revert="revertChanges"
-      @confirm="$emit('confirm', editUser)"
-    ></compare-save-dialog>
   </div>
 </template>
 <script>
@@ -160,12 +161,7 @@ export default {
 <style lang="scss">
 #user-edit-panel {
   #user-edit-form {
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-  }
-  .edit-compare-save-dialog {
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
+    border-radius: 5px;
   }
 }
 </style>
diff --git a/packages/web-app-user-management/src/components/Users/SideBar/GroupAssignmentsPanel.vue b/packages/web-app-user-management/src/components/Users/SideBar/GroupAssignmentsPanel.vue
@@ -3,6 +3,7 @@
     <UserInfoBox :user="user" />
     <div id="user-group-assignment-form" class="oc-background-highlight oc-p-m">
       <oc-select
+        class="oc-mb-s"
         v-model="editUser.memberOf"
         multiple
         :options="groups"
@@ -35,14 +36,14 @@
           </div>
         </template>
       </oc-select>
+      <compare-save-dialog
+        class="edit-compare-save-dialog oc-mb-l"
+        :original-object="user"
+        :compare-object="editUser"
+        @revert="revertChanges"
+        @confirm="$emit('confirm', editUser)"
+      ></compare-save-dialog>
     </div>
-    <compare-save-dialog
-      class="edit-compare-save-dialog oc-pb-l oc-pt-s oc-px-m"
-      :original-object="user"
-      :compare-object="editUser"
-      @revert="revertChanges"
-      @confirm="$emit('confirm', editUser)"
-    ></compare-save-dialog>
   </div>
 </template>
 <script>
@@ -90,12 +91,7 @@ export default {
 <style lang="scss">
 #user-group-assignment-panel {
   #user-group-assignment-form {
-    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-  }
-  .edit-compare-save-dialog {
-    border-bottom-left-radius: 5px;
-    border-bottom-right-radius: 5px;
+    border-radius: 5px;
   }
 }
 </style>