diff options
| author | Mark Otto <[email protected]> | 2015-09-02 00:33:26 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-09-02 00:33:26 -0700 |
| commit | 5fc4b3534989c1ea14c12c71ee08f88fd2bb22e9 (patch) | |
| tree | a5d6350a19ac862404ad80a2c44fea85dcdd0f2f /scss | |
| parent | 0c0f675b941f95f49ea24beb58eb2ee428c4c004 (diff) | |
| parent | 54fba7cbe598b92e76d98ac68c2b097a822a13f0 (diff) | |
| download | bootstrap-5fc4b3534989c1ea14c12c71ee08f88fd2bb22e9.tar.xz bootstrap-5fc4b3534989c1ea14c12c71ee08f88fd2bb22e9.zip | |
Merge pull request #17168 from kkirsche/patch-19
v4 - Rename .img-responsive class to .img-fluid
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_carousel.scss | 2 | ||||
| -rw-r--r-- | scss/_images.scss | 6 | ||||
| -rw-r--r-- | scss/_type.scss | 2 | ||||
| -rw-r--r-- | scss/mixins/_image.scss | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/scss/_carousel.scss b/scss/_carousel.scss index c7d182b5a..b02a2cd21 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -16,7 +16,7 @@ // Account for jankitude on images > img, > a > img { - @extend .img-responsive; + @extend .img-fluid; line-height: 1; } diff --git a/scss/_images.scss b/scss/_images.scss index dbdd858b8..eb7b4ce18 100644 --- a/scss/_images.scss +++ b/scss/_images.scss @@ -1,6 +1,6 @@ // Responsive images (ensure images don't scale beyond their parents) -.img-responsive { - @include img-responsive(); +.img-fluid { + @include img-fluid(); } // Rounded corners @@ -19,7 +19,7 @@ @include box-shadow(0 1px 2px rgba(0,0,0,.075)); // Keep them at most 100% wide - @include img-responsive(inline-block); + @include img-fluid(inline-block); } // Perfect circle diff --git a/scss/_type.scss b/scss/_type.scss index 2d2de68ec..597886db3 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -175,7 +175,7 @@ mark, display: inline-block; > img { - @extend .img-responsive; + @extend .img-fluid; margin-bottom: ($spacer-y / 2); line-height: 1; } diff --git a/scss/mixins/_image.scss b/scss/mixins/_image.scss index e5ae10a3c..db590e3c5 100644 --- a/scss/mixins/_image.scss +++ b/scss/mixins/_image.scss @@ -7,7 +7,7 @@ // // Keep images from scaling beyond the width of their parents. -@mixin img-responsive($display: block) { +@mixin img-fluid($display: block) { display: $display; max-width: 100%; // Part 1: Set a maximum relative to the parent height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching |