]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'box-shadow_issue_26377' of https://github.com/parammittal16/bootstrap...
authorMark Otto <markdotto@gmail.com>
Sat, 14 Jul 2018 21:04:39 +0000 (14:04 -0700)
committerMark Otto <markdotto@gmail.com>
Sat, 14 Jul 2018 21:04:39 +0000 (14:04 -0700)
1  2 
site/docs/4.1/examples/album/album.css
site/docs/4.1/examples/album/index.html
site/docs/4.1/examples/blog/blog.css
site/docs/4.1/examples/blog/index.html
site/docs/4.1/examples/checkout/form-validation.css
site/docs/4.1/examples/offcanvas/index.html
site/docs/4.1/examples/offcanvas/offcanvas.css
site/docs/4.1/examples/pricing/index.html
site/docs/4.1/examples/pricing/pricing.css
site/docs/4.1/examples/product/index.html
site/docs/4.1/examples/product/product.css

Simple merge
index 431ed88a3be48f7f4678da81a288eac85703132d,1c9661233e841b59316bb6afabb47fb280327fbe..7dae17a8a4e3f50e871ec0deebb31ef3524942d2
@@@ -72,8 -72,8 +72,8 @@@
      </div>
  
      <main role="main" class="container">
-       <div class="d-flex align-items-center p-3 my-3 text-white-50 bg-purple rounded box-shadow">
+       <div class="d-flex align-items-center p-3 my-3 text-white-50 bg-purple rounded shadow-sm">
 -        <img class="mr-3" src="https://getbootstrap.com/assets/brand/bootstrap-outline.svg" alt="" width="48" height="48">
 +        <img class="mr-3" src="../../assets/brand/bootstrap-outline.svg" alt="" width="48" height="48">
          <div class="lh-100">
            <h6 class="mb-0 text-white lh-100">Bootstrap</h6>
            <small>Since 2011</small>