diff --git a/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-basic-example.component.html b/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-basic-example.component.html index 8d8da5ccd5c..f6f1ff67e92 100644 --- a/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-basic-example.component.html +++ b/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-basic-example.component.html @@ -1,25 +1,27 @@ -
- Size: 2 -
+
+
+ Size: 2 +
-
- Size: 8 -
+
+ Size: 8 +
-
- Size: 2 -
+
+ Size: 2 +
-
- Size: 4 -
+
+ Size: 4 +
-
- Size: 4 -
+
+ Size: 4 +
-
- Size: 4 +
+ Size: 4 +
diff --git a/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-growing-example.component.html b/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-growing-example.component.html index 65049509cdf..492a50f925a 100644 --- a/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-growing-example.component.html +++ b/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-growing-example.component.html @@ -1,11 +1,13 @@ -
- Growing column -
-
- Size: 5 -
-
- Growing column +
+
+ Growing column +
+
+ Size: 5 +
+
+ Growing column +
diff --git a/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-no-gap-example.component.html b/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-no-gap-example.component.html index 4e15236138e..77a3649b7df 100644 --- a/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-no-gap-example.component.html +++ b/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-no-gap-example.component.html @@ -1,81 +1,87 @@ -
- Size: 8 -
+
+
+ Size: 8 +
-
- Size: 4 -
+
+ Size: 4 +
-
- Size: 6 -
+
+ Size: 6 +
-
- Size: 6 -
+
+ Size: 6 +
-
- Size: 4 -
+
+ Size: 4 +
-
- Size: 8 +
+ Size: 8 +



-
- Size: 8 -
+
+
+ Size: 8 +
-
- Size: 4 -
+
+ Size: 4 +
-
- Size: 6 -
+
+ Size: 6 +
-
- Size: 6 -
+
+ Size: 6 +
-
- Size: 4 -
+
+ Size: 4 +
-
- Size: 8 +
+ Size: 8 +



-
- Size: 8 -
- -
- Size: 4 -
- -
- Size: 6 -
- -
- Size: 6 -
- -
- Size: 4 -
- -
- Size: 8 +
+
+ Size: 8 +
+ +
+ Size: 4 +
+ +
+ Size: 6 +
+ +
+ Size: 6 +
+ +
+ Size: 4 +
+ +
+ Size: 8 +
diff --git a/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-offset-example.component.html b/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-offset-example.component.html index 4cacfa0c82a..f69bd78bee1 100644 --- a/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-offset-example.component.html +++ b/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-offset-example.component.html @@ -1,37 +1,39 @@ -
- Size: 2 -
+
+
+ Size: 2 +
-
- - Size: 3
- Offset: 2 - -
+
+ + Size: 3
+ Offset: 2 + +
-
- - Size: 2
- Offset: 2 - -
+
+ + Size: 2
+ Offset: 2 + +
-
- Size: 4 -
+
+ Size: 4 +
-
- - Size: 2
- Offset: 1 - -
+
+ + Size: 2
+ Offset: 1 + +
-
- - Size: 4
- Offset: 1 - +
+ + Size: 4
+ Offset: 1 + +
diff --git a/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-responsive-example.component.html b/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-responsive-example.component.html index 00e6b9af2c7..b459cd782fa 100644 --- a/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-responsive-example.component.html +++ b/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-responsive-example.component.html @@ -1,17 +1,19 @@ -
- Sm: 12, Md: 6, Lg: 4, Xl: 3 -
+
+
+ Sm: 12, Md: 6, Lg: 4, Xl: 3 +
-
- Sm: 12, Md: 6, Lg: 4, Xl: 3 -
+
+ Sm: 12, Md: 6, Lg: 4, Xl: 3 +
-
- Sm: 12, Md: 6, Lg: 4, Xl: 3 -
+
+ Sm: 12, Md: 6, Lg: 4, Xl: 3 +
-
- Sm: 12, Md: 6, Lg: 4, Xl: 3 +
+ Sm: 12, Md: 6, Lg: 4, Xl: 3 +
diff --git a/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-responsive-offset-example.component.html b/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-responsive-offset-example.component.html index 5580cebc605..ccd6dea7f09 100644 --- a/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-responsive-offset-example.component.html +++ b/apps/docs/src/app/core/component-docs/layout-grid/examples/layout-grid-responsive-offset-example.component.html @@ -1,9 +1,11 @@ -
- Size: 4 -
+
+
+ Size: 4 +
-
- Size: 4 +
+ Size: 4 +
diff --git a/apps/docs/src/app/core/component-docs/wizard/examples/wizard-dialog-example.component.html b/apps/docs/src/app/core/component-docs/wizard/examples/wizard-dialog-example.component.html index 426c6c7c709..9a4d0266b70 100644 --- a/apps/docs/src/app/core/component-docs/wizard/examples/wizard-dialog-example.component.html +++ b/apps/docs/src/app/core/component-docs/wizard/examples/wizard-dialog-example.component.html @@ -165,91 +165,99 @@

