diff --git a/scss/components/_list.scss b/scss/components/_list.scss index 2ccdc761..75319c29 100644 --- a/scss/components/_list.scss +++ b/scss/components/_list.scss @@ -94,7 +94,7 @@ padding: $ListItem-paddingY $ListItem-paddingX; margin-bottom: px2rem(-1px); background-color: $white; - border: $ListItem-borderWidth solid $ListItem-borderColor; + border: $ListItem-borderWidth solid $List-borderColor; &:first-child { border-top-left-radius: $borderRadius; diff --git a/scss/components/_table.scss b/scss/components/_table.scss index be12539d..745af683 100644 --- a/scss/components/_table.scss +++ b/scss/components/_table.scss @@ -215,11 +215,10 @@ } } - > thead > tr, - > tbody > tr { - background-color: $Table-thead-bg; - + > thead > tr { > th { + background-color: $Table-thead-bg; + &[colspan] { text-align: center; } @@ -237,6 +236,7 @@ &:not(:last-child) { border-right: $Table-thead-borderWidth solid $Table-thead-borderColor; } + border-bottom: $Table-thead-borderWidth solid $Table-thead-borderColor; font-size: $Table-thead-fontSize; color: $Table-thead-color; @@ -257,14 +257,29 @@ border-top: $Table-borderWidth solid $Table-borderColor; } + > thead > tr { + border-bottom: $Table-borderWidth solid $Table-borderColor; + } + > tbody > tr { - border-top: $Table-borderWidth solid $Table-borderColor; + & + tr { + border-top: $Table-borderWidth solid $Table-borderColor; + > th { + border-top: $Table-thead-borderWidth solid $Table-thead-borderColor; + } + } > th { background-color: $Table-thead-bg; + // font-size: $Table-thead-fontSize; + color: $Table-thead-color; + font-weight: $fontWeightNormal; + white-space: nowrap; + border-right: $Table-thead-borderWidth solid $Table-thead-borderColor; } - > td { + > td, + > th { padding: $TableCell-paddingY $TableCell-paddingX; vertical-align: top; diff --git a/scss/themes/cxd.scss b/scss/themes/cxd.scss index 8218fa33..88423762 100644 --- a/scss/themes/cxd.scss +++ b/scss/themes/cxd.scss @@ -22,7 +22,7 @@ $body-bg: #ffffff; $text-color: #666; $text--muted-color: #999; $text--loud-color: #333; -$borderColor: #e8ebee; +$borderColor: #eceff8; $link-onHover-decoration: none;