Skip to content

Commit

Permalink
Merge branch 'develop' into image-editor-action-pane
Browse files Browse the repository at this point in the history
  • Loading branch information
@Juveniel
Juveniel authored Dec 3, 2024
2 parents 3bd9fb2 + b044398 commit 4d214f3
Show file tree
Hide file tree
Showing 134 changed files with 1,024 additions and 1,232 deletions.
4 changes: 2 additions & 2 deletions packages/fluent/scss/grid/_layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -845,9 +845,9 @@
}

.k-grid-row-sticky td.k-grid-content-sticky,
.k-grid-row-sticky.k-alt td.k-grid-content-sticky,
.k-grid-row-sticky.k-table-alt-row td.k-grid-content-sticky,
.k-grid-row-sticky .k-table-td.k-grid-content-sticky,
.k-grid-row-sticky.k-alt .k-table-td.k-grid-content-sticky {
.k-grid-row-sticky.k-table-alt-row .k-table-td.k-grid-content-sticky {
z-index: 3;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/fluent/scss/pivotgrid/_layout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@
table-layout: auto;

.k-grid-footer,
.k-grid .k-alt {
.k-grid .k-table-alt-row {
font-weight: bold;
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/html/src/chart-wizard/tests/tab-data-sections-expanded.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default () => (
<Button icon="trash" fillMode="flat"></Button>
</TableTd>
</TableRow>
<TableRow className="k-master-row k-alt" alt>
<TableRow className="k-master-row" alt>
<TableTd className="k-drag-cell"><Icon icon="reorder"/></TableTd>
<TableTd>Series Name</TableTd>
<TableTd className="k-command-cell">
Expand All @@ -64,7 +64,7 @@ export default () => (
<Button icon="trash" fillMode="flat"></Button>
</TableTd>
</TableRow>
<TableRow className="k-master-row k-alt" alt>
<TableRow className="k-master-row" alt>
<TableTd className="k-drag-cell"><Icon icon="reorder"/></TableTd>
<TableTd>Series Name</TableTd>
<TableTd className="k-command-cell">
Expand Down
4 changes: 2 additions & 2 deletions packages/html/src/filemanager/templates/filemanager-grid-preview.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const FileManagerGridPreview = (props) => (
</BreadcrumbContainer>
</FileManagerBreadcrumb>

<Grid _renderAriaRoot className="k-filemanager-grid k-grid-display-block k-editable">
<Grid _renderAriaRoot className="k-filemanager-grid k-grid-display-block">
<GridHeader>
<div className="k-grid-header-wrap k-auto-scrollable">
<GridHeaderTable>
Expand Down Expand Up @@ -89,7 +89,7 @@ export const FileManagerGridPreview = (props) => (
<TableTd>13/12/2019 at 12:22:04 PM</TableTd>
<TableTd>0</TableTd>
</TableRow>
<TableRow className="k-master-row k-alt" alt>
<TableRow className="k-master-row" alt>
<TableTd>
<FilePreview name="file.png" icon="file" />
</TableTd>
Expand Down
4 changes: 2 additions & 2 deletions packages/html/src/filemanager/templates/filemanager-grid.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const FileManagerGrid = (props) => (
</BreadcrumbContainer>
</FileManagerBreadcrumb>

<Grid _renderAriaRoot className="k-filemanager-grid k-grid-display-block k-editable">
<Grid _renderAriaRoot className="k-filemanager-grid k-grid-display-block">
<GridHeader>
<div className="k-grid-header-wrap k-auto-scrollable">
<GridHeaderTable>
Expand Down Expand Up @@ -89,7 +89,7 @@ export const FileManagerGrid = (props) => (
<TableTd>13/12/2019 at 12:22:04 PM</TableTd>
<TableTd>0</TableTd>
</TableRow>
<TableRow className="k-master-row k-alt" alt>
<TableRow className="k-master-row" alt>
<TableTd>
<FilePreview name="file.png" icon="file" />
</TableTd>
Expand Down
6 changes: 3 additions & 3 deletions packages/html/src/filemanager/tests/filemanager-gridview-preview.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default () =>(
</BreadcrumbContainer>
</FileManagerBreadcrumb>

<Grid _renderAriaRoot className="k-filemanager-grid k-grid-display-block k-editable">
<Grid _renderAriaRoot className="k-filemanager-grid k-grid-display-block">
<GridHeader>
<div className="k-grid-header-wrap k-auto-scrollable">
<GridHeaderTable>
Expand Down Expand Up @@ -67,7 +67,7 @@ export default () =>(
<TableTd>13/12/2019 at 12:22:04 PM</TableTd>
<TableTd>0</TableTd>
</TableRow>
<TableRow className="k-master-row k-alt" alt selected>
<TableRow className="k-master-row" alt selected>
<TableTd>
<FilePreview name="file.png" icon="file" />
</TableTd>
Expand Down Expand Up @@ -111,7 +111,7 @@ export default () =>(
</BreadcrumbContainer>
</FileManagerBreadcrumb>

<Grid _renderAriaRoot className="k-filemanager-grid k-grid-display-block k-editable">
<Grid _renderAriaRoot className="k-filemanager-grid k-grid-display-block">
<GridHeader>
<div className="k-grid-header-wrap k-auto-scrollable">
<GridHeaderTable>
Expand Down
4 changes: 2 additions & 2 deletions packages/html/src/filemanager/tests/filemanager-gridview.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default () =>(
</BreadcrumbContainer>
</FileManagerBreadcrumb>

<Grid _renderAriaRoot className="k-filemanager-grid k-grid-display-block k-editable">
<Grid _renderAriaRoot className="k-filemanager-grid k-grid-display-block">
<GridHeader>
<div className="k-grid-header-wrap k-auto-scrollable">
<GridHeaderTable>
Expand Down Expand Up @@ -67,7 +67,7 @@ export default () =>(
<TableTd>13/12/2019 at 12:22:04 PM</TableTd>
<TableTd>0</TableTd>
</TableRow>
<TableRow className="k-master-row k-alt" alt selected>
<TableRow className="k-master-row" alt selected>
<TableTd>
<FilePreview name="file.png" icon="file" />
</TableTd>
Expand Down
12 changes: 6 additions & 6 deletions packages/html/src/gantt/templates/gantt-normal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,30 +65,30 @@ export const GanttNormal = ({ flexBasis = "30%", gridContentHeight = "180px", ta
<col />
</colgroup>
<TableTbody>
<TableRow className="k-treelist-group">
<TableRow>
<TableTd>7</TableTd>
<TableTd>
<Icon className="k-treelist-toggle" icon="caret-alt-down" />
Software validation, research and implementation
</TableTd>
</TableRow>
<TableRow className="k-alt" alt>
<TableRow alt>
<TableTd>18</TableTd>
<TableTd>
<Icon className="k-treelist-toggle" icon="none" />
<Icon className="k-treelist-toggle" icon="none" />
Project Kickoff
</TableTd>
</TableRow>
<TableRow className="k-treelist-group">
<TableRow>
<TableTd>11</TableTd>
<TableTd>
<Icon className="k-treelist-toggle" icon="none" />
<Icon className="k-treelist-toggle" icon="caret-alt-down" />
Research
</TableTd>
</TableRow>
<TableRow className="k-alt" alt>
<TableRow alt>
<TableTd>19</TableTd>
<TableTd>
<Icon className="k-treelist-toggle" icon="none" />
Expand Down Expand Up @@ -145,9 +145,9 @@ export const GanttNormal = ({ flexBasis = "30%", gridContentHeight = "180px", ta
</colgroup>
<TableTbody>
<TableRow><TableTd></TableTd></TableRow>
<TableRow className="k-alt" alt><TableTd></TableTd></TableRow>
<TableRow alt><TableTd></TableTd></TableRow>
<TableRow><TableTd></TableTd></TableRow>
<TableRow className="k-alt" alt><TableTd></TableTd></TableRow>
<TableRow alt><TableTd></TableTd></TableRow>
<TableRow><TableTd></TableTd></TableRow>
</TableTbody>
</GanttRowsTable>
Expand Down
14 changes: 7 additions & 7 deletions packages/html/src/gantt/templates/gantt-row-reordering.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const GanttRowReordering = ({ flexBasis = "30%", gridContentHeight = "180
</colgroup>
<TableThead>
<TableRow>
<GridHeaderCell className="k-drag-cell"></GridHeaderCell>
<GridHeaderCell></GridHeaderCell>
<GridHeaderCell menu={menu} rowspan={1} columnTitle="ID"></GridHeaderCell>
<GridHeaderCell menu={menu} rowspan={1} columnTitle="Title"></GridHeaderCell>
</TableRow>
Expand All @@ -68,15 +68,15 @@ export const GanttRowReordering = ({ flexBasis = "30%", gridContentHeight = "180
<col />
</colgroup>
<TableTbody>
<TableRow className="k-treelist-group">
<TableRow>
<TableTd className="k-drag-cell"><Icon icon="reorder" /></TableTd>
<TableTd>7</TableTd>
<TableTd>
<Icon className="k-treelist-toggle" icon="caret-alt-down" />
Software validation, research and implementation
</TableTd>
</TableRow>
<TableRow className="k-alt" alt>
<TableRow alt>
<TableTd className="k-drag-cell"><Icon icon="reorder" /></TableTd>
<TableTd>18</TableTd>
<TableTd>
Expand All @@ -85,7 +85,7 @@ export const GanttRowReordering = ({ flexBasis = "30%", gridContentHeight = "180
Project Kickoff
</TableTd>
</TableRow>
<TableRow className="k-treelist-group">
<TableRow>
<TableTd className="k-drag-cell"><Icon icon="reorder" /></TableTd>
<TableTd>11</TableTd>
<TableTd>
Expand All @@ -94,7 +94,7 @@ export const GanttRowReordering = ({ flexBasis = "30%", gridContentHeight = "180
Research
</TableTd>
</TableRow>
<TableRow className="k-alt" alt>
<TableRow alt>
<TableTd className="k-drag-cell"><Icon icon="reorder" /></TableTd>
<TableTd>19</TableTd>
<TableTd>
Expand Down Expand Up @@ -153,9 +153,9 @@ export const GanttRowReordering = ({ flexBasis = "30%", gridContentHeight = "180
</colgroup>
<TableTbody>
<TableRow><TableTd></TableTd></TableRow>
<TableRow className="k-alt" alt><TableTd></TableTd></TableRow>
<TableRow alt><TableTd></TableTd></TableRow>
<TableRow><TableTd></TableTd></TableRow>
<TableRow className="k-alt" alt><TableTd></TableTd></TableRow>
<TableRow alt><TableTd></TableTd></TableRow>
<TableRow><TableTd></TableTd></TableRow>
</TableTbody>
</GanttRowsTable>
Expand Down
6 changes: 3 additions & 3 deletions packages/html/src/gantt/tests/gantt-editing-popup-resources.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export default () =>(
<NumericTextbox value="40"/>
</TableTd>
</TableRow>
<TableRow className="k-alt" alt>
<TableRow alt>
<TableTd>
<span className="k-checkbox-wrap">
<Checkbox />
Expand All @@ -111,7 +111,7 @@ export default () =>(
<TableTd>Grid Cell</TableTd>
<TableTd>Grid Cell</TableTd>
</TableRow>
<TableRow className="k-alt" alt>
<TableRow alt>
<TableTd>
<span className="k-checkbox-wrap">
<Checkbox />
Expand All @@ -131,7 +131,7 @@ export default () =>(
<TableTd className="k-table-td">Grid Cell</TableTd>
<TableTd className="k-table-td">Grid Cell</TableTd>
</TableRow>
<TableRow className="k-alt" alt>
<TableRow alt>
<TableTd className="k-table-td">
<span className="k-checkbox-wrap">
<Checkbox />
Expand Down
Loading

0 comments on commit 4d214f3

Please sign in to comment.