4. Payment

1. Product Type

-
- -
-
- -
-
- Edit +
+
+ +
+
+ +
+
+ Edit +

2. Customer Information

-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Edit +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Edit +

3. Additional Information

-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- Edit +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ Edit +

4. Payment Information

-
-
-
-
-
-
-
- Edit +
+
+
+
+
+
+
+
+ Edit +
diff --git a/apps/docs/src/app/core/component-docs/wizard/examples/wizard-example.component.html b/apps/docs/src/app/core/component-docs/wizard/examples/wizard-example.component.html index 2c37ada90f2..fa35f09cadd 100644 --- a/apps/docs/src/app/core/component-docs/wizard/examples/wizard-example.component.html +++ b/apps/docs/src/app/core/component-docs/wizard/examples/wizard-example.component.html @@ -196,103 +196,111 @@

4. Payment

1. Product Type

-
- -
-
- -
-
- Edit +
+
+ +
+
+ +
+
+ Edit +

2. Customer Information

-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Edit +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Edit +

3. Additional Information

-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- Edit +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ Edit +

4. Payment Information

-
-
-
-
-
-
-
- Edit +
+
+
+
+
+
+
+
+ Edit +
diff --git a/apps/docs/src/app/core/component-docs/wizard/examples/wizard-visible-summary-example.component.html b/apps/docs/src/app/core/component-docs/wizard/examples/wizard-visible-summary-example.component.html index 9641e7cfc3e..5e18733fb2a 100644 --- a/apps/docs/src/app/core/component-docs/wizard/examples/wizard-visible-summary-example.component.html +++ b/apps/docs/src/app/core/component-docs/wizard/examples/wizard-visible-summary-example.component.html @@ -165,103 +165,111 @@

4. Payment

1. Product Type

-
- -
-
- -
-
- Edit +
+
+ +
+
+ +
+
+ Edit +

2. Customer Information

-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Edit +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Edit +

3. Additional Information

-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- Edit +
+
+
+
+
+ +
+
+
+
+
+ +
+
+
+
+
+ Edit +

4. Payment Information

-
-
-
-
-
-
-
- Edit +
+
+
+
+
+
+
+
+ Edit +
diff --git a/apps/docs/src/app/platform/component-docs/platform-wizard-generator/examples/wizard-generator-customizable-embeded-example.component.html b/apps/docs/src/app/platform/component-docs/platform-wizard-generator/examples/wizard-generator-customizable-embeded-example.component.html index 9ee89cef07a..532ef6e9de3 100644 --- a/apps/docs/src/app/platform/component-docs/platform-wizard-generator/examples/wizard-generator-customizable-embeded-example.component.html +++ b/apps/docs/src/app/platform/component-docs/platform-wizard-generator/examples/wizard-generator-customizable-embeded-example.component.html @@ -34,20 +34,22 @@

{{ step.name }} step

{{ group.title }} form

-
-
- +
+
+
+ +
-
-
-
- +
+
+ +
+
+
+ Edit
-
-
- Edit
diff --git a/apps/docs/src/app/platform/component-docs/platform-wizard-generator/examples/wizard-generator-customizable-example.component.html b/apps/docs/src/app/platform/component-docs/platform-wizard-generator/examples/wizard-generator-customizable-example.component.html index 707384c6e9f..ec41cd16313 100644 --- a/apps/docs/src/app/platform/component-docs/platform-wizard-generator/examples/wizard-generator-customizable-example.component.html +++ b/apps/docs/src/app/platform/component-docs/platform-wizard-generator/examples/wizard-generator-customizable-example.component.html @@ -56,20 +56,22 @@

