From: Chris Rebert Date: Sun, 15 Nov 2015 07:24:48 +0000 (-0800) Subject: Add $table-border-width; refs #18150 X-Git-Tag: v4.0.0-alpha.2~96^2^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a66d2dd92dd703c0e58b466ff8a5a241f6f5e4d;p=thirdparty%2Fbootstrap.git Add $table-border-width; refs #18150 --- diff --git a/scss/_tables.scss b/scss/_tables.scss index d5dccefef5..8ec35b9d40 100644 --- a/scss/_tables.scss +++ b/scss/_tables.scss @@ -12,16 +12,16 @@ padding: $table-cell-padding; line-height: $line-height; vertical-align: top; - border-top: 1px solid $table-border-color; + border-top: $table-border-width solid $table-border-color; } thead th { vertical-align: bottom; - border-bottom: 2px solid $table-border-color; + border-bottom: (2 * $table-border-width) solid $table-border-color; } tbody + tbody { - border-top: 2px solid $table-border-color; + border-top: (2 * $table-border-width) solid $table-border-color; } .table { @@ -47,17 +47,17 @@ // Add borders all around the table and between all the columns. .table-bordered { - border: 1px solid $table-border-color; + border: $table-border-width solid $table-border-color; th, td { - border: 1px solid $table-border-color; + border: $table-border-width solid $table-border-color; } thead { th, td { - border-bottom-width: 2px; + border-bottom-width: (2 * $table-border-width); } } } @@ -114,7 +114,7 @@ // TODO: find out if we need this still. // - // border: 1px solid $table-border-color; + // border: $table-border-width solid $table-border-color; // -ms-overflow-style: -ms-autohiding-scrollbar; // See https://github.com/twbs/bootstrap/pull/10057 } @@ -160,11 +160,11 @@ th, td { - border-top: 1px solid $table-border-color; - border-left: 1px solid $table-border-color; + border-top: $table-border-width solid $table-border-color; + border-left: $table-border-width solid $table-border-color; &:last-child { - border-right: 1px solid $table-border-color; + border-right: $table-border-width solid $table-border-color; } } @@ -175,7 +175,7 @@ tr:last-child { th, td { - border-bottom: 1px solid $table-border-color; + border-bottom: $table-border-width solid $table-border-color; } } } @@ -187,7 +187,7 @@ th, td { display: block !important; - border: 1px solid $table-border-color; + border: $table-border-width solid $table-border-color; } } } diff --git a/scss/_variables.scss b/scss/_variables.scss index 13177bc10e..870cf00281 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -207,6 +207,7 @@ $table-bg-accent: #f9f9f9 !default; $table-bg-hover: #f5f5f5 !default; $table-bg-active: $table-bg-hover !default; +$table-border-width: $border-width !default; $table-border-color: $gray-lighter !default;