From: Mark Otto <markd.otto@gmail.com>
Date: Thu, 15 Jun 2017 03:59:02 +0000 (-0700)
Subject: Merge branch 'v4-dev' into rip-custom
X-Git-Tag: v4.0.0-beta~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e62b121226f26b72c8bc8dbb0698c16262bf6858;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' into rip-custom
---

e62b121226f26b72c8bc8dbb0698c16262bf6858
diff --cc scss/bootstrap-grid.scss
index f3699bc15d,722856c05c..4b2bddd5d3
--- a/scss/bootstrap-grid.scss
+++ b/scss/bootstrap-grid.scss
@@@ -22,6 -22,8 +22,7 @@@ html 
    box-sizing: inherit;
  }
  
 -@import "custom";
+ @import "functions";
  @import "variables";
  
  //
diff --cc scss/bootstrap-reboot.scss
index cdf59ab685,5965022a99..2700a57056
--- a/scss/bootstrap-reboot.scss
+++ b/scss/bootstrap-reboot.scss
@@@ -2,6 -2,8 +2,7 @@@
  //
  // Includes only Normalize and our custom Reboot reset.
  
 -@import "custom";
+ @import "functions";
  @import "variables";
  @import "mixins";
  
diff --cc scss/bootstrap.scss
index 9ab2210b31,239d062cf6..131d9b63df
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@@@ -5,13 -5,11 +5,10 @@@
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
   */
  
- // Core variables and mixins
 -@import "custom";
+ @import "functions";
  @import "variables";
  @import "mixins";
- 
  @import "print";
- 
- // Core CSS
  @import "reboot";
  @import "type";
  @import "images";