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

fix / alignment token variable #2051

Merged
merged 9 commits into from
Sep 9, 2024
Merged
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
12 changes: 6 additions & 6 deletions packages/ketchup-showcase/src/mock/dataTable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15675,7 +15675,7 @@ export const subfile = {
span: {
col: 18,
},
style: { backgroundColor: 'var(--kup-warning-color)' },
style: { backgroundColor: 'var(--kup-warning-color-50)' },
},
COL01: {
value: '1000',
Expand All @@ -15684,7 +15684,7 @@ export const subfile = {
p: '',
k: '1000',
},
style: { backgroundColor: 'var(--kup-warning-color)' },
style: { backgroundColor: 'var(--kup-warning-color-50)' },
},
COL02: {
value: '1000',
Expand All @@ -15693,7 +15693,7 @@ export const subfile = {
p: '',
k: '1000',
},
style: { backgroundColor: 'var(--kup-warning-color)' },
style: { backgroundColor: 'var(--kup-warning-color-50)' },
},
COL03: {
value: '1000',
Expand All @@ -15702,7 +15702,7 @@ export const subfile = {
p: '',
k: '1000',
},
style: { backgroundColor: 'var(--kup-warning-color)' },
style: { backgroundColor: 'var(--kup-warning-colo-50)' },
},
COL04: {
value: '1000',
Expand All @@ -15711,7 +15711,7 @@ export const subfile = {
p: '',
k: '1000',
},
style: { backgroundColor: 'var(--kup-warning-color)' },
style: { backgroundColor: 'var(--kup-warning-color-50)' },
},
COL05: {
value: '1000',
Expand All @@ -15720,7 +15720,7 @@ export const subfile = {
p: '',
k: '1000',
},
style: { backgroundColor: 'var(--kup-warning-color)' },
style: { backgroundColor: 'var(--kup-warning-color-50)' },
},
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ function createComp() {
comp.id = 'demo-component';
comp.arcThickness = 30;
comp.colors = [
'var(--kup-success-color)',
'var(--kup-warning-color)',
'var(--kup-danger-color)',
'var(--kup-success-color-50)',
'var(--kup-warning-color-50)',
'var(--kup-danger-color-50)',
];
comp.firstThreshold = 33.3;
comp.labelDistance = 20;
Expand Down
4 changes: 2 additions & 2 deletions packages/ketchup/src/assets/data-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ const mockedRows = [
k: 'CASFRA',
},
info: {
color: 'var(--kup-warning-color)',
color: 'var(--kup-warning-color-50)',
icon: 'warning',
message: 'Warning message, thread carefully!',
},
Expand Down Expand Up @@ -894,7 +894,7 @@ const mockedRows = [
isEditable: true,
value: '2018-11-01',
info: {
color: 'var(--kup-danger-color)',
color: 'var(--kup-danger-color-60)',
icon: 'cancel',
message: 'Error message, whoops!',
},
Expand Down
2 changes: 1 addition & 1 deletion packages/ketchup/src/assets/input-panel.js
Original file line number Diff line number Diff line change
Expand Up @@ -1184,7 +1184,7 @@ const dataTableFiltersTest = {
k: 'CASFRA',
},
info: {
color: 'var(--kup-warning-color)',
color: 'var(--kup-warning-color-50)',
icon: 'warning',
message: 'Warning message, thread carefully!',
},
Expand Down
9 changes: 2 additions & 7 deletions packages/ketchup/src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { KupColorPickerEventPayload } from "./components/kup-color-picker/kup-co
import { KupComboboxEventPayload, KupComboboxIconClickEventPayload } from "./components/kup-combobox/kup-combobox-declarations";
import { KupGanttPlannerProps, KupPlannerBarDisplayProps, KupPlannerBarTask, KupPlannerCalendarProps, KupPlannerClickEventPayload, KupPlannerEventOption, KupPlannerEventPayload, KupPlannerGanttEvent, KupPlannerGanttProps, KupPlannerGanttRow, KupPlannerGanttTask, KupPlannerGanttTaskN, KupPlannerItemDetail, KupPlannerPhase, KupPlannerSwitcherProps, KupPlannerTask, KupPlannerTaskGanttContentProps, KupPlannerTaskGanttProps, KupPlannerTaskItemProps, KupPlannerTaskListProps, KupPlannerTaskType, KupPlannerUnloadEventPayload, KupPlannerViewMode, PlannerProps } from "./components/kup-planner/kup-planner-declarations";
import { KupDashboardEventPayload, KupDataDashboard } from "./components/kup-dashboard/kup-dashboard-declarations";
import { GroupLabelDisplayMode, GroupObject, KupDatatableClickEventPayload, KupDatatableColumnMenuEventPayload, KupDatatableColumnMoveEventPayload, KupDatatableColumnRemoveEventPayload, KupDataTableDataset, KupDatatableDeleteRowEventPayload, KupDatatableHistoryEventPayload, KupDataTableInsertMode, KupDatatableInsertRowEventPayload, KupDatatableLoadMoreClickEventPayload, KupDataTableRow, KupDatatableRowActionClickEventPayload, KupDatatableRowActionItemClickEventPayload, KupDatatableRowSelectedEventPayload, LoadMoreMode as LoadMoreMode1, PaginatorPos, SelectionMode, ShowGrid, SortObject, TotalsMap } from "./components/kup-data-table/kup-data-table-declarations";
import { GroupLabelDisplayMode, GroupObject, KupDatatableClickEventPayload, KupDatatableColumnMenuEventPayload, KupDatatableColumnMoveEventPayload, KupDatatableColumnRemoveEventPayload, KupDataTableDataset, KupDatatableDeleteRowEventPayload, KupDatatableHistoryEventPayload, KupDataTableInsertMode, KupDatatableInsertRowEventPayload, KupDatatableLoadMoreClickEventPayload, KupDataTableRow, KupDatatableRowActionItemClickEventPayload, KupDatatableRowSelectedEventPayload, LoadMoreMode as LoadMoreMode1, PaginatorPos, SelectionMode, ShowGrid, SortObject, TotalsMap } from "./components/kup-data-table/kup-data-table-declarations";
import { GenericFilter, KupGlobalFilterMode } from "./utils/filters/filters-declarations";
import { KupDatePickerEventPayload } from "./components/kup-date-picker/kup-date-picker-declarations";
import { KupDialogAutoCenter, KupDialogHeader, KupDialogModal } from "./components/kup-dialog/kup-dialog-declarations";
Expand Down Expand Up @@ -84,7 +84,7 @@ export { KupColorPickerEventPayload } from "./components/kup-color-picker/kup-co
export { KupComboboxEventPayload, KupComboboxIconClickEventPayload } from "./components/kup-combobox/kup-combobox-declarations";
export { KupGanttPlannerProps, KupPlannerBarDisplayProps, KupPlannerBarTask, KupPlannerCalendarProps, KupPlannerClickEventPayload, KupPlannerEventOption, KupPlannerEventPayload, KupPlannerGanttEvent, KupPlannerGanttProps, KupPlannerGanttRow, KupPlannerGanttTask, KupPlannerGanttTaskN, KupPlannerItemDetail, KupPlannerPhase, KupPlannerSwitcherProps, KupPlannerTask, KupPlannerTaskGanttContentProps, KupPlannerTaskGanttProps, KupPlannerTaskItemProps, KupPlannerTaskListProps, KupPlannerTaskType, KupPlannerUnloadEventPayload, KupPlannerViewMode, PlannerProps } from "./components/kup-planner/kup-planner-declarations";
export { KupDashboardEventPayload, KupDataDashboard } from "./components/kup-dashboard/kup-dashboard-declarations";
export { GroupLabelDisplayMode, GroupObject, KupDatatableClickEventPayload, KupDatatableColumnMenuEventPayload, KupDatatableColumnMoveEventPayload, KupDatatableColumnRemoveEventPayload, KupDataTableDataset, KupDatatableDeleteRowEventPayload, KupDatatableHistoryEventPayload, KupDataTableInsertMode, KupDatatableInsertRowEventPayload, KupDatatableLoadMoreClickEventPayload, KupDataTableRow, KupDatatableRowActionClickEventPayload, KupDatatableRowActionItemClickEventPayload, KupDatatableRowSelectedEventPayload, LoadMoreMode as LoadMoreMode1, PaginatorPos, SelectionMode, ShowGrid, SortObject, TotalsMap } from "./components/kup-data-table/kup-data-table-declarations";
export { GroupLabelDisplayMode, GroupObject, KupDatatableClickEventPayload, KupDatatableColumnMenuEventPayload, KupDatatableColumnMoveEventPayload, KupDatatableColumnRemoveEventPayload, KupDataTableDataset, KupDatatableDeleteRowEventPayload, KupDatatableHistoryEventPayload, KupDataTableInsertMode, KupDatatableInsertRowEventPayload, KupDatatableLoadMoreClickEventPayload, KupDataTableRow, KupDatatableRowActionItemClickEventPayload, KupDatatableRowSelectedEventPayload, LoadMoreMode as LoadMoreMode1, PaginatorPos, SelectionMode, ShowGrid, SortObject, TotalsMap } from "./components/kup-data-table/kup-data-table-declarations";
export { GenericFilter, KupGlobalFilterMode } from "./utils/filters/filters-declarations";
export { KupDatePickerEventPayload } from "./components/kup-date-picker/kup-date-picker-declarations";
export { KupDialogAutoCenter, KupDialogHeader, KupDialogModal } from "./components/kup-dialog/kup-dialog-declarations";
Expand Down Expand Up @@ -4868,7 +4868,6 @@ declare global {
"kup-datatable-contextmenu": KupDatatableClickEventPayload;
"kup-datatable-dblclick": KupDatatableClickEventPayload;
"kup-datatable-columnmenu": KupDatatableColumnMenuEventPayload;
"kup-datatable-rowactionclick": KupDatatableRowActionClickEventPayload;
"kup-datatable-loadmoreclick": KupDatatableLoadMoreClickEventPayload;
"kup-datatable-columnmove": KupDatatableColumnMoveEventPayload;
"kup-datatable-columnremove": KupDatatableColumnRemoveEventPayload;
Expand Down Expand Up @@ -6937,10 +6936,6 @@ declare namespace LocalJSX {
* Event fired when the history confirm button is pressed.
*/
"onKup-datatable-rowaction-item-click"?: (event: KupDataTableCustomEvent<KupDatatableRowActionItemClickEventPayload>) => void;
/**
* When a row action is clicked
*/
"onKup-datatable-rowactionclick"?: (event: KupDataTableCustomEvent<KupDatatableRowActionClickEventPayload>) => void;
/**
* When a row is selected
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}

:host(.#{$kup-class-warning}) {
--kup-accordion-primary-color: var(--kup-warning-40-color);
--kup-accordion-primary-color-rgb: var(--kup-warning-color-40-rgb);
--kup-accordion-primary-color: var(--kup-warning-50-color);
--kup-accordion-primary-color-rgb: var(--kup-warning-color-50-rgb);
--kup-accordion-text-on-primary-color: white;
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@
}

:host(.#{$kup-class-warning}) {
--kup-textfield-primary-color: var(--kup-warning-color);
--kup-textfield-primary-color-rgb: var(--kup-warning-color-rgb);
--kup-textfield-primary-color: var(--kup-warning-color-50);
--kup-textfield-primary-color-rgb: var(--kup-warning-color-50-rgb);
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}

:host(.#{$kup-class-danger}) {
--kup-button-primary-color: var(--kup-danger-color);
--kup-button-primary-color: var(--kup-danger-color-60);
--kup-button-primary-color-h: var(--kup-danger-color-h);
--kup-button-primary-color-s: var(--kup-danger-color-s);
--kup-button-primary-color-l: var(--kup-danger-color-l);
Expand Down Expand Up @@ -47,7 +47,7 @@
}

:host(.#{$kup-class-warning}) {
--kup-button-primary-color: var(--kup-warning-color);
--kup-button-primary-color: var(--kup-warning-color-50);
--kup-button-primary-color-h: var(--kup-warning-color-h);
--kup-button-primary-color-s: var(--kup-warning-color-s);
--kup-button-primary-color-l: var(--kup-warning-color-l);
Expand Down
4 changes: 0 additions & 4 deletions packages/ketchup/src/components/kup-cell/kup-cell.scss
lucafoscili marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,3 @@
height: 100%;
width: 100%;
}

#kup-component .f-cell.image-cell {
max-height: 100%;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

:host(.#{$kup-class-danger}) {
--kup-textfield-primary-color: var(--kup-danger-color);
--kup-textfield-primary-color: var(--kup-danger-color-60);
--kup-textfield-primary-color-rgb: var(--kup-danger-color-rgb);
}

Expand All @@ -37,6 +37,6 @@
}

:host(.#{$kup-class-warning}) {
--kup-textfield-primary-color: var(--kup-warning-color);
--kup-textfield-primary-color: var(--kup-warning-color-50);
--kup-textfield-primary-color-rgb: var(--kup-warning-color-rgb);
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
}

:host(.#{$kup-class-danger}) {
--kup-textfield-primary-color: var(--kup-danger-color);
--kup-textfield-primary-color: var(--kup-danger-color-60);
--kup-textfield-primary-color-rgb: var(--kup-danger-color-rgb);
}

Expand All @@ -39,7 +39,7 @@
}

:host(.#{$kup-class-warning}) {
--kup-textfield-primary-color: var(--kup-warning-color);
--kup-textfield-primary-color: var(--kup-warning-color-50);
--kup-textfield-primary-color-rgb: var(--kup-warning-color-rgb);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2820,8 +2820,8 @@ export class KupDataTable {
'kup-form { max-height: 40vh; overflow: auto; } .page-wrapper { display: grid; } ' +
'.button-wrapper { padding-top: 20px; display: flex; justify-content: space-around; z-index: var(--kup-card-zindex); } ' +
'.message-wrapper { display: none; justify-content: start; padding-top: 5px; padding-bottom: 5px; } ' +
'.errorIcon { --kup-icon-color: var(--kup-danger-color); } ' +
'.message { background-color: var(--kup-danger-color); color: white; padding: 3px; } ';
'.errorIcon { --kup-icon-color: var(--kup-danger-color-60); } ' +
'.message { background-color: var(--kup-danger-color-60); color: white; padding: 3px; } ';
this.#insertCard.append(style);

const pageWrapper = document.createElement('div');
Expand Down Expand Up @@ -5020,7 +5020,10 @@ export class KupDataTable {
}
>
{actionsOnRow.map((action) => (
<FImage {...action}></FImage>
<FImage
{...action}
color="var(--kup-text-secondary)"
></FImage>
))}
</td>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ th[#{$kup-dd-draggable}] {
}

&__remove {
border: 2px dashed var(--kup-danger-color);
border: 2px dashed var(--kup-danger-color-60);
}

&__groups,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

:host(.#{$kup-class-danger}) {
--kup-textfield-primary-color: var(--kup-danger-color);
--kup-textfield-primary-color: var(--kup-danger-color-60);
--kup-textfield-primary-color-rgb: var(--kup-danger-color-rgb);
}

Expand All @@ -37,6 +37,6 @@
}

:host(.#{$kup-class-warning}) {
--kup-textfield-primary-color: var(--kup-warning-color);
--kup-textfield-primary-color: var(--kup-warning-color-50);
--kup-textfield-primary-color-rgb: var(--kup-warning-color-rgb);
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}

:host(.#{$kup-class-danger}) {
--kup-button-primary-color: var(--kup-danger-color);
--kup-button-primary-color: var(--kup-danger-color-60);
--kup-button-primary-color-h: var(--kup-danger-color-h);
--kup-button-primary-color-s: var(--kup-danger-color-s);
--kup-button-primary-color-l: var(--kup-danger-color-l);
Expand Down Expand Up @@ -67,7 +67,7 @@
}

:host(.#{$kup-class-warning}) {
--kup-button-primary-color: var(--kup-warning-color);
--kup-button-primary-color: var(--kup-warning-color-50);
--kup-button-primary-color-h: var(--kup-warning-color-h);
--kup-button-primary-color-s: var(--kup-warning-color-s);
--kup-button-primary-color-l: var(--kup-warning-color-l);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}

:host(.#{$kup-class-danger}) {
--kup-list-primary-color: var(--kup-danger-color-50);
--kup-list-primary-color: var(--kup-danger-color-60);
--kup-list-primary-color-rgb: var(--kup-danger-color-rgb);
}

Expand All @@ -29,6 +29,6 @@
}

:host(.#{$kup-class-warning}) {
--kup-list-primary-color: var(--kup-warning-color-40);
--kup-list-primary-color: var(--kup-warning-color-50);
--kup-list-primary-color-rgb: var(--kup-warning-color-rgb);
}
11 changes: 8 additions & 3 deletions packages/ketchup/src/components/kup-nav-bar/kup-nav-bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,14 @@
);
--kup_navbar_background_color: var(
--kup-navbar-background-color,
var(--kup-layer-0-inverted)
var(--kup-layer-1-inverted)
);
--kup_navbar_box_shadow: var(
--kup-navbar-box-shadow,
0 2px 4px -1px rgba(128, 128, 128, 0.2),
0 4px 5px 0 rgba(128, 128, 128, 0.14),
0 1px 10px 0 rgba(128, 128, 128, 0.12)
);
--kup_navbar_padding: var(--kup-navbar-padding, 8px 12px);
--kup_navbar_position: var(--kup-navbar-position, fixed);
--kup_navbar_short_border_radius: var(
--kup-navbar-short-border-radius,
Expand Down Expand Up @@ -56,13 +55,13 @@

.nav-bar {
background-color: var(--kup_navbar_background_color);
// box-shadow: var(--kup_navbar_box_shadow);
box-sizing: border-box;
color: var(--kup_navbar_item_color);
display: flex;
flex-direction: column;
justify-content: space-between;
width: var(--kup_navbar_width);
padding: 0 var(--kup-space-05);

&--short {
border-radius: var(--kup_navbar_short_border_radius);
Expand Down Expand Up @@ -126,6 +125,12 @@
}
}

@media screen and (max-width: 678px) {
.nav-bar {
padding: 0 var(--kup-space-03);
}
}

::slotted(*) {
--kup-button-primary-color: var(--kup_navbar_item_color);
--kup-button-primary-color-rgb: var(--kup_navbar_item_color-rgb);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

:host(.#{$kup-class-danger}) {
--kup-textfield-primary-color: var(--kup-danger-color);
--kup-textfield-primary-color: var(--kup-danger-color-60);
--kup-textfield-primary-color-rgb: var(--kup-danger-color-rgb);
}

Expand All @@ -37,6 +37,6 @@
}

:host(.#{$kup-class-warning}) {
--kup-textfield-primary-color: var(--kup-warning-color);
--kup-textfield-primary-color: var(--kup-warning-color-50);
--kup-textfield-primary-color-rgb: var(--kup-warning-color-rgb);
}
2 changes: 2 additions & 0 deletions packages/ketchup/src/components/kup-tab-bar/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ Type: `Promise<void>`
### Used by

- [kup-card](../kup-card)
- [kup-input-panel](../kup-input-panel)

### Depends on

Expand Down Expand Up @@ -237,6 +238,7 @@ graph TD;
kup-tree --> kup-gauge
kup-tree --> kup-progress-bar
kup-tree --> kup-badge
kup-input-panel --> kup-tab-bar
style kup-tab-bar fill:#f9f,stroke:#333,stroke-width:4px
```

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

:host(.#{$kup-class-danger}) {
--kup-textfield-primary-color: var(--kup-danger-color);
--kup-textfield-primary-color: var(--kup-danger-color-60);
--kup-textfield-primary-color-rgb: var(--kup-danger-color-rgb);
--kup-list-primary-color: var(--kup-danger-color);
--kup-list-primary-color-rgb: var(--kup-danger-color-rgb);
Expand Down Expand Up @@ -45,8 +45,8 @@
}

:host(.#{$kup-class-warning}) {
--kup-textfield-primary-color: var(--kup-warning-color);
--kup-textfield-primary-color: var(--kup-warning-color-50);
--kup-textfield-primary-color-rgb: var(--kup-warning-color-rgb);
--kup-list-primary-color: var(--kup-warning-color);
--kup-list-primary-color: var(--kup-warning-color-50);
--kup-list-primary-color-rgb: var(--kup-warning-color-rgb);
}
Loading