rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

Change .img-polaroid to .img-thumbnail

Browse Source 
* Same code, but different classes was confusing
* Now .img-thumbnail just extends .thumbnail
This commit is contained in:
Mark Otto 2013-01-17 20:16:04 -08:00
parent 89b6477bdc
commit ca74b9882b
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docs/assets/css/bootstrap.css vendored
View File

@ -262,13 +262,17 @@ img {
border-radius: 6px;
}
.img-polaroid {
.img-thumbnail {
display: block;
display: inline-block;
padding: 4px;
background-color: #fff;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.2);
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
line-height: 20px;
border: 1px solid #ddd;
border-radius: 4px;
-webkit-transition: all 0.2s ease-in-out;
-moz-transition: all 0.2s ease-in-out;
-o-transition: all 0.2s ease-in-out;
transition: all 0.2s ease-in-out;
}
.img-circle {

4
docs/css.html
View File

@ -1875,12 +1875,12 @@ For example, <code><section></code> should be wrapped
<div class="bs-docs-example bs-docs-example-images">
<img data-src="holder.js/140x140" class="img-rounded">
<img data-src="holder.js/140x140" class="img-circle">
<img data-src="holder.js/140x140" class="img-polaroid">
<img data-src="holder.js/140x140" class="img-thumbnail">
</div>
<pre class="prettyprint linenums">
&lt;img src="..." class="img-rounded"&gt;
&lt;img src="..." class="img-circle"&gt;
&lt;img src="..." class="img-polaroid"&gt;
&lt;img src="..." class="img-thumbnail"&gt;
</pre>
</section>

4
docs/templates/pages/css.mustache vendored
View File

@ -1814,12 +1814,12 @@ For example, &lt;code&gt;&amp;lt;section&amp;gt;&lt;/code&gt; should be wrapped
<div class="bs-docs-example bs-docs-example-images">
<img data-src="holder.js/140x140" class="img-rounded">
<img data-src="holder.js/140x140" class="img-circle">
<img data-src="holder.js/140x140" class="img-polaroid">
<img data-src="holder.js/140x140" class="img-thumbnail">
</div>
<pre class="prettyprint linenums">
&lt;img src="..." class="img-rounded"&gt;
&lt;img src="..." class="img-circle"&gt;
&lt;img src="..." class="img-polaroid"&gt;
&lt;img src="..." class="img-thumbnail"&gt;
</pre>
</section>

11
less/scaffolding.less
View File

@ -77,13 +77,10 @@ img {
border-radius: 6px;
}
// Add polaroid-esque trim
.img-polaroid {
padding: 4px;
background-color: #fff;
border: 1px solid #ccc;
border: 1px solid rgba(0,0,0,.2);
.box-shadow(0 1px 3px rgba(0,0,0,.1));
// Image thumbnails
.img-thumbnail {
.thumbnail();
display: inline-block;
}
// Perfect circle