diff --git a/assets/stylesheets/bootstrap/_panels.scss b/assets/stylesheets/bootstrap/_panels.scss index 6c323d9004..84847b47b7 100644 --- a/assets/stylesheets/bootstrap/_panels.scss +++ b/assets/stylesheets/bootstrap/_panels.scss @@ -36,7 +36,11 @@ font-size: ceil(($font-size-base * 1.125)); color: inherit; - > a { + > a, + > small, + > .small, + > small > a, + > .small > a { color: inherit; } } diff --git a/assets/stylesheets/bootstrap/_tables.scss b/assets/stylesheets/bootstrap/_tables.scss index 63433619e8..affcc58c0b 100644 --- a/assets/stylesheets/bootstrap/_tables.scss +++ b/assets/stylesheets/bootstrap/_tables.scss @@ -111,7 +111,7 @@ th { // Default zebra-stripe styles (alternating gray and transparent backgrounds) .table-striped { - > tbody > tr:nth-child(odd) { + > tbody > tr:nth-of-type(odd) { background-color: $table-bg-accent; } } diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb index 06d321f8fe..1a088f820d 100644 --- a/lib/bootstrap-sass/version.rb +++ b/lib/bootstrap-sass/version.rb @@ -1,4 +1,4 @@ module Bootstrap VERSION = '3.3.1.0' - BOOTSTRAP_SHA = '8a1efe91df296e62bc560e51b462e9d51d31a988' + BOOTSTRAP_SHA = 'bf69fbdf1fb669eb077b641a63011c8f80b91421' end