diff --git a/src/BootstrapBlazor/Components/Card/Card.css b/src/BootstrapBlazor/Components/Card/Card.css index f9abaf0ac20bc3fbd474b81484024258b4807094..0dc0721309853d351eb431636e9aa59e071dbf74 100644 --- a/src/BootstrapBlazor/Components/Card/Card.css +++ b/src/BootstrapBlazor/Components/Card/Card.css @@ -1,24 +1,29 @@ -.card .card-collapse { - flex: 1; - display: flex; - align-items: center; - cursor: pointer; +.card { + --bs-card-border-radius: var(--bs-border-radius); + --bs-card-inner-border-radius: calc(var(--bs-border-radius) - 1px); } - .card .card-collapse .card-collapse-body { - display: flex; + .card .card-collapse { flex: 1; + display: flex; align-items: center; - margin-left: .5rem; + cursor: pointer; } -.card .card-collapse-arrow { - transition: transform .3s linear; -} + .card .card-collapse .card-collapse-body { + display: flex; + flex: 1; + align-items: center; + margin-left: .5rem; + } -.card .is-open .card-collapse-arrow { - transform: rotate( 90deg); -} + .card .card-collapse-arrow { + transition: transform .3s linear; + } + + .card .is-open .card-collapse-arrow { + transform: rotate( 90deg); + } .card-shadow { transition: box-shadow .3s linear; diff --git a/src/BootstrapBlazor/Components/Table/Table.css b/src/BootstrapBlazor/Components/Table/Table.css index 7a016a3fae7905277589377394ef24a429c546c6..1f949b5e6f8aa74eed218d651ca129899660a25c 100644 --- a/src/BootstrapBlazor/Components/Table/Table.css +++ b/src/BootstrapBlazor/Components/Table/Table.css @@ -12,13 +12,14 @@ --bb-table-footer-font-weight: blod; --bb-table-footer-border-top: 2px solid #dee2e6; --bb-table-loader-bg: #f8f9fa; + --bb-table-card-row-padding: .75rem 0; } .table-container .table:not(.table-excel) .switch { --bb-switch-padding: 0; } - .table-container > :not(:first-child):not(.table-loader) { + .table-container > :where(:not(:first-child):not(.table-loader):not(.table-wrapper), :not(.table-toolbar) + .table-wrapper) { margin-top: .5rem; } @@ -30,7 +31,7 @@ } .table > :not(caption) > * > * { - padding: var(--bb-table-td-padding-x) var(--bb-table-td-padding-y); + padding: var(--bb-table-td-padding-y) var(--bb-table-td-padding-x); } .table-dark { @@ -196,21 +197,18 @@ padding-right: 0; } -.table-toolbar { - display: flex; +.table-toolbar:after { + content: ""; + display: block; + clear: both; } - .table-toolbar .table-toolbar-button .table-toolbar-search { - border-top-left-radius: var(--bs-border-radius); - border-bottom-left-radius: var(--bs-border-radius); - } - - .table-toolbar .dropdown-menu .dropdown-item span { - margin-left: 0.5rem; - } +.table-toolbar .table-toolbar-button { + margin-bottom: .5rem; +} -.table-pagination:not(.is-top) { - margin-top: 0.5rem; +.table-toolbar .dropdown-menu .dropdown-item span { + margin-left: .5rem; } .btn-gear .dropdown-menu { @@ -324,7 +322,7 @@ } .table-row { - padding: 0.75rem; + padding: var(--bb-table-card-row-padding); } .table-row:not(:last-child) { @@ -332,13 +330,13 @@ } .table-row:first-child { - border-top-left-radius: 4px; - border-top-right-radius: 4px; + border-top-left-radius: var(--bs-border-radius); + border-top-right-radius: var(--bs-border-radius); } .table-row:last-child { - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; + border-bottom-left-radius: var(--bs-border-radius); + border-bottom-right-radius: var(--bs-border-radius); } .table-row .table-cell:not(:last-child) { diff --git a/src/BootstrapBlazor/Components/Table/Table.razor b/src/BootstrapBlazor/Components/Table/Table.razor index 168c394e66996260905f1a745293cbe879c5079d..5919577b89fa9fbc6483f7db390b0502c51d68ba 100644 --- a/src/BootstrapBlazor/Components/Table/Table.razor +++ b/src/BootstrapBlazor/Components/Table/Table.razor @@ -28,7 +28,7 @@ } - @if(ShowToolbar) + @if(IsExcel || ShowToolbar) {