purchasing/fuse-angular
3
0
Fork 0
mirror of https://github.com/richard-loafle/fuse-angular.git synced 2025-11-04 14:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed "fxLayoutWrap" and added "wrap" into fxLayout attributes where it's necessary

Browse Source
This commit is contained in:
Sercan Yemen 2018-03-06 11:23:59 +03:00
parent 583e74d99f
commit ae6bc37664
26 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/@fuse/components/theme-options/theme-options.component.html
View File

@ -14,7 +14,7 @@
<h3>Navigation:</h3>
<mat-radio-group [(ngModel)]="config.layout.navigation" (ngModelChange)="onSettingsChange()"
fxLayout="column" fxLayout.gt-xs="row" fxLayoutAlign="start start" fxLayoutWrap>
fxLayout="column" fxLayout.gt-xs="row wrap" fxLayoutAlign="start start">
<mat-radio-button class="mr-8 mb-8" value="top">Top</mat-radio-button>
<mat-radio-button class="mr-8 mb-8" value="left">Left</mat-radio-button>
<mat-radio-button class="mr-8 mb-8" value="right">Right</mat-radio-button>
@ -29,7 +29,7 @@
<h3 class="mt-24">Toolbar:</h3>
<mat-radio-group [(ngModel)]="config.layout.toolbar" (ngModelChange)="onSettingsChange()"
fxLayout="column" fxLayout.gt-xs="row" fxLayoutAlign="start start" fxLayoutWrap>
fxLayout="column" fxLayout.gt-xs="row wrap" fxLayoutAlign="start start">
<mat-radio-button class="mr-8 mb-8" value="below">Below</mat-radio-button>
<mat-radio-button class="mr-8 mb-8" value="above">Above</mat-radio-button>
<mat-radio-button class="mr-8 mb-8" value="none">None</mat-radio-button>
@ -37,7 +37,7 @@
<h3 class="mt-24">Footer:</h3>
<mat-radio-group [(ngModel)]="config.layout.footer" (ngModelChange)="onSettingsChange()"
fxLayout="column" fxLayout.gt-xs="row" fxLayoutAlign="start start" fxLayoutWrap>
fxLayout="column" fxLayout.gt-xs="row wrap" fxLayoutAlign="start start">
<mat-radio-button class="mr-8 mb-8" value="below">Below</mat-radio-button>
<mat-radio-button class="mr-8 mb-8" value="above">Above</mat-radio-button>
<mat-radio-button class="mr-8 mb-8" value="none">None</mat-radio-button>
@ -45,7 +45,7 @@
<h3 class="mt-24">Layout Mode:</h3>
<mat-radio-group [(ngModel)]="config.layout.mode" (ngModelChange)="onSettingsChange()"
fxLayout="column" fxLayout.gt-xs="row" fxLayoutAlign="start start" fxLayoutWrap>
fxLayout="column" fxLayout.gt-xs="row wrap" fxLayoutAlign="start start">
<mat-radio-button class="mr-8 mb-8" value="boxed">Boxed</mat-radio-button>
<mat-radio-button class="mr-8 mb-8" value="fullwidth">Fullwidth</mat-radio-button>
</mat-radio-group>

5
src/app/app.module.ts
View File

