kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Merge pull request #101 from twbs/institutional-memory

Browse source 
Revert "Images are responsive by default"
This commit is contained in:
Mark Otto 2015-04-16 17:03:58 -07:00
commit cd3bc6a089
3 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scss/_carousel.scss
View file

@ -21,7 +21,7 @@
// Account for jankitude on images
> img,
> a > img {
// @extend .img-responsive;
@extend .img-responsive;
line-height: 1;
}

11
scss/_scaffolding.scss
View file

@ -86,13 +86,14 @@ a {
// Images
img {
// Make them responsive with `max-width` and `height`
max-width: 100%;
height: auto;
// Match vertical alignment of most other Bootstrapped elements
vertical-align: middle;
}
// Responsive images (ensure images don't scale beyond their parents)
.img-responsive {
@include img-responsive();
}
// Rounded corners
.img-rounded {
@include border-radius($border-radius-lg);
@ -109,7 +110,7 @@ img {
@include box-shadow(0 1px 2px rgba(0,0,0,.075));
// Keep them at most 100% wide
// @include img-responsive(inline-block);
@include img-responsive(inline-block);
}
// Perfect circle

16
scss/mixins/_image.scss
View file

@ -1,3 +1,19 @@
// Image Mixins
// - Responsive image
// - Retina image
// Responsive image
//
// Keep images from scaling beyond the width of their parents.
@mixin img-responsive($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
}
// Retina image
//
// Short retina mixin for setting background-image and -size.