From: Mark Otto <markdotto@gmail.com>
Date: Mon, 7 Dec 2015 00:29:35 +0000 (-0800)
Subject: Merge branch 'list-inline-padding' into v4-dev
X-Git-Tag: v4.0.0-alpha.2~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=239befe16b478d9709d97289ada132a4d218ba7b;p=thirdparty%2Fbootstrap.git

Merge branch 'list-inline-padding' into v4-dev
---

239befe16b478d9709d97289ada132a4d218ba7b
diff --cc scss/_variables.scss
index 9400d1bd69,b612e03ae8..57f2404b87
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -176,10 -176,8 +176,12 @@@ $blockquote-border-color:     $gray-lig
  $hr-border-color:             rgba(0,0,0,.1) !default;
  $hr-border-width:             $border-width !default;
  
 +$dt-font-weight:              bold !default;
 +
 +$nested-kbd-font-weight:      bold !default;
 +
+ $list-inline-padding:         5px !default;
+ 
  
  // Components
  //