@ -9,7 +9,6 @@ import 'hammerjs';
import { FuseModule } from '@fuse/fuse.module';
import { FuseSharedModule } from '@fuse/shared.module';
// import { SharedModule } from 'app/shared/shared.module';
import { fuseConfig } from './fuse-config';
import { AppComponent } from './app.component';
@ -17,7 +16,6 @@ import { FuseFakeDbService } from './fuse-fake-db/fuse-fake-db.service';
import { FuseMainModule } from './main/main.module';
import { TranslateModule } from '@ngx-translate/core';
import { AppStoreModule } from './store/store.module';
import { MaterialModule } from '@fuse/modules/material.module';
const appRoutes: Routes = [
{
@ -65,9 +63,6 @@ const appRoutes: Routes = [
passThruUnknownUrl: true
}),
// SharedModule,
// MaterialModule,
// Fuse Main and Shared modules
FuseModule.forRoot(fuseConfig),
FuseSharedModule,

2
src/app/main/content/apps/academy/courses/courses.component.html
View File

@ -46,7 +46,7 @@
</div>
<div class="courses" fxLayout="row" fxLayoutAlign="center" fxLayoutWrap>
<div class="courses" fxLayout="row wrap" fxLayoutAlign="center">
<div class="course" *ngFor="let course of filteredCourses" fxFlex="100" fxFlex.gt-xs="50"
fxFlex.gt-sm="33" [ngClass]="course.category">

9
src/app/main/content/apps/dashboards/analytics/analytics.component.html
View File

@ -55,7 +55,7 @@
<div class="fuse-card auto-width mb-32" [ngClass.gt-sm]="'mb-0 mr-32'">
<div class="p-16 pb-0" fxLayout="row" fxLayoutAlign="start end" fxLayoutWrap>
<div class="p-16 pb-0" fxLayout="row wrap" fxLayoutAlign="start end">
<div class="pr-16">
<div class="h3 secondary-text">Conversion</div>
@ -100,7 +100,7 @@
<div class="fuse-card auto-width mb-32" [ngClass.gt-sm]="'mb-0 mr-32'">
<div class="p-16 pb-0" fxLayout="row" fxLayoutAlign="start end" fxLayoutWrap>
<div class="p-16 pb-0" fxLayout="row wrap" fxLayoutAlign="start end">
<div class="pr-16">
<div class="h3 secondary-text">Impressions</div>
@ -145,7 +145,7 @@
<div class="fuse-card auto-width">
<div class="p-16 pb-0" fxLayout="row" fxLayoutAlign="start end" fxLayoutWrap>
<div class="p-16 pb-0" fxLayout="row wrap" fxLayoutAlign="start end">
<div class="pr-16">
<div class="h3 secondary-text">Visits</div>
@ -262,8 +262,7 @@
<div class="right">
<div fxLayout="row" fxLayoutWrap
fxLayout.gt-md="column">
<div fxLayout="row wrap" fxLayout.gt-md="column">
<!-- Widget 7 -->
<div class="mb-48" [ngClass.lt-lg]="'mr-32'">

28
src/app/main/content/apps/dashboards/project/project.component.html
View File

@ -44,7 +44,7 @@
<mat-tab label="Home">
<div class="widget-group grey-100-bg p-12" fxLayout="row" fxFlex="100" fxLayoutWrap *fuseIfOnDom
<div class="widget-group grey-100-bg p-12" fxLayout="row wrap" fxFlex="100" *fuseIfOnDom
[@animateStagger]="{value:'50'}">
<!-- WIDGET 1 -->
@ -259,8 +259,8 @@
<!-- Front -->
<div class="fuse-widget-front mat-white-bg mat-elevation-z2">
<div class="px-16 border-bottom" fxLayout="row" fxLayoutAlign="space-between center"
fxLayoutWrap>
<div class="px-16 border-bottom" fxLayout="row wrap"
fxLayoutAlign="space-between center">
<div fxFlex class="py-16 h3">{{widgets.widget5.title}}</div>
@ -274,7 +274,7 @@
</div>
</div>
<div fxLayout="row" fxLayoutAlign="start start" fxLayoutWrap>
<div fxLayout="row wrap" fxLayoutAlign="start start">
<div class="h-420 my-16" fxLayout="row" fxFlex="100" fxFlex.gt-sm="50">
<ngx-charts-bar-vertical-stacked
@ -293,8 +293,7 @@
</ngx-charts-bar-vertical-stacked>
</div>
<div class="my-16" fxFlex="100" fxFlex.gt-sm="50" fxLayoutAlign="row"
fxLayoutWrap>
<div class="my-16" fxFlex="100" fxFlex.gt-sm="50" fxLayoutAlign="row wrap">
<div fxLayout="column" fxFlex="100" fxFlex.gt-sm="50" fxLayoutAlign="center"
*ngFor="let widget of widgets.widget5.supporting | keys"
@ -367,8 +366,8 @@
</ngx-charts-pie-chart>
</div>
<div class="py-8 mh-16 border-top" fxLayout="row" fxLayoutAlign="start center"
fxLayoutWrap>
<div class="py-8 mh-16 border-top" fxLayout="row wrap" fxLayoutAlign="start center">
<div class="py-8 border-right" fxLayout="column" fxLayoutAlign="center center"
fxFlex="100" fxFlex.gt-sm="50">
<span class="mat-display-1 mb-0">
@ -442,7 +441,7 @@
<mat-tab label="Budget Summary">
<!-- WIDGET GROUP -->
<div class="widget-group grey-100-bg" fxLayout="row" fxFlex="100" fxLayoutWrap *fuseIfOnDom
<div class="widget-group grey-100-bg" fxLayout="row wrap" fxFlex="100" *fuseIfOnDom
[@animateStagger]="{value:'50'}">
<!-- WIDGET 8 -->
@ -496,7 +495,8 @@
</mat-form-field>
</div>
<div class="px-16 py-24" fxLayout="column" fxLayoutAlign="center" fxLayout.gt-xs="row"
<div class="px-16 py-24" fxLayout="column" fxLayoutAlign="center"
fxLayout.gt-xs="row"
fxLayoutAlign.gt-xs="space-between end">
<div fxFlex="0 1 auto">
<div class="h4 secondary-text">{{widgets.widget9.weeklySpent.title}}</div>
@ -523,7 +523,8 @@
</div>
</div>
<div class="px-16 py-24" fxLayout="column" fxLayoutAlign="center" fxLayout.gt-xs="row"
<div class="px-16 py-24" fxLayout="column" fxLayoutAlign="center"
fxLayout.gt-xs="row"
fxLayoutAlign.gt-xs="space-between end">
<div fxFlex="0 1 auto">
<div class="h4 secondary-text">{{widgets.widget9.totalSpent.title}}</div>
@ -550,7 +551,8 @@
</div>
</div>
<div class="px-16 py-24" fxLayout="column" fxLayoutAlign="center" fxLayout.gt-xs="row"
<div class="px-16 py-24" fxLayout="column" fxLayoutAlign="center"
fxLayout.gt-xs="row"
fxLayoutAlign.gt-xs="space-between end">
<div fxFlex="0 1 auto">
<div class="h4 secondary-text">{{widgets.widget9.remaining.title}}</div>
@ -641,7 +643,7 @@
<mat-tab label="Team Members">
<!-- WIDGET GROUP -->
<div class="widget-group grey-100-bg" fxLayout="row" fxFlex="100" fxLayoutWrap *fuseIfOnDom
<div class="widget-group grey-100-bg" fxLayout="row wrap" fxFlex="100" *fuseIfOnDom
[@animateStagger]="{value:'50'}">
<!-- WIDGET 11 -->

6
src/app/main/content/apps/e-commerce/dashboard/dashboard.component.html
View File

@ -4,7 +4,7 @@
<div class="content p-24 w-100-p">
<!-- WIDGET GROUP -->
<div class="widget-group" fxLayout="row" fxFlex="100" fxLayoutWrap fxLayoutAlign="start start" *fuseIfOnDom [@animateStagger]="{value:'50'}">
<div class="widget-group" fxLayout="row wrap" fxFlex="100" fxLayoutAlign="start start" *fuseIfOnDom [@animateStagger]="{value:'50'}">
<!-- WIDGET 1 -->
<fuse-widget [@animate]="{value:'*',params:{y:'100%'}}" class="widget" fxLayout="column" fxFlex="100" fxFlex.gt-xs="50" fxFlex.gt-md="25">
@ -191,7 +191,7 @@
<!-- Front -->
<div class="fuse-widget-front mat-white-bg mat-elevation-z2">
<div class="px-16 border-bottom" fxLayout="row" fxLayoutAlign="space-between center" fxLayoutWrap>
<div class="px-16 border-bottom" fxLayout="row wrap" fxLayoutAlign="space-between center">
<div fxFlex class="py-8 h3">{{widgets.widget5.title}}</div>
@ -259,7 +259,7 @@
</ngx-charts-pie-chart>
</div>
<div class="py-8 mh-16 border-top" fxLayout="row" fxLayoutAlign="start center" fxLayoutWrap>
<div class="py-8 mh-16 border-top" fxLayout="row wrap" fxLayoutAlign="start center">
<div class="py-8 border-right" fxLayout="column" fxLayoutAlign="center center" fxFlex="100" fxFlex.gt-sm="50">
<span class="mat-display-1 mb-0">{{widgets.widget6.footerLeft.count[widget6.currentRange]}}</span>
<span class="h4">{{widgets.widget6.footerLeft.title}}</span>

2
src/app/main/content/apps/e-commerce/product/product.component.html
View File

@ -125,7 +125,7 @@
<mat-tab label="Product Images">
<div class="tab-content p-24" fusePerfectScrollbar>
<div fxLayout="row" fxLayoutAlign="start start" fxLayoutWrap>
<div fxLayout="row wrap" fxLayoutAlign="start start">
<div *ngIf="product.images.length === 0"
class="product-image" fxlayout="row" fxLayoutAlign="center center">

4
src/app/main/content/apps/mail-ngrx/mail-details/mail-details.component.html
View File

@ -14,7 +14,7 @@
<div>
<div class="subject" flex>{{mail.subject}}</div>
<div class="labels" fxLayout="row" fxLayoutWrap>
<div class="labels" fxLayout="row wrap">
<div class="label" *ngFor="let labelId of mail.labels"
fxLayout="row" fxLayoutAlign="start center">
<div class="label-color" [ngStyle]="{'background-color': (labels$ | async) | getById:labelId:'color'}"></div>
@ -121,7 +121,7 @@
({{mail.attachments.length}})
</div>
<div class="attachment-list" fxLayout="row" fxLayoutWrap>
<div class="attachment-list" fxLayout="row wrap">
<div class="attachment" fxLayout="column"
*ngFor="let attachment of mail.attachments">

2
src/app/main/content/apps/mail-ngrx/mail-list/mail-list-item/mail-list-item.component.html
View File

@ -33,7 +33,7 @@
{{mail.message | htmlToPlaintext | slice:0:180}}{{mail.message.length > 180 ? '...' : ''}}
</div>
<div class="labels" fxLayout="row" fxLayoutWrap fxHide fxShow.gt-sm>
<div class="labels" fxLayout="row wrap" fxHide fxShow.gt-sm>
<div class="label" *ngFor="let labelId of mail.labels"
fxLayout="row" fxLayoutAlign="start center">
<div class="label-color"

4
src/app/main/content/apps/mail/mail-details/mail-details.component.html
View File

@ -14,7 +14,7 @@
<div>
<div class="subject" flex>{{mail.subject}}</div>
<div class="labels" fxLayout="row" fxLayoutWrap>
<div class="labels" fxLayout="row wrap">
<div class="label" *ngFor="let labelId of mail.labels"
fxLayout="row" fxLayoutAlign="start center">
<div class="label-color" [ngStyle]="{'background-color': labels | getById:labelId:'color'}"></div>
@ -122,7 +122,7 @@
({{mail.attachments.length}})
</div>
<div class="attachment-list" fxLayout="row" fxLayoutWrap>
<div class="attachment-list" fxLayout="row wrap">
<div class="attachment" fxLayout="column"
*ngFor="let attachment of mail.attachments">

2
src/app/main/content/apps/mail/mail-list/mail-list-item/mail-list-item.component.html
View File

@ -34,7 +34,7 @@
{{mail.message | htmlToPlaintext | slice:0:180}}{{mail.message.length > 180 ? '...' : ''}}
</div>
<div class="labels" fxLayout="row" fxLayoutWrap fxHide fxShow.gt-sm>
<div class="labels" fxLayout="row wrap" fxHide fxShow.gt-sm>
<div class="label" *ngFor="let labelId of mail.labels"
fxLayout="row" fxLayoutAlign="start center">
<div class="label-color"

2
src/app/main/content/apps/scrumboard/board/board.component.html
View File

@ -5,7 +5,7 @@
<!-- HEADER -->
<div class="header mat-accent-bg p-16 p-mat-24" [ngClass]="'mat-'+board.settings.color+'-bg'" fxLayout="column">
<div class="header-content" fxLayout="row" fxLayoutAlign="space-between" fxFlex="1 0 auto" fxLayoutWrap>
<div class="header-content" fxLayout="row wrap" fxLayoutAlign="space-between" fxFlex="1 0 auto">
<!-- BOARD SELECTION BUTTON -->
<div fxLayout="row" fxLayoutAlign="center center" fxFlexOrder="2" fxFlexOrder.gt-xs="1">

4
src/app/main/content/apps/scrumboard/board/list/card/card.component.html
View File

@ -15,9 +15,7 @@
<!-- /CARD SORT HANDLE -->
<!-- CARD LABELS -->
<div *ngIf="card.idLabels.length > 0"
class="list-card-labels"
fxLayout="row" fxLayoutWrap>
<div *ngIf="card.idLabels.length > 0" class="list-card-labels" fxLayout="row wrap">
<span class="list-card-label"
[ngClass]="board.labels | getById:labelId:'color'"

4
src/app/main/content/apps/scrumboard/scrumboard.component.html
View File

@ -6,8 +6,8 @@
</div>
<!-- BOARD LIST -->
<div class="board-list" fxFlex="0 0 auto" fxLayout="row" fxLayoutAlign="center center" fxLayoutWrap
*fuseIfOnDom [@animateStagger]="{value:'50'}">
<div class="board-list" fxFlex="0 0 auto" fxLayout="row wrap" fxLayoutAlign="center center" *fuseIfOnDom
[@animateStagger]="{value:'50'}">
<!-- BOARD -->
<div class="board-list-item" *ngFor="let board of boards"

2
src/app/main/content/apps/todo/todo-details/todo-details.component.html
View File

@ -63,7 +63,7 @@
</textarea>
</mat-form-field>
<div class="tags mb-24" fxFlexFill fxLayout="row" fxLayoutWrap>
<div class="tags mb-24" fxFlexFill fxLayout="row wrap">
<div class="tag" fxLayout="row" fxLayoutAlign="start center" *ngFor="let tagId of todo.tags">
<div class="tag-color" [ngStyle]="{'background-color': tags | getById:tagId:'color'}"></div>

2
src/app/main/content/apps/todo/todo-list/todo-list-item/todo-list-item.component.html
View File

@ -20,7 +20,7 @@
{{todo.notes}}
</div>
<div class="tags" fxLayout="row" fxLayoutAlign="start center" fxLayoutWrap>
<div class="tags" fxLayout="row wrap" fxLayoutAlign="start center">
<div class="tag" fxLayout="row" fxLayoutAlign="start center" *ngFor="let tagId of todo.tags">
<div class="tag-color" [ngStyle]="{'background-color': tags | getById:tagId:'color'}"></div>

2
src/app/main/content/pages/knowledge-base/knowledge-base.component.html
View File

@ -14,7 +14,7 @@
<!-- CONTENT -->
<div class="content p-24">
<div fxLayout="row" fxLayoutAlign="center" fxLayoutWrap>
<div fxLayout="row wrap" fxLayoutAlign="center">
<mat-nav-list class="articles-list mat-white-bg mat-elevation-z4" *ngFor="let category of knowledgeBase">

4
src/app/main/content/pages/pricing/style-1/style-1.component.html
View File

@ -20,7 +20,7 @@
<div class="content" fxLayout="column">
<!-- PRICE TABLES -->
<div class="price-tables" fxLayout="row" fxLayoutAlign="center center" fxLayoutWrap>
<div class="price-tables" fxLayout="row wrap" fxLayoutAlign="center center">
<div class="price-table style-1 mat-elevation-z4" fxLayout="column">
@ -131,7 +131,7 @@
</div>
<!-- / PRICE TABLES -->
<div class="faq" fxLayout="row" fxLayoutWrap>
<div class="faq" fxLayout="row wrap">
<div class="title" fxFlex="100">Frequently Asked Questions</div>

4
src/app/main/content/pages/pricing/style-2/style-2.component.html
View File

@ -20,7 +20,7 @@
<div class="content" fxLayout="column">
<!-- PRICE TABLES -->
<div class="price-tables" fxLayout="row" fxLayoutAlign="center center" fxLayoutWrap>
<div class="price-tables" fxLayout="row wrap" fxLayoutAlign="center center">
<div class="price-table style-2 mat-elevation-z4" fxLayout="column">
@ -117,7 +117,7 @@
</div>
<!-- / PRICE TABLES -->
<div class="faq" fxLayout="row" fxLayoutWrap>
<div class="faq" fxLayout="row wrap">
<div class="title" fxFlex="100">Frequently Asked Questions</div>

4
src/app/main/content/pages/pricing/style-3/style-3.component.html
View File

@ -20,7 +20,7 @@
<div class="content" fxLayout="column">
<!-- PRICE TABLES -->
<div class="price-tables" fxLayout="row" fxLayoutAlign="center center" fxLayoutWrap>
<div class="price-tables" fxLayout="row wrap" fxLayoutAlign="center center">
<div class="price-table style-3 mat-elevation-z4" fxLayout="column">
@ -112,7 +112,7 @@
</div>
<!-- / PRICE TABLES -->
<div class="faq" fxLayout="row" fxLayoutWrap>
<div class="faq" fxLayout="row wrap">
<div class="title" fxFlex="100">Frequently Asked Questions</div>

4
src/app/main/content/pages/profile/tabs/about/about.component.html
View File

@ -1,4 +1,4 @@
<div id="about" class="p-24" fxLayout="row" fxLayoutWrap>
<div id="about" class="p-24" fxLayout="row wrap">
<div class="about-content" fxLayout="column" fxFlex="100" fxFlex.gt-sm="50" fxFlex.gt-md="65">
@ -111,7 +111,7 @@
</div>
</header>
<div class="content" fxLayout="row" fxLayoutWrap>
<div class="content" fxLayout="row wrap">
<div class="friend" fxFlex="20" *ngFor="let friend of about.friends">
<img [src]="friend.avatar">
</div>

2
src/app/main/content/pages/profile/tabs/photos-videos/photos-videos.component.html
View File

@ -6,7 +6,7 @@
<span class="info">{{period.info}}</span>
</div>
<div class="period-media" fxLayout="row" fxLayoutWrap>
<div class="period-media" fxLayout="row wrap">
<div class="media" *ngFor="let media of period.media">
<img class="preview" [src]="media.preview" title="{{media.title}}">
<div class="title">{{media.title}}</div>

4
src/app/main/content/pages/profile/tabs/timeline/timeline.component.html
View File

@ -1,4 +1,4 @@
<div id="timeline" class="p-24" fxLayout="row" fxLayoutWrap>
<div id="timeline" class="p-24" fxLayout="row wrap">
<div class="timeline-content" fxLayout="column" fxFlex="100" fxFlex.gt-sm="55" fxFlex.gt-md="65">
@ -141,7 +141,7 @@
<div class="more secondary-text">See All</div>
</header>
<div class="content" fxLayout="row" fxLayoutWrap>
<div class="content" fxLayout="row wrap">
<div class="activities">
<div class="activity" fxLayout="row" fxLayoutAlign="start start"
*ngFor="let activity of timeline.activities">

2
src/app/main/content/ui/forms/forms.component.html
View File

@ -62,7 +62,7 @@
</div>
<div fxLayout="row" fxLayoutAlign="start center" fxFlex="1 0 auto" fxLayoutWrap>
<div fxLayout="row wrap" fxLayoutAlign="start center" fxFlex="1 0 auto">
<mat-form-field fxFlex="100">
<textarea matInput placeholder="Address" formControlName="address" required>

2
src/app/main/content/ui/icons/icons.component.html
View File

@ -37,7 +37,7 @@
</mat-form-field>
</div>
<div fxLayout="row" fxLayoutWrap>
<div fxLayout="row wrap">
<div class="icon-holder m-16" fxLayout="column" fxLayoutAlign="center center"
*ngFor="let icon of filteredIcons">

5
src/app/main/navbar/navbar.component.ts
View File

@ -19,6 +19,11 @@ export class FuseNavbarComponent implements OnDestroy
@ViewChild(FusePerfectScrollbarDirective) set directive(theDirective: FusePerfectScrollbarDirective)
{
if ( !theDirective )
{
return;
}
this.fusePerfectScrollbar = theDirective;
this.navigationServiceWatcher =