From: Mark Otto <markdotto@gmail.com>
Date: Sat, 7 Jul 2018 23:16:43 +0000 (-0700)
Subject: Merge branch 'v4-dev' of https://github.com/malkomich/bootstrap into malkomich-v4-dev
X-Git-Tag: v4.2.0~406
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ad1049622fa409cd9ddf51a3f0f8a5c9d0c2483;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' of https://github.com/malkomich/bootstrap into malkomich-v4-dev
---

5ad1049622fa409cd9ddf51a3f0f8a5c9d0c2483
diff --cc docs/4.1/components/modal.md
index 3ed09170e1,56b4dfc2af..0ee0ae2413
--- a/docs/4.1/components/modal.md
+++ b/docs/4.1/components/modal.md
@@@ -480,8 -431,19 +481,19 @@@ Modals have three optional sizes, avail
  </div>
  
  {% highlight html %}
+ <!-- Extra large modal -->
+ <button class="btn btn-primary" data-toggle="modal" data-target=".bd-example-modal-xl">Extra large modal</button>
+ 
+ <div class="modal fade bd-example-modal-xl" tabindex="-1" role="dialog" aria-labelledby="myExtraLargeModalLabel" aria-hidden="true">
+   <div class="modal-dialog modal-xl">
+     <div class="modal-content">
+       ...
+     </div>
+   </div>
+ </div>
+ 
  <!-- Large modal -->
 -<button class="btn btn-primary" data-toggle="modal" data-target=".bd-example-modal-lg">Large modal</button>
 +<button type="button" class="btn btn-primary" data-toggle="modal" data-target=".bd-example-modal-lg">Large modal</button>
  
  <div class="modal fade bd-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
    <div class="modal-dialog modal-lg">
diff --cc scss/_variables.scss
index 6531a934f7,187632afc8..44c85e5f42
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -788,33 -770,33 +788,34 @@@ $badge-pill-border-radius:          10r
  // Modals
  
  // Padding applied to the modal body
 -$modal-inner-padding:         15px !default;
 +$modal-inner-padding:               1rem !default;
  
 -$modal-dialog-margin:         10px !default;
 -$modal-dialog-sm-up-margin-y: 30px !default;
 +$modal-dialog-margin:               .5rem !default;
 +$modal-dialog-margin-y-sm-up:       1.75rem !default;
  
 -$modal-title-line-height:     $line-height-base !default;
 +$modal-title-line-height:           $line-height-base !default;
  
 -$modal-content-bg:               $white !default;
 -$modal-content-border-color:     rgba($black,.2) !default;
 -$modal-content-border-width:     $border-width !default;
 -$modal-content-xs-box-shadow:    0 3px 9px rgba($black,.5) !default;
 -$modal-content-sm-up-box-shadow: 0 5px 15px rgba($black,.5) !default;
 +$modal-content-bg:                  $white !default;
 +$modal-content-border-color:        rgba($black, .2) !default;
 +$modal-content-border-width:        $border-width !default;
 +$modal-content-border-radius:       $border-radius-lg !default;
 +$modal-content-box-shadow-xs:       0 .25rem .5rem rgba($black, .5) !default;
 +$modal-content-box-shadow-sm-up:    0 .5rem 1rem rgba($black, .5) !default;
  
 -$modal-backdrop-bg:           $black !default;
 -$modal-backdrop-opacity:      .5 !default;
 -$modal-header-border-color:   $gray-lighter !default;
 -$modal-footer-border-color:   $modal-header-border-color !default;
 -$modal-header-border-width:   $modal-content-border-width !default;
 -$modal-footer-border-width:   $modal-header-border-width !default;
 -$modal-header-padding:        15px !default;
 +$modal-backdrop-bg:                 $black !default;
 +$modal-backdrop-opacity:            .5 !default;
 +$modal-header-border-color:         $gray-200 !default;
 +$modal-footer-border-color:         $modal-header-border-color !default;
 +$modal-header-border-width:         $modal-content-border-width !default;
 +$modal-footer-border-width:         $modal-header-border-width !default;
 +$modal-header-padding:              1rem !default;
  
 -$modal-xl:                    1140px !default;
 -$modal-lg:                    800px !default;
 -$modal-md:                    500px !default;
 -$modal-sm:                    300px !default;
++$modal-xl:                          1140px !default;
 +$modal-lg:                          800px !default;
 +$modal-md:                          500px !default;
 +$modal-sm:                          300px !default;
  
 -$modal-transition:            transform .3s ease-out !default;
 +$modal-transition:                  transform .3s ease-out !default;
  
  
  // Alerts