From 0e8a186fe711bd3bc4fe631f98ccf35459b4c94c Mon Sep 17 00:00:00 2001 From: Vadim73i <55870906+Vadim73i@users.noreply.github.com> Date: Mon, 27 Jun 2022 18:55:09 +0400 Subject: [PATCH 01/23] EPMRPP-77870 || Launch description (#3154) * EPMRPP-77870 || Launch description * EPMRPP-77870 || code review 1 --- .../main/absRelTime/absRelTime.scss | 2 +- .../gridRow/checkboxCell/checkboxCell.jsx | 7 +++- .../gridRow/checkboxCell/checkboxCell.scss | 1 + .../gridBody/gridRow/gridCell/gridCell.jsx | 4 ++ .../main/grid/gridBody/gridRow/gridRow.jsx | 40 ++++++++++++++++++- .../main/grid/gridBody/gridRow/gridRow.scss | 21 ++++++++++ .../tables/launchesTable/launchesTable.jsx | 34 +++++++++++----- .../tables/launchesTable/launchesTable.scss | 14 +++++++ .../attributesBlock/attributesBlock.scss | 1 + .../pages/inside/common/itemInfo/itemInfo.jsx | 5 ++- .../inside/common/itemInfo/itemInfo.scss | 2 +- .../launchSuiteGrid/launchSuiteGrid.jsx | 16 +++++--- .../launchSuiteGrid/launchSuiteGrid.scss | 22 +++++++++- 13 files changed, 148 insertions(+), 21 deletions(-) diff --git a/app/src/components/main/absRelTime/absRelTime.scss b/app/src/components/main/absRelTime/absRelTime.scss index e930a76af6..f0f3398eb6 100644 --- a/app/src/components/main/absRelTime/absRelTime.scss +++ b/app/src/components/main/absRelTime/absRelTime.scss @@ -16,7 +16,7 @@ .abs-rel-time { display: inline-block; - min-height: 38px; + min-height: 40px; cursor: pointer; font-family: $FONT-REGULAR; font-size: 13px; diff --git a/app/src/components/main/grid/gridBody/gridRow/checkboxCell/checkboxCell.jsx b/app/src/components/main/grid/gridBody/gridRow/checkboxCell/checkboxCell.jsx index 66bc9ad71d..502ecc2840 100644 --- a/app/src/components/main/grid/gridBody/gridRow/checkboxCell/checkboxCell.jsx +++ b/app/src/components/main/grid/gridBody/gridRow/checkboxCell/checkboxCell.jsx @@ -25,10 +25,11 @@ export const CheckboxCell = ({ className, value, customProps: { selected, onChange, disabled }, + rowSpan, }) => ( -