[PM-1914] Migrate all dialogs to use the new bitDialogFooter default styling (#5256)

apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html

@@ -65,7 +65,7 @@
         </bit-tab>
       </bit-tab-group>
     </div>
-    <div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2">
+    <ng-container bitDialogFooter>
       <button bitButton buttonType="primary" bitFormButton type="submit">
         {{ "save" | i18n }}
       </button>
@@ -87,6 +87,6 @@
         [bitAction]="delete"
         [appA11yTitle]="'delete' | i18n"
       ></button>
-    </div>
+    </ng-container>
   </bit-dialog>
 </form>

apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html

@@ -325,7 +325,7 @@
         ></bit-tab>
       </bit-tab-group>
     </div>
-    <div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2">
+    <ng-container bitDialogFooter>
       <button type="submit" bitButton bitFormButton buttonType="primary" [disabled]="loading">
         {{ "save" | i18n }}
       </button>
@@ -373,6 +373,6 @@
           [disabled]="loading"
         ></button>
       </div>
-    </div>
+    </ng-container>
   </bit-dialog>
 </form>

apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.stories.ts

@@ -149,7 +149,7 @@ const DialogAccessSelectorTemplate: Story<AccessSelectorComponent> = (
           [showMemberRoles]="showMemberRoles"
         ></bit-access-selector>
       </span>
-      <div bitDialogFooter class="tw-flex tw-items-center tw-flex-row tw-gap-2">
+      <ng-container bitDialogFooter>
         <button bitButton buttonType="primary">Save</button>
         <button bitButton buttonType="secondary">Cancel</button>
         <button
@@ -159,7 +159,7 @@ const DialogAccessSelectorTemplate: Story<AccessSelectorComponent> = (
           size="default"
           title="Delete"
           aria-label="Delete"></button>
-      </div>
+      </ng-container>
     </bit-dialog>
 `,
 });

apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.html

@@ -73,7 +73,7 @@
         </bit-tab>
       </bit-tab-group>
     </div>
-    <div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2">
+    <ng-container bitDialogFooter>
       <button type="submit" bitButton bitFormButton buttonType="primary" [disabled]="loading">
         {{ "save" | i18n }}
       </button>
@@ -98,6 +98,6 @@
         [bitAction]="delete"
         [disabled]="loading"
       ></button>
-    </div>
+    </ng-container>
   </bit-dialog>
 </form>

apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.html

@@ -39,12 +39,12 @@
       </div>
     </form>
   </span>
-  <div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2">
+  <ng-container bitDialogFooter>
     <button bitButton buttonType="primary" type="submit" [loading]="loading" form="form">
       <span>{{ "changeKdf" | i18n }}</span>
     </button>
     <button bitButton buttonType="secondary" type="button" data-dismiss="modal">
       {{ "cancel" | i18n }}
     </button>
-  </div>
+  </ng-container>
 </bit-dialog>

apps/web/src/app/tools/import-export/dialog/import-success-dialog.component.html

@@ -24,9 +24,9 @@
     </bit-table>
   </div>
 
-  <div bitDialogFooter>
+  <ng-container bitDialogFooter>
     <button bitButton bitDialogClose buttonType="primary" type="button">
       {{ "ok" | i18n }}
     </button>
-  </div>
+  </ng-container>
 </bit-dialog>

apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html

@@ -16,10 +16,10 @@
       {{ "permanentlyDeleteSelectedItemsDesc" | i18n : cipherIds.length }}
     </ng-container>
   </span>
-  <div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2">
+  <ng-container bitDialogFooter>
     <button bitButton type="submit" buttonType="danger" [bitAction]="submit">
       {{ (permanent ? "permanentlyDelete" : "delete") | i18n }}
     </button>
     <button bitButton type="button" (click)="cancel()">{{ "cancel" | i18n }}</button>
-  </div>
+  </ng-container>
 </bit-simple-dialog>

apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html

@@ -12,13 +12,13 @@
         </select>
       </bit-form-field>
     </span>
-    <div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2">
+    <ng-container bitDialogFooter>
       <button bitButton bitFormButton type="submit" buttonType="primary">
         {{ "save" | i18n }}
       </button>
       <button bitButton bitFormButton type="button" buttonType="secondary" (click)="cancel()">
         {{ "cancel" | i18n }}
       </button>
-    </div>
+    </ng-container>
   </bit-dialog>
 </form>

apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html

@@ -5,10 +5,10 @@
   <span bitDialogContent>
     {{ "restoreSelectedItemsDesc" | i18n : cipherIds.length }}
   </span>
-  <div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2">
+  <ng-container bitDialogFooter>
     <button bitButton type="submit" buttonType="primary" [bitAction]="submit">
       {{ "restore" | i18n }}
     </button>
     <button bitButton type="button" (click)="cancel()">{{ "cancel" | i18n }}</button>
-  </div>
+  </ng-container>
 </bit-simple-dialog>

apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html

@@ -62,12 +62,12 @@
       </tbody>
     </table>
   </span>
-  <div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2">
+  <ng-container bitDialogFooter>
     <button bitButton type="submit" buttonType="primary" [bitAction]="submit">
       {{ "save" | i18n }}
     </button>
     <button bitButton type="button" buttonType="secondary" (click)="cancel()">
       {{ "cancel" | i18n }}
     </button>
-  </div>
+  </ng-container>
 </bit-dialog>

bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-add-edit-dialog/domain-add-edit-dialog.component.html

@@ -49,7 +49,7 @@
         {{ "automaticDomainVerificationProcess" | i18n }}
       </bit-callout>
     </div>
-    <div bitDialogFooter class="tw-flex tw-flex-row tw-items-center tw-gap-2">
+    <ng-container bitDialogFooter>
       <button type="submit" bitButton bitFormButton buttonType="primary">
         <span *ngIf="!data?.orgDomain?.verifiedDate">{{ "verifyDomain" | i18n }}</span>
         <span *ngIf="data?.orgDomain?.verifiedDate">{{ "reverifyDomain" | i18n }}</span>
@@ -70,6 +70,6 @@
         type="submit"
         bitFormButton
       ></button>
-    </div>
+    </ng-container>
   </bit-dialog>
 </form>

bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-delete-dialog.component.html

@@ -23,13 +23,13 @@
       </bit-form-field>
     </div>
 
-    <div bitDialogFooter class="tw-flex tw-gap-2">
+    <ng-container bitDialogFooter>
       <button type="submit" bitButton buttonType="danger" bitFormButton>
         {{ title | i18n }}
       </button>
       <button type="button" bitButton buttonType="secondary" bitFormButton bitDialogClose>
         {{ "cancel" | i18n }}
       </button>
-    </div>
+    </ng-container>
   </bit-dialog>
 </form>

bitwarden_license/bit-web/src/app/secrets-manager/projects/dialog/project-dialog.component.html

@@ -10,13 +10,13 @@
         <input formControlName="name" maxlength="1000" bitInput />
       </bit-form-field>
     </span>
-    <div bitDialogFooter class="tw-flex tw-gap-2">
+    <ng-container bitDialogFooter>
       <button type="submit" bitButton buttonType="primary" bitFormButton>
         {{ "save" | i18n }}
       </button>
       <button type="button" bitButton buttonType="secondary" bitFormButton bitDialogClose>
         {{ "cancel" | i18n }}
       </button>
-    </div>
+    </ng-container>
   </bit-dialog>
 </form>

bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-delete.component.html

@@ -6,12 +6,12 @@
     </div>
     {{ "deleteItemConfirmation" | i18n }}
   </span>
-  <div bitDialogFooter class="tw-flex tw-gap-2">
+  <ng-container bitDialogFooter>
     <button type="button" bitButton buttonType="primary" [bitAction]="delete">
       {{ submitButtonText | i18n }}
     </button>
     <button type="button" bitButton buttonType="secondary" bitDialogClose>
       {{ "close" | i18n }}
     </button>
-  </div>
+  </ng-container>
 </bit-simple-dialog>

bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.html

@@ -44,7 +44,7 @@
         <input formControlName="newProjectName" maxlength="1000" bitInput />
       </bit-form-field>
     </div>
-    <div bitDialogFooter class="tw-flex tw-gap-2">
+    <ng-container bitDialogFooter>
       <button type="submit" bitButton buttonType="primary" bitFormButton>
         {{ "save" | i18n }}
       </button>
@@ -67,6 +67,6 @@
         bitFormButton
         (click)="openDeleteSecretDialog()"
       ></button>
-    </div>
+    </ng-container>
   </bit-dialog>
 </form>

bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-create-dialog.component.html

@@ -32,13 +32,13 @@
       ></sm-expiration-options>
     </div>
 
-    <div bitDialogFooter class="tw-flex tw-gap-2">
+    <ng-container bitDialogFooter>
       <button class="tw-normal-case" type="submit" bitButton buttonType="primary" bitFormButton>
         {{ "newAccessToken" | i18n }}
       </button>
       <button type="button" bitButton buttonType="secondary" bitFormButton bitDialogClose>
         {{ "cancel" | i18n }}
       </button>
-    </div>
+    </ng-container>
   </bit-dialog>
 </form>

bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.html

@@ -23,10 +23,10 @@
     {{ data.expirationDate === null ? ("never" | i18n) : (data.expirationDate | date : "medium") }}
   </div>
 
-  <div bitDialogFooter class="tw-flex tw-gap-2">
+  <ng-container bitDialogFooter>
     <button type="button" bitButton buttonType="primary" (click)="copyAccessToken()">
       <i class="bwi bwi-clone" aria-hidden="true"></i>
       {{ "copyToken" | i18n }}
     </button>
-  </div>
+  </ng-container>
 </bit-dialog>

bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.html

@@ -23,13 +23,13 @@
       </bit-form-field>
     </div>
 
-    <div bitDialogFooter class="tw-flex tw-gap-2">
+    <ng-container bitDialogFooter>
       <button type="submit" bitButton buttonType="danger" bitFormButton>
         {{ title }}
       </button>
       <button type="button" bitButton buttonType="secondary" bitFormButton bitDialogClose>
         {{ "cancel" | i18n }}
       </button>
-    </div>
+    </ng-container>
   </bit-dialog>
 </form>

bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.html

@@ -12,13 +12,13 @@
         </bit-form-field>
       </div>
     </div>
-    <div bitDialogFooter class="tw-flex tw-gap-2">
+    <ng-container bitDialogFooter>
       <button type="submit" bitButton buttonType="primary" bitFormButton>
         {{ "save" | i18n }}
       </button>
       <button type="button" bitButton buttonType="secondary" bitFormButton bitDialogClose>
         {{ "cancel" | i18n }}
       </button>
-    </div>
+    </ng-container>
   </bit-dialog>
 </form>

bitwarden_license/bit-web/src/app/secrets-manager/settings/dialog/sm-import-error-dialog.component.html

@@ -21,9 +21,9 @@
       </ng-template>
     </bit-table>
   </span>
-  <div bitDialogFooter>
+  <ng-container bitDialogFooter>
     <button bitButton bitDialogClose buttonType="primary" type="button">
       {{ "ok" | i18n }}
     </button>
-  </div>
+  </ng-container>
 </bit-dialog>

bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/dialogs/access-removal-dialog.component.html

@@ -3,12 +3,12 @@
   <span bitDialogContent>
     {{ data.message | i18n }}
   </span>
-  <div bitDialogFooter class="tw-flex tw-flex-row tw-gap-2">
+  <ng-container bitDialogFooter>
     <button type="button" bitButton buttonType="danger" [bitAction]="removeAccess">
       {{ "removeAccess" | i18n }}
     </button>
     <button type="button" bitButton buttonType="secondary" [bitAction]="cancel">
       {{ "cancel" | i18n }}
     </button>
-  </div>
+  </ng-container>
 </bit-simple-dialog>

bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.html

@@ -25,9 +25,9 @@
     </bit-table>
   </div>
 
-  <div bitDialogFooter class="tw-flex tw-gap-2">
+  <ng-container bitDialogFooter>
     <button bitButton buttonType="primary" bitDialogClose type="button">
       {{ "close" | i18n }}
     </button>
-  </div>
+  </ng-container>
 </bit-dialog>

bitwarden_license/bit-web/src/app/secrets-manager/trash/dialog/secret-hard-delete.component.html

@@ -7,12 +7,12 @@
         : ("hardDeleteSecretsConfirmation" | i18n)
     }}
   </span>
-  <div bitDialogFooter class="tw-flex tw-gap-2">
+  <ng-container bitDialogFooter>
     <button type="button" bitButton buttonType="primary" [bitAction]="delete">
       {{ submitButtonText | i18n }}
     </button>
     <button type="button" bitButton buttonType="secondary" bitDialogClose>
       {{ "close" | i18n }}
     </button>
-  </div>
+  </ng-container>
 </bit-simple-dialog>

bitwarden_license/bit-web/src/app/secrets-manager/trash/dialog/secret-restore.component.html

@@ -5,12 +5,12 @@
       data.secretIds.length === 1 ? ("restoreSecretPrompt" | i18n) : ("restoreSecretsPrompt" | i18n)
     }}
   </span>
-  <div bitDialogFooter class="tw-flex tw-gap-2">
+  <ng-container bitDialogFooter>
     <button type="button" bitButton buttonType="primary" [bitAction]="restore">
       {{ title | i18n }}
     </button>
     <button type="button" bitButton buttonType="secondary" bitDialogClose>
       {{ "close" | i18n }}
     </button>
-  </div>
+  </ng-container>
 </bit-simple-dialog>