Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-02-08 00:01:28 +01:00
Code Issues Projects Releases Wiki Activity

[SG-388] Organization menu style improvements (#3100)

Browse Source 
* fix: css

* fix: alignment of icon in menu for a tags
This commit is contained in:
Brandon Maharaj 2022-07-25 11:26:28 -04:00 committed by GitHub
parent 478de90d45
commit 6572bacca0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/web/src/app/modules/vault-filter/components/organization-options.component.html
View File

@ -13,7 +13,7 @@
> >
<button <button
*ngIf="allowEnrollmentChanges(organization) && !organization.resetPasswordEnrolled" *ngIf="allowEnrollmentChanges(organization) && !organization.resetPasswordEnrolled"
class="dropdown-item" class="!tw-text-main active:!tw-ring-0 active:!tw-ring-offset-0 focus:tw-bg-secondary-100 focus:tw-outline-none focus:tw-ring focus:tw-ring-offset-2 focus:tw-ring-primary-700 focus:tw-z-50 hover:tw-bg-secondary-100 tw-bg-background tw-block tw-border-none tw-cursor-pointer tw-px-4 tw-py-2 tw-text-left"
(click)="toggleResetPasswordEnrollment(organization)" (click)="toggleResetPasswordEnrollment(organization)"
> >
<i class="bwi bwi-fw bwi-key" aria-hidden="true"></i> <i class="bwi bwi-fw bwi-key" aria-hidden="true"></i>
@ -21,7 +21,7 @@
</button> </button>
<button <button
*ngIf="allowEnrollmentChanges(organization) && organization.resetPasswordEnrolled" *ngIf="allowEnrollmentChanges(organization) && organization.resetPasswordEnrolled"
class="dropdown-item" class="!tw-text-main active:!tw-ring-0 active:!tw-ring-offset-0 focus:tw-bg-secondary-100 focus:tw-outline-none focus:tw-ring focus:tw-ring-offset-2 focus:tw-ring-primary-700 focus:tw-z-50 hover:tw-bg-secondary-100 tw-bg-background tw-block tw-border-none tw-cursor-pointer tw-px-4 tw-py-2 tw-text-left"
(click)="toggleResetPasswordEnrollment(organization)" (click)="toggleResetPasswordEnrollment(organization)"
> >
<i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i> <i class="bwi bwi-fw bwi-undo" aria-hidden="true"></i>
@ -30,7 +30,7 @@
<ng-container *ngIf="organization.useSso && organization.identifier"> <ng-container *ngIf="organization.useSso && organization.identifier">
<button <button
*ngIf="organization.ssoBound; else linkSso" *ngIf="organization.ssoBound; else linkSso"
class="dropdown-item" class="!tw-text-main active:!tw-ring-0 active:!tw-ring-offset-0 focus:tw-bg-secondary-100 focus:tw-outline-none focus:tw-ring focus:tw-ring-offset-2 focus:tw-ring-primary-700 focus:tw-z-50 hover:tw-bg-secondary-100 tw-bg-background tw-block tw-border-none tw-cursor-pointer tw-px-4 tw-py-2 tw-text-left"
(click)="unlinkSso(organization)" (click)="unlinkSso(organization)"
> >
<i class="bwi bwi-fw bwi-chain-broken" aria-hidden="true"></i> <i class="bwi bwi-fw bwi-chain-broken" aria-hidden="true"></i>
@ -40,7 +40,10 @@
<app-link-sso [organization]="organization"> </app-link-sso> <app-link-sso [organization]="organization"> </app-link-sso>
</ng-template> </ng-template>
</ng-container> </ng-container>
<button class="dropdown-item text-danger" (click)="leave(organization)"> <button
class="text-danger active:!tw-ring-0 active:!tw-ring-offset-0 focus:tw-bg-secondary-100 focus:tw-outline-none focus:tw-ring focus:tw-ring-offset-2 focus:tw-ring-primary-700 focus:tw-z-50 hover:tw-bg-secondary-100 tw-bg-background tw-block tw-border-none tw-cursor-pointer tw-px-4 tw-py-2 tw-text-left"
(click)="leave(organization)"
>
<i class="bwi bwi-fw bwi-sign-out" aria-hidden="true"></i> <i class="bwi bwi-fw bwi-sign-out" aria-hidden="true"></i>
{{ "leave" | i18n }} {{ "leave" | i18n }}
</button> </button>

3
apps/web/src/scss/base.scss
View File

@ -302,6 +302,7 @@ code {
} }
} }
button i.bwi { button i.bwi,
a i.bwi {
margin-right: 0.25rem; margin-right: 0.25rem;
} }