From: Lenz Grimmer Date: Fri, 19 Jun 2020 09:14:26 +0000 (+0200) Subject: Merge pull request #35270 from callithea/wip-45232-octopus X-Git-Tag: v15.2.4~31 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cae4ccd411bb53fe89d040f020b6743f87826a47;p=ceph.git Merge pull request #35270 from callithea/wip-45232-octopus octopus: mgr/dashboard: Show table details inside the datatable Reviewed-by: Alfonso Martínez Reviewed-by: Kiefer Chang Reviewed-by: Sebastian Krah Reviewed-by: Stephan Müller --- cae4ccd411bb53fe89d040f020b6743f87826a47 diff --cc src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss index 9dccecba61f6,08f407b357c1..4a5f9ae8a626 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss @@@ -1,5 -1,12 +1,12 @@@ -@import 'styles'; +@import 'defaults.scss'; + @mixin row-details-icon { + font-family: 'ForkAwesome', sans-serif; + font-size: 1rem; + color: $gray-900; + line-height: 1; + } + .dataTables_wrapper { margin-bottom: 25px; .separator { @@@ -229,8 -243,30 +237,28 @@@ } } } + .datatable-row-detail { + padding: 20px; + border-bottom: 2px solid $color-table-header-border; + } + .expand-collapse-icon { + display: block; + height: 100%; + text-align: center; + &:hover { + text-decoration: none; + } + } + .expand-collapse-icon-right:before { + @include row-details-icon; + content: '\f105'; + } + .expand-collapse-icon-down:before { + @include row-details-icon; + content: '\f107'; + } } .datatable-footer { - @extend .p-2; - .selected-count, .page-count { font-style: italic;