hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix fontawesome icons

Browse Source
This commit is contained in:
Giuseppe Digilio
2018-12-27 17:48:35 +01:00
parent f9c69b7441
commit e6ea2667eb
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/environment.default.js
View File

@@ -56,15 +56,13 @@ module.exports = {
* { * {
* // NOTE: metadata name * // NOTE: metadata name
* name: 'dc.author', * name: 'dc.author',
* // NOTE: fontawesome (v4.x) icon classes and bootstrap utility classes can be used * // NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
* style: 'fa-user' * style: 'fa-user'
* } * }
*/ */
{ {
// NOTE: metadata name
name: 'dc.author', name: 'dc.author',
// NOTE: fontawesome (v4.x) icon classes and bootstrap utility classes can be used style: 'fas fa-user'
style: 'fa-user'
}, },
// default configuration // default configuration
{ {

6
src/app/shared/chips/chips.component.html
View File

@@ -20,13 +20,13 @@
[ngClass]="{'chip-selected disabled': (editable && c.editMode) || dragged == i}" [ngClass]="{'chip-selected disabled': (editable && c.editMode) || dragged == i}"
(click)="chipsSelected($event, i);"> (click)="chipsSelected($event, i);">
<span> <span>
<i *ngIf="showIcons && !c.isNestedItem()" dsAuthorityConfidenceState [authorityValue]="c.item" class="fa fa-circle-o" aria-hidden="true"></i> <i *ngIf="showIcons && !c.isNestedItem()" dsAuthorityConfidenceState [authorityValue]="c.item" class="far fa-circle" aria-hidden="true"></i>
<ng-container *ngIf="showIcons && c.hasIcons()"> <ng-container *ngIf="showIcons && c.hasVisibleIcons()">
<i *ngFor="let icon of c.icons; let l = last" <i *ngFor="let icon of c.icons; let l = last"
[ngbTooltip]="tipContent" [ngbTooltip]="tipContent"
triggers="manual" triggers="manual"
#t="ngbTooltip" #t="ngbTooltip"
class="fas {{icon.style}}" class="{{icon.style}}"
[class.mr-1]="!l" [class.mr-1]="!l"
[class.mr-2]="l" [class.mr-2]="l"
dsAuthorityConfidenceState dsAuthorityConfidenceState

5
src/app/shared/chips/models/chips-item.model.ts
View File

@@ -63,8 +63,9 @@ export class ChipsItem {
&& (((typeof this._item[icon.metadata] === 'string') && hasValue(this._item[icon.metadata])) && (((typeof this._item[icon.metadata] === 'string') && hasValue(this._item[icon.metadata]))
|| (this._item[icon.metadata] as FormFieldMetadataValueObject).hasValue()) || (this._item[icon.metadata] as FormFieldMetadataValueObject).hasValue())
&& !(this._item[icon.metadata] as FormFieldMetadataValueObject).hasPlaceholder()) { && !(this._item[icon.metadata] as FormFieldMetadataValueObject).hasPlaceholder()) {
if (icon.visibleWhenAuthorityEmpty if ((icon.visibleWhenAuthorityEmpty
|| (this._item[icon.metadata] as FormFieldMetadataValueObject).confidence !== ConfidenceType.CF_UNSET) { || (this._item[icon.metadata] as FormFieldMetadataValueObject).confidence !== ConfidenceType.CF_UNSET)
&& isNotEmpty(icon.style)) {
hasVisible = true; hasVisible = true;
break; break;
} }

2
src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
View File

@@ -45,6 +45,6 @@
(keydown)="preventEventsPropagation($event)" (keydown)="preventEventsPropagation($event)"
(keyup)="onKeyUp($event)" (keyup)="onKeyUp($event)"
#instance="ngbTypeahead"/> #instance="ngbTypeahead"/>
<i *ngIf="searching" class="far fa-circle fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i> <i *ngIf="searching" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
</ds-chips> </ds-chips>