Skip to content
This repository has been archived by the owner on Dec 8, 2022. It is now read-only.

Contrib > Change components over to using sky-icon #1949

Merged
merged 7 commits into from
Sep 7, 2018
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
title="Sort descending"
type="button"
>
<i class="fa fa-angle-double-down" aria-hidden="true"></i>
<sky-icon icon="angle-double-down"></sky-icon>
</button>
<button
class="sky-btn sky-btn-default"
title="Sort ascending"
type="button"
>
<i class="fa fa-angle-double-up" aria-hidden="true"></i>
<sky-icon icon="angle-double-up"></sky-icon>
</button>
</sky-list-toolbar-view-actions>
</sky-list-toolbar>
Expand Down
2 changes: 1 addition & 1 deletion src/demos/autocomplete/autocomplete-demo.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,6 @@ <h2 class="sky-section-heading">
<ng-template
let-item="item"
#oceanSearchResultTemplate>
<i class="fa fa-long-arrow-right" aria-hidden="true"></i>
<sky-icon icon="long-arrow-right"></sky-icon>
{{ item.title }} &bull; ID {{ item.id }}
</ng-template>
4 changes: 2 additions & 2 deletions src/demos/flyout/flyout-demo.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
class="sky-btn sky-btn-default"
title="Close record"
(click)="closeFlyout()">
<i class="fa fa-close" aria-hidden="true"></i>
<sky-icon icon="close"></sky-icon>
</button>
</ng-template>

Expand All @@ -42,7 +42,7 @@
type="button"
class="sky-btn sky-btn-default"
(click)="removeFlyout()">
<i class="fa fa-trash" aria-hidden="true"></i>
<sky-icon icon="trash"></sky-icon>
Delete flyout
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/demos/list-toolbar/list-toolbar-demo.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
buttonStyle="primary"
>
<sky-dropdown-button>
<i class="fa fa-plus-circle" aria-hidden="true"></i>
<sky-icon icon="plus-circle"></sky-icon>
Add
</sky-dropdown-button>
</sky-dropdown>
Expand Down
2 changes: 1 addition & 1 deletion src/modules/alert/alert.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
[attr.aria-label]="'alert_close' | skyResources"
[hidden]="!closeable"
>
<span aria-hidden="true"><i class="fa fa-close"></i></span>
<span aria-hidden="true"><sky-icon icon="close"></sky-icon></span>
</button>
</div>
26 changes: 21 additions & 5 deletions src/modules/alert/alert.module.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,28 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
NgModule
} from '@angular/core';
import {
CommonModule
} from '@angular/common';

import { SkyAlertComponent } from './alert.component';
import { SkyResourcesModule } from '../resources';
import {
SkyResourcesModule
} from '../resources';
import {
SkyIconModule
} from '../icon';

import {
SkyAlertComponent
} from './alert.component';

@NgModule({
declarations: [SkyAlertComponent],
imports: [CommonModule, SkyResourcesModule],
imports: [
CommonModule,
SkyResourcesModule,
SkyIconModule
],
exports: [SkyAlertComponent]
})
export class SkyAlertModule { }
34 changes: 26 additions & 8 deletions src/modules/autocomplete/autocomplete.module.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,29 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {
NgModule
} from '@angular/core';
import {
CommonModule
} from '@angular/common';
import {
FormsModule
} from '@angular/forms';

import { SkyDropdownModule } from '../dropdown';
import { SkyTextHighlightModule } from '../text-highlight';
import {
SkyDropdownModule
} from '../dropdown';
import {
SkyTextHighlightModule
} from '../text-highlight';
import {
SkyIconModule
} from '../icon';

import { SkyAutocompleteComponent } from './autocomplete.component';
import { SkyAutocompleteInputDirective } from './autocomplete-input.directive';
import {
SkyAutocompleteComponent
} from './autocomplete.component';
import {
SkyAutocompleteInputDirective
} from './autocomplete-input.directive';

