1
0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-14 23:33:19 +00:00

[Icons] Update Font Sheet (#203)

* [Icons] Update font sheet

* Updated toaster icon references

* Prettier Updates

* Added import for variable/map references

* Update jslib

* Adding base class to all icon refs

* Removed unused import

* Removed duplicate import

* Update jslib

* Fixed formatting

* Updated eye/eye-slash icon references

* Update jslib

* Update jslib

* Update jslib
This commit is contained in:
Vincent Salucci
2022-01-27 11:10:25 -06:00
committed by GitHub
parent d1b182d20b
commit 5afae04b1d
10 changed files with 40 additions and 41 deletions

2
jslib

Submodule jslib updated: cf1e483c7f...6b4ed5fcce

View File

@@ -30,9 +30,9 @@
(click)="toggleSecret()"
>
<i
class="fa fa-lg"
class="bwi bwi-lg"
aria-hidden="true"
[ngClass]="showSecret ? 'fa-eye-slash' : 'fa-eye'"
[ngClass]="showSecret ? 'bwi-eye-slash' : 'bwi-eye'"
></i>
</button>
</div>
@@ -42,8 +42,8 @@
<div class="d-flex">
<div>
<button type="submit" class="btn btn-primary" [disabled]="form.loading">
<i class="fa fa-spinner fa-fw fa-spin" [hidden]="!form.loading"></i>
<i class="fa fa-sign-in fa-fw" [hidden]="form.loading"></i>
<i class="bwi bwi-spinner bwi-fw bwi-spin" [hidden]="!form.loading"></i>
<i class="bwi bwi-sign-in bwi-fw" [hidden]="form.loading"></i>
{{ "logIn" | i18n }}
</button>
</div>

View File

@@ -52,7 +52,7 @@
</div>
<div class="modal-footer justify-content-start">
<button type="submit" class="btn btn-primary">
<i class="fa fa-save fa-fw"></i>
<i class="bwi bwi-save bwi-fw"></i>
{{ "save" | i18n }}
</button>
</div>

View File

@@ -17,18 +17,18 @@
</p>
<form #startForm [appApiAction]="startPromise" class="d-inline">
<button (click)="start()" class="btn btn-primary" [disabled]="startForm.loading">
<i class="fa fa-play fa-fw" [hidden]="startForm.loading"></i>
<i class="fa fa-spinner fa-fw fa-spin" [hidden]="!startForm.loading"></i>
<i class="bwi bwi-play bwi-fw" [hidden]="startForm.loading"></i>
<i class="bwi bwi-spinner bwi-fw bwi-spin" [hidden]="!startForm.loading"></i>
{{ "startSync" | i18n }}
</button>
</form>
<button (click)="stop()" class="btn btn-primary">
<i class="fa fa-stop fa-fw"></i>
<i class="bwi bwi-stop bwi-fw"></i>
{{ "stopSync" | i18n }}
</button>
<form #syncForm [appApiAction]="syncPromise" class="d-inline">
<button (click)="sync()" class="btn btn-primary" [disabled]="syncForm.loading">
<i class="fa fa-refresh fa-fw" [ngClass]="{ 'fa-spin': syncForm.loading }"></i>
<i class="bwi bwi-refresh bwi-fw" [ngClass]="{ 'bwi-spin': syncForm.loading }"></i>
{{ "syncNow" | i18n }}
</button>
</form>
@@ -40,8 +40,8 @@
<p>{{ "testingDesc" | i18n }}</p>
<form #simForm [appApiAction]="simPromise" class="d-inline">
<button (click)="simulate()" class="btn btn-primary" [disabled]="simForm.loading">
<i class="fa fa-spinner fa-fw fa-spin" [hidden]="!simForm.loading"></i>
<i class="fa fa-bug fa-fw" [hidden]="simForm.loading"></i>
<i class="bwi bwi-spinner bwi-fw bwi-spin" [hidden]="!simForm.loading"></i>
<i class="bwi bwi-bug bwi-fw" [hidden]="simForm.loading"></i>
{{ "testNow" | i18n }}
</button>
</form>
@@ -59,9 +59,9 @@
<div class="row">
<div class="col-lg">
<h4>{{ "users" | i18n }}</h4>
<ul class="fa-ul testing-list" *ngIf="simEnabledUsers && simEnabledUsers.length">
<ul class="bwi-ul testing-list" *ngIf="simEnabledUsers && simEnabledUsers.length">
<li *ngFor="let u of simEnabledUsers" title="{{ u.referenceId }}">
<i class="fa-li fa fa-user"></i>
<i class="bwi bwi-li bwi-user"></i>
{{ u.displayName }}
</li>
</ul>
@@ -69,9 +69,9 @@
{{ "noUsers" | i18n }}
</p>
<h4>{{ "disabledUsers" | i18n }}</h4>
<ul class="fa-ul testing-list" *ngIf="simDisabledUsers && simDisabledUsers.length">
<ul class="bwi-ul testing-list" *ngIf="simDisabledUsers && simDisabledUsers.length">
<li *ngFor="let u of simDisabledUsers" title="{{ u.referenceId }}">
<i class="fa-li fa fa-user"></i>
<i class="bwi bwi-li bwi-user"></i>
{{ u.displayName }}
</li>
</ul>
@@ -79,9 +79,9 @@
{{ "noUsers" | i18n }}
</p>
<h4>{{ "deletedUsers" | i18n }}</h4>
<ul class="fa-ul testing-list" *ngIf="simDeletedUsers && simDeletedUsers.length">
<ul class="bwi-ul testing-list" *ngIf="simDeletedUsers && simDeletedUsers.length">
<li *ngFor="let u of simDeletedUsers" title="{{ u.referenceId }}">
<i class="fa-li fa fa-user"></i>
<i class="bwi bwi-li bwi-user"></i>
{{ u.displayName }}
</li>
</ul>
@@ -91,9 +91,9 @@
</div>
<div class="col-lg">
<h4>{{ "groups" | i18n }}</h4>
<ul class="fa-ul testing-list" *ngIf="simGroups && simGroups.length">
<ul class="bwi-ul testing-list" *ngIf="simGroups && simGroups.length">
<li *ngFor="let g of simGroups" title="{{ g.referenceId }}">
<i class="fa-li fa fa-sitemap"></i>
<i class="bwi bwi-li bwi-sitemap"></i>
{{ g.displayName }}
<ul class="small" *ngIf="g.users && g.users.length">
<li *ngFor="let u of g.users" title="{{ u.referenceId }}">

View File

@@ -15,8 +15,8 @@
(click)="update()"
[disabled]="checkingForUpdate"
>
<i class="fa fa-download fa-fw" [hidden]="checkingForUpdate"></i>
<i class="fa fa-spinner fa-fw fa-spin" [hidden]="!checkingForUpdate"></i>
<i class="bwi bwi-download bwi-fw" [hidden]="checkingForUpdate"></i>
<i class="bwi bwi-spinner bwi-fw bwi-spin" [hidden]="!checkingForUpdate"></i>
{{ "checkForUpdates" | i18n }}
</button>
</div>

View File

@@ -236,9 +236,9 @@
(click)="toggleLdapPassword()"
>
<i
class="fa fa-lg"
class="bwi bwi-lg"
aria-hidden="true"
[ngClass]="showLdapPassword ? 'fa-eye-slash' : 'fa-eye'"
[ngClass]="showLdapPassword ? 'bwi-eye-slash' : 'bwi-eye'"
></i>
</button>
</div>
@@ -298,9 +298,9 @@
(click)="toggleAzureKey()"
>
<i
class="fa fa-lg"
class="bwi bwi-lg"
aria-hidden="true"
[ngClass]="showAzureKey ? 'fa-eye-slash' : 'fa-eye'"
[ngClass]="showAzureKey ? 'bwi-eye-slash' : 'bwi-eye'"
></i>
</button>
</div>
@@ -339,9 +339,9 @@
(click)="toggleOktaKey()"
>
<i
class="fa fa-lg"
class="bwi bwi-lg"
aria-hidden="true"
[ngClass]="showOktaKey ? 'fa-eye-slash' : 'fa-eye'"
[ngClass]="showOktaKey ? 'bwi-eye-slash' : 'bwi-eye'"
></i>
</button>
</div>
@@ -377,9 +377,9 @@
(click)="toggleOneLoginSecret()"
>
<i
class="fa fa-lg"
class="bwi bwi-lg"
aria-hidden="true"
[ngClass]="showOneLoginSecret ? 'fa-eye-slash' : 'fa-eye'"
[ngClass]="showOneLoginSecret ? 'bwi-eye-slash' : 'bwi-eye'"
></i>
</button>
</div>

View File

@@ -2,19 +2,19 @@
<ul class="nav nav-tabs mb-3">
<li class="nav-item">
<a class="nav-link" routerLink="dashboard" routerLinkActive="active">
<i class="fa fa-dashboard"></i>
<i class="bwi bwi-dashboard"></i>
{{ "dashboard" | i18n }}
</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLink="settings" routerLinkActive="active">
<i class="fa fa-cogs"></i>
<i class="bwi bwi-cogs"></i>
{{ "settings" | i18n }}
</a>
</li>
<li class="nav-item">
<a class="nav-link" routerLink="more" routerLinkActive="active">
<i class="fa fa-sliders"></i>
<i class="bwi bwi-sliders"></i>
{{ "more" | i18n }}
</a>
</li>

View File

@@ -13,7 +13,7 @@
</head>
<body>
<app-root>
<div id="loading"><i class="fa fa-spinner fa-spin fa-3x"></i></div>
<div id="loading"><i class="bwi bwi-spinner bwi-spin bwi-3x"></i></div>
</app-root>
</body>
</html>

View File

@@ -1,5 +1,3 @@
$fa-font-path: "~font-awesome/fonts";
@import "~font-awesome/scss/font-awesome.scss";
@import "~ngx-toastr/toastr";
@import "~bootstrap/scss/_variables.scss";
@@ -31,7 +29,7 @@ $fa-font-path: "~font-awesome/fonts";
.icon i::before {
float: left;
font-style: normal;
font-family: FontAwesome;
font-family: $icomoon-font-family;
font-size: 25px;
line-height: 20px;
padding-right: 15px;
@@ -52,7 +50,7 @@ $fa-font-path: "~font-awesome/fonts";
background-color: $danger;
.icon i::before {
content: "\f0e7";
content: map_get($icons, "error");
}
}
@@ -60,7 +58,7 @@ $fa-font-path: "~font-awesome/fonts";
background-color: $warning;
.icon i::before {
content: "\f071";
content: map_get($icons, "exclamation-triangle");
}
}
@@ -68,7 +66,7 @@ $fa-font-path: "~font-awesome/fonts";
background-color: $info;
.icon i:before {
content: "\f05a";
content: map_get($icons, "info-circle");
}
}
@@ -76,7 +74,7 @@ $fa-font-path: "~font-awesome/fonts";
background-color: $success;
.icon i:before {
content: "\f00C";
content: map_get($icons, "check");
}
}
}

View File

@@ -1,4 +1,5 @@
@import "../../jslib/angular/src/scss/webfonts.css";
@import "../../jslib/angular/src/scss/bwicons/styles/style.scss";
@import "bootstrap.scss";
@import "pages.scss";
@import "misc.scss";