mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source
This commit is contained in:
Mark Otto
2013-05-03 14:11:23 -07:00
parent b5d68f59c2 b0bd5899c5
commit 14861e9cc3
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/assets/css/bootstrap.css
Vendored
+4 -4
View File
@@ -1261,10 +1261,10 @@ input[type="color"] {
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-o-transition: border linear 0.2s, box-shadow linear 0.2s;
transition: border linear 0.2s, box-shadow linear 0.2s;
-webkit-transition: border-color linear 0.2s, box-shadow linear 0.2s;
-moz-transition: border-color linear 0.2s, box-shadow linear 0.2s;
-o-transition: border-color linear 0.2s, box-shadow linear 0.2s;
transition: border-color linear 0.2s, box-shadow linear 0.2s;
}
input,
docs/examples/carousel.html
+1 -1
View File
@@ -350,7 +350,7 @@ body {
<div class="featurette">
<img class="featurette-image img-circle pull-right" data-src="holder.js/512x512">
<h2 class="featurette-heading">First featurette headling. <span class="text-muted">It'll blow your mind.</span></h2>
<h2 class="featurette-heading">First featurette heading. <span class="text-muted">It'll blow your mind.</span></h2>
<p class="lead">Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper. Praesent commodo cursus magna, vel scelerisque nisl consectetur. Fusce dapibus, tellus ac cursus commodo.</p>
</div>