{{ step.name }} step

{{ group.title }} form

-
-
- +
+
+
+ +
-
-
-
- +
+
+ +
+
+
+ Edit
-
-
- Edit
diff --git a/libs/core/src/lib/layout-grid/directives/layout-grid-col.directive.spec.ts b/libs/core/src/lib/layout-grid/directives/layout-grid-col.directive.spec.ts index 407f87c89b2..b4b729a503f 100644 --- a/libs/core/src/lib/layout-grid/directives/layout-grid-col.directive.spec.ts +++ b/libs/core/src/lib/layout-grid/directives/layout-grid-col.directive.spec.ts @@ -12,7 +12,14 @@ const XL_COL_SIZE = 3; @Component({ template: ` -
+
+
+
` }) diff --git a/libs/core/src/lib/layout-grid/layout-grid.component.html b/libs/core/src/lib/layout-grid/layout-grid.component.html new file mode 100644 index 00000000000..8a2f1d8d865 --- /dev/null +++ b/libs/core/src/lib/layout-grid/layout-grid.component.html @@ -0,0 +1,14 @@ + + + + + + +
+ +
+ + + + + diff --git a/libs/core/src/lib/layout-grid/layout-grid.component.ts b/libs/core/src/lib/layout-grid/layout-grid.component.ts index bf39528718e..e6af2fa7d3b 100644 --- a/libs/core/src/lib/layout-grid/layout-grid.component.ts +++ b/libs/core/src/lib/layout-grid/layout-grid.component.ts @@ -1,22 +1,26 @@ import { ChangeDetectionStrategy, Component, + ContentChildren, ElementRef, Input, OnChanges, OnInit, + QueryList, ViewEncapsulation } from '@angular/core'; import { applyCssClass } from '@fundamental-ngx/core/utils'; import { CssClassBuilder } from '@fundamental-ngx/core/utils'; + import { CSS_CLASS_NAME } from './constants'; +import { LayoutGridRowDirective } from './directives/layout-grid-row.directive'; /** * Use a layout grid to arrange components evenly in a grid layout. */ @Component({ selector: 'fd-layout-grid, [fdLayoutGrid]', - template: `
`, + templateUrl: './layout-grid.component.html', styleUrls: ['./layout-grid.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush @@ -41,6 +45,10 @@ export class LayoutGridComponent implements OnInit, OnChanges, CssClassBuilder { @Input() noVerticalGap: boolean; + /** @hidden */ + @ContentChildren(LayoutGridRowDirective) + _rowsQueryList: QueryList; + /** @hidden */ private _class = ''; diff --git a/libs/platform/src/lib/smart-filter-bar/components/smart-filter-bar-conditions-dialog/smart-filter-bar-conditions-dialog.component.html b/libs/platform/src/lib/smart-filter-bar/components/smart-filter-bar-conditions-dialog/smart-filter-bar-conditions-dialog.component.html index 7fdb5c3a13c..428a178b26d 100644 --- a/libs/platform/src/lib/smart-filter-bar/components/smart-filter-bar-conditions-dialog/smart-filter-bar-conditions-dialog.component.html +++ b/libs/platform/src/lib/smart-filter-bar/components/smart-filter-bar-conditions-dialog/smart-filter-bar-conditions-dialog.component.html @@ -12,37 +12,41 @@

{{ config.header }}

-
- - -
-
- +
+
+ + +
+
+ +
-
 
-
- +
+
 
+
+ +
diff --git a/libs/platform/src/lib/table/components/table-p13-dialog/filtering/filtering.component.html b/libs/platform/src/lib/table/components/table-p13-dialog/filtering/filtering.component.html index 103549dd014..91979ab0141 100644 --- a/libs/platform/src/lib/table/components/table-p13-dialog/filtering/filtering.component.html +++ b/libs/platform/src/lib/table/components/table-p13-dialog/filtering/filtering.component.html @@ -24,39 +24,41 @@

Filter

- - -
- + [rule]="rule" + (ruleChange)="_recalculateResetAvailability()" + (ruleStateChange)="_onRuleStateChange()" + > + +
+ - + +
@@ -68,40 +70,44 @@

Filter

- - -
- +
+ + +
+ - + +
diff --git a/libs/platform/src/lib/value-help-dialog/components/define-tab/define-tab.component.html b/libs/platform/src/lib/value-help-dialog/components/define-tab/define-tab.component.html index b7021080034..ba3c139750a 100644 --- a/libs/platform/src/lib/value-help-dialog/components/define-tab/define-tab.component.html +++ b/libs/platform/src/lib/value-help-dialog/components/define-tab/define-tab.component.html @@ -10,143 +10,147 @@ -
- - - - -
  • Include
    • - - - -     - -
  • Exclude
    • - - - -     -     -
    -
    -
    - -
    - - +
    +
    + + + + +
  • Include
    • + - -
    -
    - - + + + +
  • Exclude
    • + -     -
    - - -
    - - - + + + +
    +
    +
    + +
    + + - - -
    - + +
    +
    + + + + +
    + + +
    + + + + + + +
    +     +
    +
    +
    +
    -
    -
    -
    diff --git a/libs/platform/src/lib/value-help-dialog/value-help-dialog/value-help-dialog.component.html b/libs/platform/src/lib/value-help-dialog/value-help-dialog/value-help-dialog.component.html index a6e79936c1e..637caeee940 100644 --- a/libs/platform/src/lib/value-help-dialog/value-help-dialog/value-help-dialog.component.html +++ b/libs/platform/src/lib/value-help-dialog/value-help-dialog/value-help-dialog.component.html @@ -148,62 +148,64 @@
    [id]="'advanced-search-' + id" > -
    - -
    +
    +
    + +
    -
    - - - - - +
    + + + + + +
    - - -
    - - -
    +
    + + +
    + + +
    +     - -
    - +
    + +
    diff --git a/libs/platform/src/lib/wizard-generator/components/wizard-summary-step/wizard-summary-section/wizard-summary-section.component.html b/libs/platform/src/lib/wizard-generator/components/wizard-summary-step/wizard-summary-section/wizard-summary-section.component.html index 01f6b487da4..ae93a2d3469 100644 --- a/libs/platform/src/lib/wizard-generator/components/wizard-summary-step/wizard-summary-section/wizard-summary-section.component.html +++ b/libs/platform/src/lib/wizard-generator/components/wizard-summary-step/wizard-summary-section/wizard-summary-section.component.html @@ -1,22 +1,24 @@

    {{ group.title }}

    -
    -
    - +
    +
    +
    + +
    -
    -
    -
    - +
    +
    + +
    +
    +
    + + Edit +
    -
    -
    - - Edit -
    diff --git a/package-lock.json b/package-lock.json index f19bbddb40b..ffe046cc4cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17090,9 +17090,9 @@ "dev": true }, "fundamental-styles": { - "version": "0.24.0-rc.100", - "resolved": "https://registry.npmjs.org/fundamental-styles/-/fundamental-styles-0.24.0-rc.100.tgz", - "integrity": "sha512-AIS3J3k80XoVmtiToOOLTuYrVB/eSH29UJ0M5K7LcWIWWv3q32lMB5uwwfKQCOc8BuAgKbzKxbdu09k4PeO4Yw==" + "version": "0.24.0-rc.102", + "resolved": "https://registry.npmjs.org/fundamental-styles/-/fundamental-styles-0.24.0-rc.102.tgz", + "integrity": "sha512-cHKZnxX08ZghzgGjGxsGG/sve/dcwow3iLxt/3XMMwo34MNKBq6BaxO8fYw33Cht56vw06HOf5j+m/dQVihYdA==" }, "gauge": { "version": "4.0.2", diff --git a/package.json b/package.json index 106535c298d..04eb5d6488e 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "fast-deep-equal": "3.1.3", "focus-trap": "6.7.3", "focus-visible": "5.2.0", - "fundamental-styles": "0.24.0-rc.100", + "fundamental-styles": "0.24.0-rc.102", "highlight.js": "10.7.2", "intl": "1.2.5", "jasminewd2": "2.2.0",