mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-31 17:11:48 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into derp

Browse Source 
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/javascript/dropdowns.md
	less/utilities.less
This commit is contained in:
Mark Otto
2014-07-12 16:15:45 -07:00
parent f1e77198d4 fe0ef38898
commit 5cfde0d3a5
15 changed files with 65 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
dist/css/bootstrap.css vendored
View File

@@ -1404,6 +1404,12 @@ pre code {
table {
background-color: transparent;
}
caption {
padding-top: .6rem;
padding-bottom: .6rem;
color: #818a91;
text-align: left;
}
th {
text-align: left;
}
@@ -1716,16 +1722,16 @@ output {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
}
.form-control::-webkit-input-placeholder {
color: #818a91;
color: #999;
}
.form-control::-moz-placeholder {
color: #818a91;
color: #999;
}
.form-control:-ms-input-placeholder {
color: #818a91;
color: #999;
}
.form-control::placeholder {
color: #818a91;
color: #999;
}
.form-control[disabled],
.form-control[readonly],
@@ -1889,6 +1895,7 @@ select[multiple].form-group-lg .form-control {
height: 2.7rem;
line-height: 2.7rem;
text-align: center;
pointer-events: none;
}
.input-lg + .form-control-feedback {
width: 3.3625rem;
@@ -5028,8 +5035,6 @@ button.close {
}
.affix {
position: fixed;
-webkit-transform: translate3d(0, 0, 0);
transform: translate3d(0, 0, 0);
}
@-ms-viewport {
width: device-width;