1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-12 14:23:32 +00:00

Remove bootstrap classes from shared code (#12906)

Migrates the following components to not use bootstrap.

- apps/web/src/app/components/environment-selector/environment-selector.component.html
- apps/web/src/app/layouts/frontend-layout.component.html
- apps/web/src/app/layouts/org-switcher/org-switcher.component.html
- apps/web/src/app/settings/domain-rules.component.html
- bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.html
- bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html
This commit is contained in:
Oscar Hinton
2025-01-24 10:48:00 +01:00
committed by GitHub
parent b1d4defa70
commit 463da5614d
6 changed files with 12 additions and 13 deletions

View File

@@ -6,10 +6,9 @@
[attr.href]=" [attr.href]="
region == currentRegion ? 'javascript:void(0)' : region.urls.webVault + routeAndParams region == currentRegion ? 'javascript:void(0)' : region.urls.webVault + routeAndParams
" "
class="pr-4"
> >
<i <i
class="bwi bwi-fw bwi-sm bwi-check pb-1" class="bwi bwi-fw bwi-sm bwi-check"
aria-hidden="true" aria-hidden="true"
[style.visibility]="region == currentRegion ? 'visible' : 'hidden'" [style.visibility]="region == currentRegion ? 'visible' : 'hidden'"
></i> ></i>

View File

@@ -1,6 +1,8 @@
<router-outlet></router-outlet> <router-outlet></router-outlet>
<div class="container my-5 text-muted text-center">
<footer class="tw-text-center tw-my-12">
<environment-selector></environment-selector> <environment-selector></environment-selector>
&copy; {{ year }} Bitwarden Inc. <br />
{{ "versionNumber" | i18n: version }} <div bitTypography="body2">&copy; {{ year }} Bitwarden Inc.</div>
</div> <div bitTypography="body2">{{ version }}</div>
</footer>

View File

@@ -10,7 +10,7 @@
<i <i
slot="end" slot="end"
*ngIf="!activeOrganization.enabled" *ngIf="!activeOrganization.enabled"
class="bwi bwi-exclamation-triangle tw-my-auto !text-alt-2" class="bwi bwi-exclamation-triangle tw-my-auto"
[attr.aria-label]="'organizationIsDisabled' | i18n" [attr.aria-label]="'organizationIsDisabled' | i18n"
appA11yTitle="{{ 'organizationIsDisabled' | i18n }}" appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
></i> ></i>
@@ -27,7 +27,7 @@
<i <i
slot="end" slot="end"
*ngIf="org.enabled == false" *ngIf="org.enabled == false"
class="bwi bwi-exclamation-triangle !text-alt-2" class="bwi bwi-exclamation-triangle"
[attr.aria-label]="'organizationIsDisabled' | i18n" [attr.aria-label]="'organizationIsDisabled' | i18n"
appA11yTitle="{{ 'organizationIsDisabled' | i18n }}" appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
></i> ></i>

View File

@@ -43,7 +43,7 @@
<button type="submit" bitButton bitFormButton buttonType="primary"> <button type="submit" bitButton bitFormButton buttonType="primary">
{{ "save" | i18n }} {{ "save" | i18n }}
</button> </button>
<h2 bitTypography="h2" class="spaced-header">{{ "globalEqDomains" | i18n }}</h2> <h2 bitTypography="h2" class="tw-mt-16">{{ "globalEqDomains" | i18n }}</h2>
<p bitTypography="body1" *ngIf="loading"> <p bitTypography="body1" *ngIf="loading">
<i <i
class="bwi bwi-spinner bwi-spin tw-text-muted" class="bwi bwi-spinner bwi-spin tw-text-muted"

View File

@@ -2,7 +2,7 @@
<ng-container *ngIf="projectSecrets?.secrets && projectSecrets?.project; else spinner"> <ng-container *ngIf="projectSecrets?.secrets && projectSecrets?.project; else spinner">
<div <div
*ngIf="projectSecrets.secrets?.length > 0 && projectSecrets.project?.write" *ngIf="projectSecrets.secrets?.length > 0 && projectSecrets.project?.write"
class="float-right tw-mt-3 tw-items-center" class="tw-float-right tw-mt-3 tw-items-center"
> >
<button type="button" bitButton buttonType="secondary" (click)="openNewSecretDialog()"> <button type="button" bitButton buttonType="secondary" (click)="openNewSecretDialog()">
<i class="bwi bwi-plus" aria-hidden="true"></i> <i class="bwi bwi-plus" aria-hidden="true"></i>

View File

@@ -14,7 +14,6 @@
bitInput bitInput
type="file" type="file"
id="file" id="file"
class="form-control-file"
name="file" name="file"
(change)="setSelectedFile($event)" (change)="setSelectedFile($event)"
accept="application/JSON" accept="application/JSON"
@@ -23,7 +22,7 @@
/> />
<bit-hint>{{ "acceptedFormats" | i18n }} Bitwarden (json)</bit-hint> <bit-hint>{{ "acceptedFormats" | i18n }} Bitwarden (json)</bit-hint>
</bit-form-field> </bit-form-field>
<div class="my-4"> <div class="tw-my-4">
{{ "or" | i18n }} {{ "or" | i18n }}
</div> </div>
<bit-form-field> <bit-form-field>
@@ -31,7 +30,6 @@
<textarea <textarea
bitInput bitInput
id="pastedContents" id="pastedContents"
class="form-control"
name="FileContents" name="FileContents"
formControlName="pastedContents" formControlName="pastedContents"
></textarea> ></textarea>