@NgModule({
declarations: [
Expand All @@ -17,7 +34,8 @@ import { SkyAutocompleteInputDirective } from './autocomplete-input.directive';
CommonModule,
FormsModule,
SkyTextHighlightModule,
SkyDropdownModule
SkyDropdownModule,
SkyIconModule
],
exports: [
SkyAutocompleteComponent,
Expand Down
61 changes: 44 additions & 17 deletions src/modules/datepicker/datepicker.module.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,47 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import {
NgModule
} from '@angular/core';
import {
CommonModule
} from '@angular/common';
import {
FormsModule
} from '@angular/forms';

import { SkyDatepickerCalendarComponent } from './datepicker-calendar.component';
import { SkyDatepickerCalendarInnerComponent } from './datepicker-calendar-inner.component';
import { SkyDayPickerComponent } from './daypicker.component';
import { SkyMonthPickerComponent } from './monthpicker.component';
import { SkyYearPickerComponent } from './yearpicker.component';
import {
SkyResourcesModule
} from '../resources';
import {
SkyDropdownModule
} from '../dropdown';
import {
SkyIconModule
} from '../icon';

import { SkyDatepickerComponent } from './datepicker.component';

import { SkyDatepickerConfigService } from './datepicker-config.service';
import { SkyResourcesModule } from '../resources';

import { SkyDropdownModule } from '../dropdown';

import { SkyDatepickerInputDirective } from './datepicker-input.directive';
import {
SkyDatepickerCalendarComponent
} from './datepicker-calendar.component';
import {
SkyDatepickerCalendarInnerComponent
} from './datepicker-calendar-inner.component';
import {
SkyDayPickerComponent
} from './daypicker.component';
import {
SkyMonthPickerComponent
} from './monthpicker.component';
import {
SkyYearPickerComponent
} from './yearpicker.component';
import {
SkyDatepickerComponent
} from './datepicker.component';
import {
SkyDatepickerConfigService
} from './datepicker-config.service';
import {
SkyDatepickerInputDirective
} from './datepicker-input.directive';

@NgModule({
declarations: [
Expand All @@ -31,7 +57,8 @@ import { SkyDatepickerInputDirective } from './datepicker-input.directive';
CommonModule,
SkyResourcesModule,
SkyDropdownModule,
FormsModule
FormsModule,
SkyIconModule
],
exports: [
SkyDatepickerCalendarComponent,
Expand Down
4 changes: 2 additions & 2 deletions src/modules/datepicker/daypicker.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
tabindex="-1"
aria-hidden="true"
>
<i class="fa fa-chevron-left"></i>
<sky-icon icon="chevron-left"></sky-icon>
</button>
</th>
<th [attr.colspan]="5 + (datepicker.showWeeks ? 1 : 0)" scope="col">
Expand All @@ -38,7 +38,7 @@
tabindex="-1"
aria-hidden="true"
>
<i class="fa fa-chevron-right"></i>
<sky-icon icon="chevron-right"></sky-icon>
</button>
</th>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions src/modules/datepicker/monthpicker.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
(click)="datepicker.moveCalendar($event, -1)"
tabindex="-1"
>
<i class="fa fa-chevron-left"></i>
<sky-icon icon="chevron-left"></sky-icon>
</button></th>
<th [attr.colspan]="((datepicker.monthColLimit - 2) <= 0) ? 1 : datepicker.monthColLimit - 2">
<button
Expand All @@ -30,7 +30,7 @@
(click)="datepicker.moveCalendar($event, 1)"
tabindex="-1"
>
<i class="fa fa-chevron-right"></i>
<sky-icon icon="chevron-right"></sky-icon>
</button>
</th>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions src/modules/datepicker/yearpicker.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
(click)="datepicker.moveCalendar($event, -1)"
tabindex="-1"
>
<i class="fa fa-chevron-left"></i>
<sky-icon icon="chevron-left"></sky-icon>
</button>
</th>
<th [attr.colspan]="((datepicker.yearColLimit - 2) <= 0) ? 1 : datepicker.yearColLimit - 2">
Expand All @@ -32,7 +32,7 @@
(click)="datepicker.moveCalendar($event, 1)"
tabindex="-1"
>
<i class="fa fa-chevron-right"></i>
<sky-icon icon="chevron-right"></sky-icon>
</button>
</th>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions src/modules/dropdown/dropdown.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<div [ngSwitch]="buttonType">
<ng-template ngSwitchCase="context-menu">
<i class="fa fa-ellipsis-h"></i>
<sky-icon icon="ellipsis-h"></sky-icon>
</ng-template>

<ng-template ngSwitchDefault>
Expand All @@ -32,7 +32,7 @@
</ng-content>
</div>
<div class="sky-dropdown-button-icon-container">
<i class="fa fa-caret-down sky-dropdown-caret"></i>
<sky-icon icon="caret-down" class="sky-dropdown-caret"></sky-icon>
</div>
</div>
<div
Expand Down
38 changes: 29 additions & 9 deletions src/modules/dropdown/dropdown.module.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,32 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {
NgModule
} from '@angular/core';
import {
CommonModule
} from '@angular/common';

import { SkyWindowRefService } from '../window';
import { SkyPopoverModule } from '../popover';
import {
SkyWindowRefService
} from '../window';
import {
SkyPopoverModule
} from '../popover';
import {
SkyIconModule
} from '../icon';

import { SkyDropdownButtonComponent } from './dropdown-button.component';
import { SkyDropdownItemComponent } from './dropdown-item.component';
import { SkyDropdownMenuComponent } from './dropdown-menu.component';
import { SkyDropdownComponent } from './dropdown.component';
import {
SkyDropdownButtonComponent
} from './dropdown-button.component';
import {
SkyDropdownItemComponent
} from './dropdown-item.component';
import {
SkyDropdownMenuComponent
} from './dropdown-menu.component';
import {
SkyDropdownComponent
} from './dropdown.component';

@NgModule({
declarations: [
Expand All @@ -18,7 +37,8 @@ import { SkyDropdownComponent } from './dropdown.component';
],
imports: [
CommonModule,
SkyPopoverModule
SkyPopoverModule,
SkyIconModule
],
exports: [
SkyDropdownButtonComponent,
Expand Down
6 changes: 3 additions & 3 deletions src/modules/fileattachments/file-drop.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,23 @@
<div class="sky-file-drop-text">
{{ 'file_upload_or_click_to_browse' | skyResources }}
</div>
<i class="fa fa-cloud-upload sky-file-upload-icon"></i>
<sky-icon icon="cloud-upload" class="sky-file-upload-icon"></sky-icon>
</div>

<!-- This will appear when file is dragged over and is valid -->
<div class="sky-file-drop-contents-accept" >
<div class="sky-file-drop-text-header sky-headline">
{{ 'file_upload_drop_files_here' | skyResources }}
</div>
<i class="fa fa-bullseye sky-file-upload-icon"></i>
<sky-icon icon="bullseye" class="sky-file-upload-icon"></sky-icon>
</div>

<!-- This will appear when file is dragged over and is invalid -->
<div class="sky-file-drop-contents-reject" >
<div class="sky-file-drop-text-header sky-headline">
{{ 'file_upload_invalid_file' | skyResources }}
</div>
<i class="fa fa-times-circle sky-file-upload-icon"></i>
<sky-icon icon="times-circle" class="sky-file-upload-icon"></sky-icon>
</div>
</div>

Expand Down
1 change: 1 addition & 0 deletions src/modules/fileattachments/file-drop.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ button.sky-file-drop {
.sky-file-upload-icon {
display: block;
font-size: 40px;
max-height: 40px;
margin-top: $sky-margin;
}

Expand Down
2 changes: 1 addition & 1 deletion src/modules/fileattachments/file-item.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</div>
<div class="sky-pull-right">
<button type="button" class="sky-btn sky-btn-default sky-file-item-btn-delete" [attr.aria-label]="'file_item_delete' | skyResources" (click)="itemDelete()">
<i class="fa fa-lg fa-trash-o"></i>
<sky-icon icon="trash-o" size="lg"></sky-icon>
</button>
</div>
</div>
Expand Down
Loading