From: Mark Otto <markdotto@gmail.com>
Date: Fri, 28 Oct 2016 03:02:59 +0000 (-0700)
Subject: Merge branch 'patch-1' of https://github.com/tomhorvat/bootstrap into tomhorvat-patch-1
X-Git-Tag: v4.0.0-alpha.6~486
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61b01f9b28090ea98ca51ff078014bb9c97660e7;p=thirdparty%2Fbootstrap.git

Merge branch 'patch-1' of https://github.com/tomhorvat/bootstrap into tomhorvat-patch-1
---

61b01f9b28090ea98ca51ff078014bb9c97660e7
diff --cc scss/_variables.scss
index cafd887c1e,46c06b0475..4b5af26ad0
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -218,9 -193,8 +218,10 @@@ $font-size-lg:   1.25rem !default
  $font-size-sm:   .875rem !default;
  $font-size-xs:   .75rem !default;
  
 -$font-weight-base: normal !default;
 +$font-weight-normal: normal !default;
 +$font-weight-bold: bold !default;
  
++$font-weight-base: $font-weight-normal !default;
  $line-height-base: 1.5 !default;
  
  $font-size-h1: 2.5rem !default;