mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code 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
less/forms.less
+1
View File
@@ -344,6 +344,7 @@ input[type="checkbox"] {
height: @input-height-base;
line-height: @input-height-base;
text-align: center;
pointer-events: none;
}
.input-lg + .form-control-feedback {
width: @input-height-large;
less/tables.less
+6
View File
@@ -6,6 +6,12 @@
table {
background-color: @table-bg;
}
caption {
padding-top: @table-cell-padding;
padding-bottom: @table-cell-padding;
color: @text-muted;
text-align: left;
}
th {
text-align: left;
}
less/utilities.less
-1
View File
@@ -49,5 +49,4 @@
.affix {
position: fixed;
transform: translate3d(0, 0, 0);
}
less/variables.less
+1 -1
View File
@@ -190,7 +190,7 @@
@input-box-shadow-focus: rgba(102,175,233,.6);
//** Placeholder text color
@input-color-placeholder: @gray-light;
@input-color-placeholder: #999;
//** Default `.form-control` height
@input-height-base: ((@font-size-base * @line-height-base) + (@padding-base-vertical * 2) + .2);