From 3f676232af56a272148cf8cff0cbcb78a3d7eb4a Mon Sep 17 00:00:00 2001 From: Maksim Zakharov Date: Tue, 12 Jul 2022 09:22:20 +0300 Subject: fix tables global styles --- src/assets/styles/bmc/custom/_base.scss | 4 +- src/assets/styles/bmc/custom/_tables.scss | 347 ++++++++++++--------- .../SilaComponents/Tables/AccessoryTable.vue | 19 +- .../Tables/AccessoryTableDrivers.vue | 30 +- .../SilaComponents/Tables/AccessoryTablePower.vue | 18 +- .../Tables/AccessoryTableWithLabel.vue | 18 +- .../BMC/Configuration/BMCConfigurationTable.vue | 24 +- src/views/BMC/Firmware/FirmwarePage.vue | 42 +-- src/views/BMC/Settings/SettingsPage.vue | 31 +- .../Fans/DynamicInformation/IndicatorsTable.vue | 32 +- .../Fans/StaticInformation/FansStaticPage.vue | 46 +-- .../Inventory/InventoryTableAssembly.vue | 17 +- .../Inventory/InventoryTableBmcManager.vue | 54 +--- .../Inventory/InventoryTableChassis.vue | 19 +- .../Inventory/InventoryTableDimmSlot.vue | 19 +- .../Inventory/InventoryTableFans.vue | 19 +- .../Inventory/InventoryTablePowerSupplies.vue | 19 +- .../Inventory/InventoryTableProcessors.vue | 19 +- .../Inventory/InventoryTableSystem.vue | 22 +- src/views/MemoryModules/DynamicInfo/helpers.js | 14 - .../Specification/MemoryStaticPage.vue | 21 +- src/views/Motherboard/DynamicInfo/helpers.js | 14 - .../Specification/MotherboardSpecificationPage.vue | 14 +- .../Operations/ConsoleSettings/ConsoleSettings.vue | 25 +- src/views/PowerSupplies/DynamicInfo/helpers.js | 46 --- .../Specification/PowerStaticPage.vue | 17 +- src/views/Processors/DynamicInfo/helpers.js | 24 -- .../AcceleratorSpecificationTable.vue | 63 +--- .../Specification/ProcessorsSpecificationPage.vue | 1 + .../Specification/ProcessorsSpecificationTable.vue | 63 +--- .../SILA/AnalyticalPanel/AnalyticalPanelPage.vue | 55 +--- src/views/SILA/AnalyticalPanel/helpers.js | 4 - src/views/SILA/NetworkAdapters/Dynamic/helpers.js | 14 - .../EthernetAdapters/EthernetAdaptersPage.vue | 53 +--- .../FcHbaAdapters/FcHbaAdaptersPage.vue | 26 +- src/views/SILA/PciDevices/PciDevicesPage.vue | 60 +--- .../SILA/PhysicalDrivers/DynamicInfo/helpers.js | 26 +- .../StaticInfo/DriversStaticPage.vue | 17 +- src/views/SILA/RAID/Cache/RAIDCachePage.vue | 17 +- src/views/SILA/RAID/Settings/RAIDSettingsPage.vue | 36 +-- .../RAID/Specification/RAIDSpecificationPage.vue | 42 +-- .../SILA/VirtualDrivers/VirtualDriversPage.vue | 17 +- .../Certificates/Certificates.vue | 2 +- src/views/SecurityAndAccess/Sessions/Sessions.vue | 8 +- .../UserManagement/UserManagement.vue | 3 +- src/views/Settings/Network/Network.vue | 2 +- src/views/Settings/Network/TableDns.vue | 12 +- src/views/Settings/Network/TableIpv4.vue | 23 +- .../Info/InventoryTableSystem.vue | 16 +- .../Network/InventoryIPv4Settings.vue | 30 +- .../Network/InventoryIPv6Settings.vue | 19 +- .../SystemDescription/Network/SystemNetwork.vue | 1 + .../ServerParametrs/ServereParametrsSection.vue | 22 +- 53 files changed, 359 insertions(+), 1247 deletions(-) diff --git a/src/assets/styles/bmc/custom/_base.scss b/src/assets/styles/bmc/custom/_base.scss index 94cbecb5..1e3abf71 100644 --- a/src/assets/styles/bmc/custom/_base.scss +++ b/src/assets/styles/bmc/custom/_base.scss @@ -168,7 +168,7 @@ h6, } .modal-body, -.page-network dd, +#page-network dd, .page-inventory dd, .custom-radio, .regular-14px { @@ -182,7 +182,7 @@ h6, color: $text-secondary; } -.page-network dt, +#page-network dt, .page-inventory dt, .semi-bold-14px { font-family: 'Inter', sans-serif; diff --git a/src/assets/styles/bmc/custom/_tables.scss b/src/assets/styles/bmc/custom/_tables.scss index 29d85306..fefa007c 100644 --- a/src/assets/styles/bmc/custom/_tables.scss +++ b/src/assets/styles/bmc/custom/_tables.scss @@ -4,15 +4,6 @@ border-radius: 10px; td { - // border-top: 1px solid gray("300"); - // border-bottom: 1px solid gray("300"); - // &:first-of-type { - // border-left: 1px solid gray("300"); - - // } - // &:last-of-type { - // border-right: 1px solid gray("300"); - // } vertical-align: middle; // Table action buttons @@ -99,7 +90,6 @@ tr { &:not(:first-child) > td[aria-colindex='1'] { - // border-top: 1px solid gray("300"); padding-top: 0.625rem; } @@ -154,10 +144,6 @@ padding-left: 1rem; } } - - // .table.b-table.b-table-stacked-sm > tbody > tr > :first-child { - // border-top-width: 1px; - // } } .b-table-details > td { @@ -176,156 +162,39 @@ color: $indicators-succes !important; } -.bootstrap-table__stripes tr:nth-of-type(even) { - background-color: rgb(255 255 255); -} - -.bootstrap-table__stripes_odd tr:nth-of-type(odd) { - background-color: rgb(255 255 255); -} - -.bootstrap-table__head_bg { - border-top: none; - display: none; -} - -.bootstrap-table__column-first { - border-right: 1px solid rgba(26, 62, 91, 0.1); - border-top: none; -} - -.bootstrap-table__column-last { - border-top: none; -} - -.bootstrap-table__td { - border-top: 1px solid rgba(26, 62, 91, 0.1); -} - .bootstrap-table__section { position: relative; margin: 16px 2rem 24px 2rem; width: 90%; } - -.bootstrap-rounded-table { - border: 1px solid rgba(26, 62, 91, 0.3); - -moz-border-radius: 10px; - -webkit-border-radius: 10px; - border-radius: 10px; -} - -.bootstrap-rounded-table__column-first { - border-right: 1px solid rgba(26, 62, 91, 0.3) !important; - border-top: none !important; - border-radius: 10px 0 0 0; - -webkit-border-radius: 10px 0 0 0; - -moz-border-radius: 10px 0 0 0; -} - -.bootstrap-rounded-table__column-last { - border-top: none !important; - border-radius: 0 10px 0 0; - -webkit-border-radius: 0 10px 0 0; - -moz-border-radius: 0 10px 0 0; -} - -.bootstrap-rounded-table__column-center { - border-right: 1px solid rgba(26, 62, 91, 0.3) !important; - border-top: none !important; - border-radius: 0 0 0 0; - -webkit-border-radius: 0 0 0 0; - -moz-border-radius: 0 0 0 0; -} - -.bootstrap-rounded-table__without-border { - border-top: none !important; - border-radius: 0 0 0 0; - -webkit-border-radius: 0 0 0 0; - -moz-border-radius: 0 0 0 0; -} - -.bootstrap-rounded-table__head_bg { - background-color: $faint-secondary-primary-10 !important; - color: $text-primary !important; -} - -.bootstrap-rounded-table__td { - border-top: 1px solid rgba(26, 62, 91, 0.3) !important; - border-radius: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - -ms-border-radius: 0; - -o-border-radius: 0; - -khtml-border-radius: 0; - &:hover { - background-color: $faint-secondary-primary-5; - } -} - +// 1 // .bootstrap-table { border-top: none !important; border: 1px solid rgba(26, 62, 91, 0.1); background-color: $faint-secondary-primary-5; } -.bootstrap-analytical-table { - border: 1px solid rgba(26, 62, 91, 0.3); - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; -} - -.bootstrap-analytical-th { - border-bottom: 1px solid rgba(26, 62, 91, 0.3) !important; - background-color: $white !important; - color: $text-primary !important; -} - -.bootstrap-analytical-table__column-first { - border-top: none !important; - border-radius: 4px 0 0 0; - -webkit-border-radius: 4px 0 0 0; - -moz-border-radius: 4px 0 0 0; -} - -.bootstrap-analytical-table__column-last { - border-top: none !important; - border-radius: 0 4px 0 0; - -webkit-border-radius: 0 4px 0 0; - -moz-border-radius: 0 4px 0 0; -} - -.bootstrap-analytical-table__column-center { - border-top: none !important; - border-radius: 0 0 0 0; - -webkit-border-radius: 0 0 0 0; - -moz-border-radius: 0 0 0 0; -} - -.bootstrap-analytical-table__td { - padding: 10px !important; - border-radius: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - -ms-border-radius: 0; - -o-border-radius: 0; - -khtml-border-radius: 0; -} - -#table-session-logs, -#user-management-table, -#certificates-table { +// style for rounded tables +// add style for page ID +#page-inventory table, +#page-system-network table, +#page-network table, +#page-bmc-settings table, +#page-memory-specification table, +#page-processors table, +// add style for class +#main-content .table-rounded { -moz-border-radius: 10px; -webkit-border-radius: 10px; border-radius: 10px; border: 1px solid rgba(26, 62, 91, 0.3); background-color: none; + tr { border-radius: 10px 10px 0 0; -webkit-border-radius: 10px 10px 0 0; -moz-border-radius: 10px 10px 0 0; - //fonst-styles + // font styles font-family: 'Inter', sans-serif; font-size: 12px; font-style: normal; @@ -333,34 +202,206 @@ line-height: 16px; letter-spacing: 0em; text-align: left; - text-transform: uppercase; color: $text-primary; + &:hover { + background-color: $faint-secondary-primary-2-hover; + } + &.b-table-details:hover { + background-color: transparent; + } } + th { border-top: none; border-bottom: none; + text-transform: uppercase; border-left: 1px solid rgba(26, 62, 91, 0.3); background-color: $faint-secondary-primary-10 !important; color: $text-primary !important; + &:first-child { + border-left: none; + border-radius: 10px 0 0 0; + } + &:last-child { + border-right: none; + border-radius: 0 10px 0 0; + } + } + + td { + // font styles + font-family: 'Inter', sans-serif; + font-size: 12px; + font-style: normal; + font-weight: 500; + line-height: 20px; + letter-spacing: 0em; + text-align: left; + color: $text-secondary; + } +} +.table-network__icon { + max-width: 20%; + margin: 0 5px 0 auto !important; +} + +// stripes table // +#main-content .table-stripes { + border-top: none !important; + border: 1px solid rgba(26, 62, 91, 0.1); + background-color: $faint-secondary-primary-5; + tr:nth-of-type(even) { + background-color: rgb(255 255 255); + } + th { + border-top: none; + display: none; + &:first-child { + border-top: none; + } + &:last-child { + border-top: none; + } } - th:first-child { - border-left: none; - border-radius: 10px 0 0 0; + + td { + border-top: 1px solid rgba(26, 62, 91, 0.1); + // font styles + font-family: 'Inter', sans-serif; + font-size: 12px; + font-style: normal; + font-weight: 500; + line-height: 16px; + letter-spacing: 0em; + text-align: left; + color: $text-secondary; + &:first-child { + width: 70%; + } + &:first-child { + border-right: 1px solid rgba(26, 62, 91, 0.1); + } + .col > .custom-switch { + padding-top: 5px; + margin: -10px 0 0 auto; + } } - th:last-child { - border-left: none; - border-radius: 0 10px 0 0; +} + +// table accessory // +#main-content .table-accessory, +#main-content .table-firmware { + + th { + // padding: 10px 5px !important; + background-color: transparent !important; + color: $text-primary !important; + border-top: none !important; + border-bottom: 1px solid $faint-secondary-primary-10; + // font styles + font-family: 'Inter', sans-serif; + font-size: 12px; + font-style: normal; + font-weight: 600; + line-height: 16px; + letter-spacing: 0em; + text-align: left; } + td { + padding: 5px !important; + border-top: none !important; + // font styles + font-family: 'Inter', sans-serif; + font-size: 12px; + font-style: normal; + font-weight: 300; + line-height: 16px; + letter-spacing: 0em; + text-align: left; + color: $text-secondary; + } +} +#main-content .table-accessory{ + th { + padding: 10px 5px !important; + } +} +.bootstrap-table__section + .table.b-table + > thead + > tr + > [aria-sort='ascending'] { + background-image: url('~@/assets/images/event-logs/sort-icon-rotate.svg'); +} + +.bootstrap-table__section + .table.b-table + > thead + > tr + > [aria-sort='descending'], +.table.b-table > thead > tr > [aria-sort='none'] { + background-image: url('~@/assets/images/event-logs/sort-icon.svg'); +} + +// table analytical // +#main-content .table-analytical { + border: 1px solid rgba(26, 62, 91, 0.3); + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + tr { + border-top: none !important; + border-radius: 0 0 0 0; + -webkit-border-radius: 0 0 0 0; + -moz-border-radius: 0 0 0 0; &:hover { background-color: $faint-secondary-primary-2-hover; } - //fonst-styles + &.b-table-details:hover { + background-color: transparent; + } + } + + th { + border-top: none !important; + border-bottom: 1px solid rgba(26, 62, 91, 0.3) !important; + background-color: $white !important; + color: $text-primary !important; + // font styles + font-family: 'Inter', sans-serif; + font-size: 12px; + font-style: normal; + font-weight: 600; + line-height: 16px; + letter-spacing: 0em; + text-align: left; + text-transform: uppercase; + color: $text-primary; + &:first-child { + border-radius: 4px 0 0 0; + -webkit-border-radius: 4px 0 0 0; + -moz-border-radius: 4px 0 0 0; + } + &:last-child { + border-radius: 0 4px 0 0; + -webkit-border-radius: 0 4px 0 0; + -moz-border-radius: 0 4px 0 0; + } + } + + td { + border-top: none !important; + padding: 10px !important; + border-radius: 0; + -webkit-border-radius: 0; + -moz-border-radius: 0; + // font styles font-family: 'Inter', sans-serif; font-size: 12px; font-style: normal; font-weight: 500; - line-height: 20px; + line-height: 16px; letter-spacing: 0em; text-align: left; color: $text-secondary; diff --git a/src/components/Global/SilaComponents/Tables/AccessoryTable.vue b/src/components/Global/SilaComponents/Tables/AccessoryTable.vue index 2b25d880..4cb64929 100644 --- a/src/components/Global/SilaComponents/Tables/AccessoryTable.vue +++ b/src/components/Global/SilaComponents/Tables/AccessoryTable.vue @@ -1,8 +1,10 @@