Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Html specs corrections 5 #5227

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
4 changes: 0 additions & 4 deletions packages/default/scss/tabstrip/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@
flex-direction: row;
}

.k-tab-on-top {
z-index: 1;
}

.k-link {
padding-block: $kendo-tabstrip-item-padding-y;
padding-inline: $kendo-tabstrip-item-padding-x;
Expand Down
6 changes: 0 additions & 6 deletions packages/default/scss/toolbar/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,6 @@
}


// Angular specific
.k-toolbar-renderer {
display: inline-block;
border-color: inherit;
}

// Toolbar sizes
@each $size, $size-props in $kendo-toolbar-sizes {
$_padding-x: map.get( $size-props, padding-x );
Expand Down
4 changes: 0 additions & 4 deletions packages/fluent/scss/tabstrip/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,6 @@
flex-direction: row;
}

.k-tab-on-top {
z-index: 1;
}

.k-link {
padding-inline: var( --kendo-tabstrip-item-padding-x, #{$kendo-tabstrip-item-padding-x} );
padding-block: var( --kendo-tabstrip-item-padding-y, #{$kendo-tabstrip-item-padding-y} );
Expand Down
6 changes: 0 additions & 6 deletions packages/fluent/scss/toolbar/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,6 @@
gap: inherit;
}

// Angular specific
.k-toolbar-renderer {
display: inline-block;
border-color: inherit;
}

// Toolbar sizes
@each $size, $size-props in $kendo-toolbar-sizes {
$_padding-x: map.get( $size-props, padding-x );
Expand Down
1 change: 1 addition & 0 deletions packages/html/src/checkbox/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ export * from "./templates/checkbox-with-label-before";
export * from "./templates/checkbox-group-horizontal";
export * from "./templates/checkbox-group-normal";
export * from "./templates/checkbox-normal";
export * from "./templates/checkbox-checked";
3 changes: 3 additions & 0 deletions packages/html/src/checkbox/templates/checkbox-checked.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import Checkbox from "../checkbox.spec";

export const CheckboxChecked = (props: any) => <Checkbox checked {...props}/>;
8 changes: 4 additions & 4 deletions packages/html/src/checkbox/tests/checkbox-rounded.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Checkbox, CheckboxNormal } from '../../checkbox';
import { Checkbox, CheckboxChecked } from '../../checkbox';


const styles = `
Expand All @@ -21,15 +21,15 @@ export default () =>(
<>
<span>{rounded || 'none'}</span>
<span>
<CheckboxNormal size="small" rounded={rounded} checked />
<CheckboxChecked size="small" rounded={rounded} />
checkbox
</span>
<span>
<CheckboxNormal size="medium" rounded={rounded} checked />
<CheckboxChecked size="medium" rounded={rounded} />
checkbox
</span>
<span>
<CheckboxNormal size="large" rounded={rounded} checked />
<CheckboxChecked size="large" rounded={rounded} />
checkbox
</span>
</>
Expand Down
14 changes: 7 additions & 7 deletions packages/html/src/checkbox/tests/checkbox.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CheckboxWithLabelAfter } from '../templates/checkbox-with-label-after';
import { CheckboxNormal } from '../templates/checkbox-normal';

import { CheckboxChecked } from '../templates/checkbox-checked';

const styles = `
.k-ripple-container .k-checkbox:focus::after,
Expand All @@ -24,7 +24,7 @@ export default () =>(
</div>
<div>
<label className="k-checkbox-label">
<CheckboxNormal checked />
<CheckboxChecked />
Checked
</label>
</div>
Expand All @@ -33,7 +33,7 @@ export default () =>(
</div>
<div dir="rtl">
<label className="k-checkbox-label">
<CheckboxNormal checked />
<CheckboxChecked />
Checked
</label>
</div>
Expand All @@ -43,7 +43,7 @@ export default () =>(
</div>
<div>
<label className="k-checkbox-label">
<CheckboxNormal disabled checked />
<CheckboxChecked disabled />
Checked
</label>
</div>
Expand All @@ -52,7 +52,7 @@ export default () =>(
</div>
<div dir="rtl">
<label className="k-checkbox-label">
<CheckboxNormal disabled checked />
<CheckboxChecked disabled />
Checked
</label>
</div>
Expand Down Expand Up @@ -195,7 +195,7 @@ export default () =>(
</div>
<div>
<label className="k-checkbox-label">
<CheckboxNormal checked />
<CheckboxChecked />
Long label Vivamus a arcu lacus. Integer augue leo.
</label>
</div>
Expand All @@ -204,7 +204,7 @@ export default () =>(
</div>
<div dir="rtl">
<label className="k-checkbox-label">
<CheckboxNormal checked />
<CheckboxChecked />
Long label Vivamus a arcu lacus. Integer augue leo.
</label>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const ColumnMenuTabbed = (props) => (
<ColumnMenu
view="tabbed"
children={
<TabStripNormal header={false} className="k-pos-relative"
<TabStripNormal className="k-pos-relative"
tabStripItems={
<>
<TabStripItem active icon="filter" />
Expand Down
6 changes: 3 additions & 3 deletions packages/html/src/column-menu/tests/column-menu-tabbed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default () =>(

<section>
<ColumnMenuTabbed>
<TabStripNormal header={false} className="k-overflow-hidden"
<TabStripNormal className="k-overflow-hidden"
tabStripItems={
<>
<TabStripItem icon="filter" />
Expand Down Expand Up @@ -56,7 +56,7 @@ export default () =>(

<section>
<ColumnMenuTabbed>
<TabStripNormal header={false} className="k-overflow-hidden"
<TabStripNormal className="k-overflow-hidden"
tabStripItems={
<>
<TabStripItem active icon="filter" />
Expand All @@ -73,7 +73,7 @@ export default () =>(

<section>
<ColumnMenuTabbed>
<TabStripNormal header={false} className="k-pos-relative"
<TabStripNormal className="k-pos-relative"
tabStripItems={
<>
<TabStripItem active icon="filter" />
Expand Down
7 changes: 5 additions & 2 deletions packages/html/src/datetimepicker/datetimepicker.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export const DateTimePicker = (
/>
</Input>
{ opened &&
<Popup className={`k-${tab === "time" ? "list" : "calendar"}-container k-datetimepicker-popup`} dir={dir}>
<Popup className="k-datetime-container k-datetimepicker-popup" dir={dir}>
<DateTimeSelector tab={tab} dir={dir} />
</Popup>
}
Expand All @@ -146,7 +146,10 @@ export const DateTimePicker = (

<DateTimeSelector size="large" tab={tab} actionButtons={false} />

<ActionSheetFooter actions={[ 'Cancel', '!Set' ]} />
<ActionSheetFooter>
<Button text="Set" size="large" themeColor="primary" className="k-time-accept" />
<Button text="Cancel" size="large" themeColor="base" className="k-time-cancel" />
</ActionSheetFooter>
</ActionSheet>
}
</>
Expand Down
8 changes: 4 additions & 4 deletions packages/html/src/editor/tests/editor-find-replace.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ export default () =>(

<section>
<WindowNormal title="Find and Replace" actions={[ 'x' ]}>
<TabStripNormal header={false} className="k-editor-find-replace"
<TabStripNormal className="k-editor-find-replace"
tabStripItems={
<>
<TabStripItem className="k-tab-on-top" value="Find" active />
<TabStripItem value="Find" active />
<TabStripItem value="Replace" />
</>
}
Expand Down Expand Up @@ -76,11 +76,11 @@ export default () =>(

<section>
<WindowNormal className="k-editor-window" title="Find and Replace" actions={[ 'x' ]}>
<TabStripNormal header={false} className="k-editor-find-replace"
<TabStripNormal className="k-editor-find-replace"
tabStripItems={
<>
<TabStripItem value="Find" />
<TabStripItem className="k-tab-on-top" value="Replace" active />
<TabStripItem value="Replace" active />
</>
}
>
Expand Down
4 changes: 2 additions & 2 deletions packages/html/src/editor/tests/editor-table-wizard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default () =>(
<Button>Cancel</Button>
</>
}>
<TabStripNormal header={false}
<TabStripNormal
tabStripItems={
<>
<TabStripItem first active value="General"/>
Expand Down Expand Up @@ -138,7 +138,7 @@ export default () =>(
<Button>Cancel</Button>
</>
}>
<TabStripNormal header={false}
<TabStripNormal
tabStripItems={
<>
<TabStripItem first value="General"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const ExpansionPanel = (
<div className={classNames(
'k-expander-content-wrapper',
{
'k-d-none': !expanded
'k-hidden': !expanded
}
)}>
<div className="k-expander-content" style={contentStyle}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default () =>(
<Button icon="trash" fillMode="flat" themeColor="primary">Delete</Button>
</>
}>
<TabStripNormal header={false}
<TabStripNormal
tabStripItems={
<>
<TabStripItem first active value="General" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default () =>(
<Button icon="trash" fillMode="flat" themeColor="primary">Delete</Button>
</>
}>
<TabStripNormal header={false}
<TabStripNormal
tabStripItems={
<>
<TabStripItem first value="General" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default () =>(
<Button icon="trash" fillMode="flat" themeColor="primary">Delete</Button>
</>
}>
<TabStripNormal header={false}
<TabStripNormal
tabStripItems={
<>
<TabStripItem first value="General" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default () =>(
<Button icon="trash" fillMode="flat" themeColor="primary">Delete</Button>
</>
}>
<TabStripNormal header={false}
<TabStripNormal
tabStripItems={
<>
<TabStripItem first value="General" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default () =>(
<Button icon="trash" fillMode="flat" themeColor="primary">Delete</Button>
</>
}>
<TabStripNormal header={false}
<TabStripNormal
tabStripItems={
<>
<TabStripItem first value="General" />
Expand Down
10 changes: 5 additions & 5 deletions packages/html/src/grid/tests/grid-column-menu-tabbed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default () =>(
<section>
<Popup className="k-grid-columnmenu-popup">
<ColumnMenuTabbed>
<TabStripNormal header={false} className="k-overflow-hidden"
<TabStripNormal className="k-overflow-hidden"
tabStripItems={
<>
<TabStripItem active icon="filter" />
Expand All @@ -49,7 +49,7 @@ export default () =>(
<section>
<Popup className="k-grid-columnmenu-popup">
<ColumnMenuTabbed>
<TabStripNormal header={false} className="k-overflow-hidden"
<TabStripNormal className="k-overflow-hidden"
tabStripItems={
<>
<TabStripItem icon="filter" />
Expand Down Expand Up @@ -82,7 +82,7 @@ export default () =>(
<section>
<Popup className="k-grid-columnmenu-popup">
<ColumnMenuTabbed>
<TabStripNormal header={false} className="k-overflow-hidden"
<TabStripNormal className="k-overflow-hidden"
tabStripItems={
<>
<TabStripItem icon="filter" />
Expand Down Expand Up @@ -129,7 +129,7 @@ export default () =>(
<section>
<Popup className="k-grid-columnmenu-popup">
<ColumnMenuTabbed>
<TabStripNormal header={false} className="k-overflow-hidden"
<TabStripNormal className="k-overflow-hidden"
tabStripItems={
<>
<TabStripItem active icon="filter" />
Expand All @@ -148,7 +148,7 @@ export default () =>(
<section>
<Popup className="k-grid-columnmenu-popup">
<ColumnMenuTabbed>
<TabStripNormal header={false} className="k-pos-relative"
<TabStripNormal className="k-pos-relative"
tabStripItems={
<>
<TabStripItem active icon="filter" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ImageEditor } from "..";
import { ButtonGroup, ToolbarItem, ToolbarSeparator } from "../..";
import { Button } from "../../button";
import { Checkbox } from "../../checkbox";
import { CheckboxWithLabelAfter } from "../../checkbox";
import { DropdownList } from "../../dropdownlist";
import { FormNormal, Fieldset, FormField } from "../../form";
import { NumericTextbox } from "../../numerictextbox";
Expand Down Expand Up @@ -58,8 +58,7 @@ export const ImageEditorCrop = (props: any) => (
/>
<FormField
colSpan="2"
label="Lock aspect ratio:"
editor={ <Checkbox /> }
editor={ <CheckboxWithLabelAfter>Lock aspect ratio</CheckboxWithLabelAfter> }
/>
</Fieldset>
</FormNormal>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ImageEditor } from "..";
import { Button } from "../../button";
import { Checkbox } from "../../checkbox";
import { CheckboxWithLabelAfter } from "../../checkbox";
import { DropdownList } from "../../dropdownlist";
import { FormNormal, Fieldset, FormField } from "../../form";
import { NumericTextbox } from "../../numerictextbox";
Expand Down Expand Up @@ -53,8 +53,7 @@ export const ImageEditorResize = (props: any) => (
/>
<FormField
colSpan="2"
label="Lock aspect ratio:"
editor={ <Checkbox /> }
editor={ <CheckboxWithLabelAfter>Lock aspect ratio</CheckboxWithLabelAfter> }
/>
</Fieldset>
</FormNormal>
Expand Down
3 changes: 1 addition & 2 deletions packages/html/src/spreadsheet/spreadsheet-sheets-bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ export const SpreadsheetSheetsBar = (
tabStripItems={tabStripItems}
position="bottom"
scrollable
scrollButtonsPosition="end"
header={false} />
scrollButtonsPosition="end" />
</div>
);
};
Expand Down
Loading
Loading