From 1da1fc0b2a806650cc997874e25cc6c5dac471ec Mon Sep 17 00:00:00 2001 From: Leonardo-Signorelli Date: Wed, 20 Mar 2024 15:01:30 +0100 Subject: [PATCH] generali fixes --- .DS_Store | Bin 0 -> 6148 bytes packages/.DS_Store | Bin 0 -> 6148 bytes packages/ketchup/src/chart.html | 9 ++-- .../kup-box/styles/kup-box-main.scss | 6 +-- .../standard/kup-card-standard-14.scss | 5 +- .../kup-data-table/kup-data-table.tsx | 2 +- .../styles/kup-data-table-main.scss | 49 +++++++++++------- .../styles/kup-data-table-sticky-header.scss | 2 +- .../kup-tree/styles/kup-tree-main.scss | 11 ++-- .../f-components/f-checkbox/f-checkbox.scss | 13 +++-- .../f-components/f-checkbox/f-checkbox.tsx | 4 +- .../src/managers/kup-theme/themes.json | 10 +++- 12 files changed, 69 insertions(+), 42 deletions(-) create mode 100644 .DS_Store create mode 100644 packages/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..b64458dbf1b37fdeacc7a2724ec3061759958363 GIT binary patch literal 6148 zcmeHKJE{Uf5bRci1rtNVxq>$sL{H!a-g_zr3JPMrk>~PgR)2UXyMl>{R6}>o^mNU# z6>M*dh|VvYnaD&$8n~fcEp*M!%{w;8i~`}f<5zaFmGkDjK6I-46UJ@i1m;@ykNm&m z@!dQ6Z)TPXPys4H1*iZO=u^OYFRU2{GExC5Kn4C4uP1mkY>o4p*akWsd8Y&UGhn*VsKBQcxC6qp6>R_j literal 0 HcmV?d00001 diff --git a/packages/.DS_Store b/packages/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..353dd0c3ece8ccfdd660856ef0bc3843db837c0d GIT binary patch literal 6148 zcmeHKOKL(v5Ufsw2yR?vIakOH1~Dh_0umJh5ey{m-^z34XjXp~k(carkx&giHPh2I z!_?ySYXG)5Zl8cTfGOP(Cm+V<`|cyVtB4WlJmVEdyl+1?`Lj3PX~u+0f-ZZ!#Iy# zg4jGj?1e)jBQ#4YF{xH9h9#ZxR(ZW}NK87cnh&d+tvVEo+j)MAbXZT+C literal 0 HcmV?d00001 diff --git a/packages/ketchup/src/chart.html b/packages/ketchup/src/chart.html index 3e5566dd67..fd1dbac7ec 100644 --- a/packages/ketchup/src/chart.html +++ b/packages/ketchup/src/chart.html @@ -44,6 +44,11 @@ +
@@ -104,13 +109,11 @@

Stacked series

Combo chart

- +

Timeline chart

- - diff --git a/packages/ketchup/src/components/kup-box/styles/kup-box-main.scss b/packages/ketchup/src/components/kup-box/styles/kup-box-main.scss index 684fe56da5..1649389239 100644 --- a/packages/ketchup/src/components/kup-box/styles/kup-box-main.scss +++ b/packages/ketchup/src/components/kup-box/styles/kup-box-main.scss @@ -58,10 +58,10 @@ .box-wrapper { display: flex; align-items: center; - background-color: var(--kup_box_background_color); - border-radius: var(--kup-radius-00); .box { + background-color: var(--kup_box_background_color); + border-radius: var(--kup-radius-00); flex-grow: 1; cursor: pointer; position: relative; @@ -84,7 +84,7 @@ } &.selected { - background-color: var(---kup_box_background_color_hover); + background-color: var(--kup_box_background_color_hover); & .box-section.titled > h3 { background-color: transparent; diff --git a/packages/ketchup/src/components/kup-card/standard/kup-card-standard-14.scss b/packages/ketchup/src/components/kup-card/standard/kup-card-standard-14.scss index c13f4e41be..809270ec4a 100644 --- a/packages/ketchup/src/components/kup-card/standard/kup-card-standard-14.scss +++ b/packages/ketchup/src/components/kup-card/standard/kup-card-standard-14.scss @@ -108,7 +108,7 @@ } .sub-formula { - padding: 0.5em; + padding: 0.5em 0; } .sub-chip { @@ -120,9 +120,10 @@ .sub-field { display: flex; flex-direction: column; + gap: var(--kup-space-03); &.has-content { border-bottom: 1px solid var(--kup-border-color); - padding: 0.5em 0.5em; + padding: 0.5em 0; } kup-date-picker:first-of-type, kup-time-picker:first-of-type { diff --git a/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx b/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx index 73b4b56825..c12de76fc4 100644 --- a/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx +++ b/packages/ketchup/src/components/kup-data-table/kup-data-table.tsx @@ -5749,7 +5749,7 @@ export class KupDataTable { ) : null} {this.insertMode !== '' ? ( { if (this.insertMode === 'form') { diff --git a/packages/ketchup/src/components/kup-data-table/styles/kup-data-table-main.scss b/packages/ketchup/src/components/kup-data-table/styles/kup-data-table-main.scss index c04eddcaf8..5958a2658b 100644 --- a/packages/ketchup/src/components/kup-data-table/styles/kup-data-table-main.scss +++ b/packages/ketchup/src/components/kup-data-table/styles/kup-data-table-main.scss @@ -67,6 +67,15 @@ 3px ); + --kup_datatable_background_color_hover: var( + --kup-datatable-background-color-hover, + var(--kup-gray-color-20) + ); + --kup_datatable_text_color_hover: var( + --kup-datatable-background-color-hover, + var(--kup-gray-color-80) + ); + display: block; font-family: var(--kup_datatable_font_family); font-size: var(--kup_datatable_font_size); @@ -111,7 +120,7 @@ table { &[#{$kup-dd-drag-over}] { td { &:first-of-type { - box-shadow: inset 4px 0px 0px 0px var(--kup-secondary-color); + box-shadow: inset 4px 0px 0px 0px var(--kup-gray-color-30); } } } @@ -157,22 +166,24 @@ table { } tfoot { - td { - border-bottom: var(--kup_datatable_border); - border-right: var(--kup_datatable_border); - box-sizing: border-box; - height: 36px; - text-align: right; - font-weight: bold; - padding: 0.5em 0.6em; - &:hover { - background-color: var(--kup_datatable_background_color); - } - &:first-of-type { - // border-left: var(--kup_datatable_border); - } - &:last-of-type { - border-right: none; + tr { + td { + border-bottom: var(--kup_datatable_border); + border-right: var(--kup_datatable_border); + box-sizing: border-box; + height: 36px; + text-align: right; + font-weight: bold; + padding: 0.5em 0.6em; + &:hover { + background-color: var(--kup_datatable_background_color); + } + &:first-of-type { + // border-left: var(--kup_datatable_border); + } + &:last-of-type { + border-right: none; + } } } } @@ -370,8 +381,8 @@ tbody { &:hover:not(.group):not(.selected) { td { - color: var(--kup-hover-color); - background-color: var(--kup-hover-background-color); + color: var(--kup_datatable_text_color_hover); + background-color: var(--kup_datatable_background_color_hover); } } diff --git a/packages/ketchup/src/components/kup-data-table/styles/kup-data-table-sticky-header.scss b/packages/ketchup/src/components/kup-data-table/styles/kup-data-table-sticky-header.scss index 14d3ffc45e..9a9d14e5aa 100644 --- a/packages/ketchup/src/components/kup-data-table/styles/kup-data-table-sticky-header.scss +++ b/packages/ketchup/src/components/kup-data-table/styles/kup-data-table-sticky-header.scss @@ -5,7 +5,7 @@ sticky-header { .persistent-header { & ~ sticky-header { background: var(--kup-gray-color-20); - box-shadow: 0px 0px 7.5px 0px rgba(128, 128, 128, 0.5); + // box-shadow: 0px 0px 7.5px 0px rgba(128, 128, 128, 0.5); color: var(--kup-title-color); display: block; opacity: 0; diff --git a/packages/ketchup/src/components/kup-tree/styles/kup-tree-main.scss b/packages/ketchup/src/components/kup-tree/styles/kup-tree-main.scss index d647fb2c84..04ad1b87a2 100644 --- a/packages/ketchup/src/components/kup-tree/styles/kup-tree-main.scss +++ b/packages/ketchup/src/components/kup-tree/styles/kup-tree-main.scss @@ -40,7 +40,6 @@ var(--kup-gray-color-30) ); - --kup_tree_border: var(--kup-tree-border, 1px solid var(--kup-border-color)); --kup_tree_text_color: var(--kup-tree-text-color, var(--kup-gray-color-70)); --kup_tree_header_text_color: var( --kup-tree-header-text-color, @@ -301,8 +300,8 @@ tfoot { td { - border-bottom: var(--kup_tree_border); - border-right: var(--kup_tree_border); + border-bottom: solid 1px var(--kup_tree_border_color); + border-right: solid 1px var(--kup_tree_border_color); box-sizing: border-box; height: 36px; text-align: right; @@ -313,7 +312,7 @@ tfoot { } &:first-of-type { border: none; - border-right: var(--kup_tree_border); + border-right: solid 1px var(--kup_tree_border_color); } } } @@ -339,8 +338,8 @@ tfoot { display: table-header-group; tr { - border-left: var(--kup_tree_border); - border-right: var(--kup_tree_border); + border-left: solid 1px var(--kup_tree_border_color); + border-right: solid 1px var(--kup_tree_border_color); th span { @include kup-heading-compact-01; } diff --git a/packages/ketchup/src/f-components/f-checkbox/f-checkbox.scss b/packages/ketchup/src/f-components/f-checkbox/f-checkbox.scss index cfaba3f16d..41e198ccb3 100644 --- a/packages/ketchup/src/f-components/f-checkbox/f-checkbox.scss +++ b/packages/ketchup/src/f-components/f-checkbox/f-checkbox.scss @@ -1,4 +1,9 @@ .f-checkbox { + --kup_danger_icon_color: var(--kup-danger-color, var(--kup-danger-color-50)); + --kup_warning_icon_color: var( + --kup-warning-color, + var(--kup-warning-color-40) + ); --kup_checkbox_disabled_checkmark_color: var( --kup-checkbox-disabled-checkmark-color, var(--kup-gray-color-10) @@ -214,7 +219,7 @@ } } .checkbox__error-message { - color: var(--kup-accent-red-color); + color: var(--kup_danger_icon_color); } } } @@ -233,17 +238,17 @@ } .checkbox__error-message { - color: var(--kup-accent-red-color); + color: var(--kup_danger_icon_color); } &.checkbox--error { .checkbox__background { - border-color: var(--kup-accent-red-color); + border-color: var(--kup_danger_icon_color); } } &.#{$kup-class-danger} { - --kup-checkbox-primary-color: var(--kup-danger-color); + --kup-checkbox-primary-color: var(--kup_danger_icon_color); --kup-checkbox-primary-color-rgb: var(--kup-danger-color-rgb); --kup-checkbox-text-on-primary-color: white; --kup-checkbox-text-on-primary-color-rgb: 255, 255, 255; diff --git a/packages/ketchup/src/f-components/f-checkbox/f-checkbox.tsx b/packages/ketchup/src/f-components/f-checkbox/f-checkbox.tsx index 5976da1c12..eed5ce2548 100644 --- a/packages/ketchup/src/f-components/f-checkbox/f-checkbox.tsx +++ b/packages/ketchup/src/f-components/f-checkbox/f-checkbox.tsx @@ -24,8 +24,8 @@ export const FCheckbox: FunctionalComponent = ( const propsFImage: FImageProps = { color: props.error - ? `var(--kup-accent-red-color)` - : `var(--kup-accent-orange-color)`, + ? `var(--kup_danger_icon_color)` + : `var(--kup_warning_icon_color)`, resource: props.error ? 'error' : 'warning', sizeX: '1.15em', sizeY: '1.15em', diff --git a/packages/ketchup/src/managers/kup-theme/themes.json b/packages/ketchup/src/managers/kup-theme/themes.json index 51afe7daa2..7321244b60 100644 --- a/packages/ketchup/src/managers/kup-theme/themes.json +++ b/packages/ketchup/src/managers/kup-theme/themes.json @@ -24,7 +24,15 @@ "--kup-gray-color-80": "#393939", "--kup-gray-color-90": "#262626", "--kup-gray-color-100": "#161616", - "--kup-danger-color-10": "da inserire il codice per il kup danger colors", + "--kup-danger-color-50": "#fa4d56", + "--kup-danger-color-60": "#da1e28", + "--kup-danger-color-70": "#ba1b23", + "--kup-danger-color-80": "#750e13", + "--kup-success-color-40": "#42be65", + "--kup-success-color-60": "#198038", + "--kup-info-color-50": "#4589ff", + "--kup-info-color-70": "#0043ce", + "--kup-warning-color-40": "#f1c21b", "--kup-background-color": "#ffffff", "--kup-navbar-background-color": "#161616", "--kup-navbar-color": "#ffffff",