Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.
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
10 changes: 4 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ testem.log
/.chrome
!/test/karma.conf.js

src/apps/universal-app/package-lock.json
src/apps/universal-app/yarn.lock
src/apps/demo-app/yarn.lock
src/apps/demo-app/package-lock.json
src/apps/hello-world/package-lock.json
src/apps/hello-world/yarn.lock
projects/apps/universal-demo-app/package-lock.json
projects/apps/universal-demo-app/yarn.lock
projects/apps/demo-app/yarn.lock
projects/apps/demo-app/package-lock.json
yarn-error.log
.angular/cache
out-tsc
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Check out [all of the available options](https://github.com/angular/flex-layout/
### Demos

* [Explore Examples Online](https://tburleson-layouts-demos.firebaseapp.com/)
* [Demo Source Code](https://github.com/angular/flex-layout/blob/master/src/apps/demo-app/src/app/app.module.ts)
* [Demo Source Code](https://github.com/angular/flex-layout/blob/master/projects/apps/demo-app/src/app/app.module.ts)

### StackBlitz Templates

Expand Down
2 changes: 1 addition & 1 deletion docs/documentation/Adaptive-Layouts.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Developers can use the following directives to achieve some Adaptive UX goals:
For examples of `fxHide` usages in Adaptive layouts, please review the demo **Show & Hide Directives**:

* [Demo](https://tburleson-layouts-demos.firebaseapp.com/#/responsive)
* [Source](https://github.com/angular/flex-layout/blob/master/src/apps/demo-app/src/app/responsive/responsive-show-hide/responsive-show-hide.component.ts#L15)
* [Source](https://github.com/angular/flex-layout/blob/master/projects/apps/demo-app/src/app/responsive/responsive-show-hide/responsive-show-hide.component.ts#L15)

----

Expand Down
2 changes: 1 addition & 1 deletion docs/documentation/Live-Demos.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ available publically, but can be run with the following command:
`npm run universal:serve`

**Note**: This server, unlike the demo-app, does **not** live reload. In order to incorporate build
changes into the universal-app, it will need to be re-built/re-served each time.
changes into the universal-demo-app, it will need to be re-built/re-served each time.
2 changes: 1 addition & 1 deletion docs/documentation/Use-Cases.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ or used as fallback
* Custom set of breakpoints can be defined as a Provider
* Custom breakpoints will override ALL default breakpoints (no merging)

[Demo]: https://github.com/angular/flex-layout/blob/master/src/apps/demo-app/src/app/responsive/responsive-flex-order/responsive-flex-order.component.ts#L59
[Demo]: https://github.com/angular/flex-layout/blob/master/projects/apps/demo-app/src/app/responsive/responsive-flex-order/responsive-flex-order.component.ts#L59
2 changes: 1 addition & 1 deletion docs/documentation/Using-Angular-CLI.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,4 @@ System.config({
Developers are encouraged to review the live demos and source for the Flex-Layout Demos:

* [Live Demos](https://tburleson-layouts-demos.firebaseapp.com/)
* [Demo Source Code](https://github.com/angular/flex-layout/blob/master/src/apps/demo-app/)
* [Demo Source Code](https://github.com/angular/flex-layout/blob/master/projects/apps/demo-app/)
4 changes: 2 additions & 2 deletions docs/documentation/Using-SSR-with-Flex-Layout.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

Developers should see the Universal Demo app source for details:

* [main.server.ts](https://github.com/angular/flex-layout/blob/95a6e83bc9ce67a218d0b14e994ad41229b3ee75/src/apps/universal-app/src/main.server.ts)
* [app.server.module.ts](https://github.com/angular/flex-layout/blob/95a6e83bc9ce67a218d0b14e994ad41229b3ee75/src/apps/universal-app/src/app/app.server.module.ts)
* [main.server.ts](https://github.com/angular/flex-layout/blob/master/projects/apps/universal-demo-app/src/main.server.ts)
* [app.server.module.ts](https://github.com/angular/flex-layout/blob/master/projects/apps/universal-demo-app/src/app/app.server.module.ts)

> The `app.server.module` uses the *FlexLayoutServerModule* (instead of the FlexLayoutModule).

Expand Down
2 changes: 1 addition & 1 deletion docs/documentation/_Sidebar.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* [Best Performance](https://github.com/angular/flex-layout/wiki/Best-Performance)
* Demos
* [Live Online](https://tburleson-layouts-demos.firebaseapp.com/)
* [Source Code](https://github.com/angular/flex-layout/blob/master/src/apps/demo-app/src/app/app.module.ts#L28)
* [Source Code](https://github.com/angular/flex-layout/blob/master/projects/apps/demo-app/src/app/app.module.ts#L28)

* StackBlitz Templates
* [Flex-Layout Template](https://stackblitz.com/edit/angular-flex-layout-seed)
Expand Down
2 changes: 1 addition & 1 deletion docs/documentation/fxFlex-API.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ available. The flex-grow value overrides the width.
* **flex-shrink**: defines how much a flexbox item should **shrink** if there is **not enough** space available.
* **flex-basis**: controls the default size of an element, before it is manipulated by other Flexbox properties

[![fxFlex example](https://cloud.githubusercontent.com/assets/210413/21274996/6b640f8a-c390-11e6-87ac-ca85eb6c3983.png)](https://github.com/angular/flex-layout/blob/master/src/apps/demo-app/src/app/stack-overflow/grid-column-span/grid-column-span.component.ts#L23)
[![fxFlex example](https://cloud.githubusercontent.com/assets/210413/21274996/6b640f8a-c390-11e6-87ac-ca85eb6c3983.png)](https://github.com/angular/flex-layout/blob/master/projects/apps/demo-app/src/app/stack-overflow/grid-column-span/grid-column-span.component.ts#L23)

Note that the resizing occurs along the main-axis of the layout and maybe affected by the **fxLayoutAlign** options.

Expand Down