Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="picker-header">
@if (!isRootFolder || selectedRecord) {
<div class="picker-back" (click)="onBackClick()">
<i class="ion-md-arrow-dropleft"></i> Back
<ion-icon name="caret-back"></ion-icon> Back
</div>
}
<div class="picker-folder-name">
Expand Down
10 changes: 5 additions & 5 deletions src/app/core/components/left-menu/left-menu.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
[routerLink]="['/search']"
[class.active]="checkMenuItemActive('/search')"
>
<i class="ion-md-search"></i>
<ion-icon name="search"></ion-icon>
Search
</a>
<a
Expand Down Expand Up @@ -216,26 +216,26 @@
[routerLink]="[{ outlets: { dialog: ['invitations'] } }]"
[class.active]="checkMenuItemActive('/invitations')"
>
<i class="ion-md-person-add"></i>
<ion-icon name="person-add"></ion-icon>
Invitations
</a>
<a
class="menu-item hide-desktop"
[routerLink]="[{ outlets: { dialog: ['storage', 'add'] } }]"
>
<i class="ion-md-add-circle"></i>
<ion-icon name="add-circle"></ion-icon>
Add Storage
</a>
<a
class="menu-item hide-desktop"
href="https://desk.zoho.com/portal/permanent/home"
target="_blank"
>
<i class="ion-md-help-circle"></i>
<ion-icon name="help-circle"></ion-icon>
Help
</a>
<a class="menu-item hide-desktop" (click)="logOut()">
<i class="ion-md-exit"></i>
<ion-icon name="exit"></ion-icon>
Log Out
</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
{{ member.primaryEmail }}
</div>
<div class="member-access">
<i
class="ion-md-information-circle"
<ion-icon
name="information-circle"
[ngbTooltip]="
getTooltipForAccess(member.accessRole) | prTooltip
"
></i>
></ion-icon>
Access: {{ member.accessRole | prConstants }}
</div>
</div>
Expand Down Expand Up @@ -110,12 +110,12 @@
{{ member.primaryEmail }}
</div>
<div class="member-access">
<i
class="ion-md-information-circle"
<ion-icon
name="information-circle"
[ngbTooltip]="
getTooltipForAccess(member.accessRole) | prTooltip
"
></i>
></ion-icon>
Access: {{ member.accessRole | prConstants }}
<span>(pending)</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/core/components/nav/nav.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
(click)="rightMenu.createNewFolder()"
[disabled]="!rightMenu.allowedActions.createFolder"
>
<i class="ion-md-folder"></i>New folder
<ion-icon name="folder"></ion-icon>New folder
</button>
}
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/app/core/components/nav/nav.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ nav.navbar {
justify-content: center;
font-weight: $font-weight-bold;

i {
i,
ion-icon {
margin-right: $navbar-button-icon-padding;
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/app/core/core.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { CommonModule } from '@angular/common';
import { CoreRoutingModule } from '@core/core.routes';
import { SharedModule } from '@shared/shared.module';
Expand Down Expand Up @@ -65,6 +65,7 @@ import { TwoFactorAuthComponent } from './components/two-factor-auth/two-factor-
import { RedeemGiftComponent } from './components/redeem-gift/redeem-gift.component';

@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
imports: [
AnnouncementModule,
CommonModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,11 @@
{{ item.displayName }}
</p>
@if (!showAccess && item.ShareVOs?.length && !isUnlistedShare) {
<i
class="ion-md-people"
<ion-icon
name="people"
@ngIfFadeInAnimation
[ngbTooltip]="'fileList.icons.share' | prTooltip"
></i>
></ion-icon>
}
</div>
<div class="second-row">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}"
>
<div class="file-viewer-close">
<a (click)="close()"> <i class="ion-md-arrow-dropleft"></i> Back </a>
<a (click)="close()"> <ion-icon name="caret-back"></ion-icon> Back </a>
</div>
<div class="thumb-target">
<div
Expand Down
7 changes: 6 additions & 1 deletion src/app/file-browser/file-browser-components.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { NgModule, ComponentFactoryResolver } from '@angular/core';
import {
NgModule,
ComponentFactoryResolver,
CUSTOM_ELEMENTS_SCHEMA,
} from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
import { GoogleMapsModule } from '@angular/google-maps';
Expand Down Expand Up @@ -29,6 +33,7 @@ import { SharingDialogComponent } from './components/sharing-dialog/sharing-dial
import { DownloadButtonComponent } from './components/download-button/download-button.component';

@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
imports: [
CommonModule,
RouterModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
(focus)="onInputFocus()"
(keydown)="onInputKeydown($event)"
/>
<i class="ion-md-search"></i>
<ion-icon name="search"></ion-icon>
@if (showResults) {
<div class="search-results">
@if (tagResults?.length) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ input {
}
}

i.ion-md-search {
ion-icon[name='search'] {
position: absolute;
left: $input-padding;
opacity: 0.5;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#searchInput
[formControl]="formControl"
/>
<i class="ion-md-search"></i>
<ion-icon name="search"></ion-icon>
@if (waiting) {
<div class="fade-ring-loader" @ngIfFadeInAnimation></div>
}
Expand Down Expand Up @@ -54,13 +54,13 @@
}
@if (item.isFolder) {
<div class="item-thumb">
<i class="ion-md-folder"></i>
<ion-icon name="folder"></ion-icon>
</div>
}
<div class="item-info">
<div class="item-name">{{ item.displayName }}</div>
<div class="item-parent-folder">
<i class="ion-md-folder"></i>
<ion-icon name="folder"></ion-icon>
{{ item.parentDisplayName }}
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ input {
max-width: 30rem;
}

i.ion-md-search {
ion-icon[name='search'] {
position: absolute;
left: $input-padding;
opacity: 0.5;
Expand Down
3 changes: 2 additions & 1 deletion src/app/search/search.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { CommonModule } from '@angular/common';
import { SharedModule } from '@shared/shared.module';
import { FormsModule } from '@angular/forms';
Expand All @@ -7,6 +7,7 @@ import { GlobalSearchBarComponent } from './components/global-search-bar/global-
import { GlobalSearchResultsComponent } from './components/global-search-results/global-search-results.component';

@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
declarations: [GlobalSearchBarComponent, GlobalSearchResultsComponent],
imports: [CommonModule, SharedModule, FormsModule],
providers: [SearchService],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}
@if (!last) {
<span class="separator">
<i class="ion-md-arrow-dropright"></i>
<ion-icon name="caret-forward"></ion-icon>
</span>
}
@if (last) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
}
@if (currentFolder?.ShareVOs?.length) {
<div class="breadcrumb-shares">
<i
class="ion-md-people"
<ion-icon
name="people"
(click)="onShareIconClick()"
[ngbTooltip]="sharesList"
></i>
></ion-icon>
<ng-template #sharesList>
<ng-container [ngPlural]="currentFolder?.ShareVOs?.length">
Shared with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ pr-breadcrumb {
display: inline-block;
padding: 0px 0.5rem;
// opacity: 0.5;

ion-icon {
font-size: 0.6em;
}
}

&.drop-target,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[hidden]="item?.isFolder || isZip"
></div>
<div class="pr-thumbnail-icon" [hidden]="!item?.isFolder">
<i class="ion-md-folder"></i>
<ion-icon name="folder"></ion-icon>
</div>
<div class="pr-thumbnail-icon zip-icon" [hidden]="!isZip">
<fa-icon [icon]="['fas', 'file-archive']"></fa-icon>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ describe('ThumbnailComponent', () => {
'.pr-thumbnail-image[hidden]',
);
const folderIcons = fixture.nativeElement.querySelectorAll(
'i.ion-md-folder:not([hidden])',
'ion-icon[name="folder"]:not([hidden])',
);

expect(hiddenImages.length).toBe(1);
Expand Down
7 changes: 6 additions & 1 deletion src/app/shared/shared.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { NgModule, ComponentFactoryResolver } from '@angular/core';
import {
NgModule,
ComponentFactoryResolver,
CUSTOM_ELEMENTS_SCHEMA,
} from '@angular/core';
import { CommonModule, DatePipe } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { FormInputComponent } from '@shared/components/form-input/form-input.component';
Expand Down Expand Up @@ -72,6 +76,7 @@ import { GetFileTypePipe } from './pipes/get-file-type.pipe';
import { ArchiveSwitcherComponent } from './components/archive-switcher/archive-switcher.component';

@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
imports: [
CommonModule,
FormsModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
@if (!last) {
<span class="separator">
<i class="ion-md-arrow-dropright"></i>
<ion-icon name="caret-forward"></ion-icon>
</span>
}
@if (last) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,9 @@
display: inline-block;
padding: 0px 6px 0px 4px;
opacity: 0.5;

ion-icon {
font-size: 0.6em;
}
}
}
3 changes: 2 additions & 1 deletion src/app/views/views-components.module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';

Expand All @@ -8,6 +8,7 @@ import { TimelineViewComponent } from './components/timeline-view/timeline-view.
import { TimelineBreadcrumbsComponent } from './components/timeline-view/timeline-breadcrumbs/timeline-breadcrumbs.component';

@NgModule({
schemas: [CUSTOM_ELEMENTS_SCHEMA],
imports: [CommonModule, RouterModule, SharedModule],
exports: [TimelineViewComponent],
declarations: [TimelineViewComponent, TimelineBreadcrumbsComponent],
Expand Down
Binary file removed src/assets/fonts/ionicons.eot
Binary file not shown.
Loading