rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00
Code Issues Actions Packages Releases Activity

Refactor figure image styles to use CSS class instead of child selector

Browse Source 
Refactoring according the comments on https://github.com/twbs/bootstrap/pull/18104.
Closes #18131
This commit is contained in:
Bass Jobsen 2015-11-02 20:56:24 +01:00 committed by Chris Rebert
parent e897eb4e04
commit 0d34169e1f
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/content/figures.md
View File

@ -6,11 +6,11 @@ group: content
Anytime you need to display a piece of content—like an image—with an optional caption, consider using a `<figure>`. Anytime you need to display a piece of content—like an image—with an optional caption, consider using a `<figure>`.
Use the included `.figure` and `.figure-caption` classes to provide some baseline styles for the HTML5 `<figure>` and `<figcaption>` elements. As a bonus, immediate children images are automatically responsive. Use the included `.figure` , `.figure-img` and `.figure-caption` classes to provide some baseline styles for the HTML5 `<figure>` and `<figcaption>` elements. Images in figures have no explicit size, so be sure to add the `.img-fluid` class to your `<img>` to make it responsive.
{% example html %} {% example html %}
<figure class="figure"> <figure class="figure">
<img data-src="holder.js/400x300" class="img-rounded" alt="A generic square placeholder image with rounded corners in a figure."> <img data-src="holder.js/400x300" class="figure-img img-fluid img-rounded" alt="A generic square placeholder image with rounded corners in a figure.">
<figcaption class="figure-caption">A caption for the above image.</figcaption> <figcaption class="figure-caption">A caption for the above image.</figcaption>
</figure> </figure>
{% endexample %} {% endexample %}
@ -19,7 +19,7 @@ Aligning the figure's caption is easy with our [text utilities]({{ site.baseurl
{% example html %} {% example html %}
<figure class="figure"> <figure class="figure">
<img data-src="holder.js/400x300" class="img-rounded" alt="A generic square placeholder image with rounded corners in a figure."> <img data-src="holder.js/400x300" class="figure-img img-fluid img-rounded" alt="A generic square placeholder image with rounded corners in a figure.">
<figcaption class="figure-caption text-right">A caption for the above image.</figcaption> <figcaption class="figure-caption text-right">A caption for the above image.</figcaption>
</figure> </figure>
{% endexample %} {% endexample %}

9
scss/_images.scss
View File

@ -40,12 +40,11 @@
.figure { .figure {
// Ensures the caption's text aligns with the image. // Ensures the caption's text aligns with the image.
display: inline-block; display: inline-block;
}
> img { .figure-img {
@extend .img-fluid; margin-bottom: ($spacer-y / 2);
margin-bottom: ($spacer-y / 2); line-height: 1;
line-height: 1;
}
} }
.figure-caption { .figure-caption {