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

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

Browse Source 
Conflicts:
	less/forms.less
This commit is contained in:
Mark Otto
2013-05-09 17:22:48 -07:00
parent a19fda699d 1fdfee8de0
commit 90e4ff73d2
3 changed files with 31 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1601,20 +1601,11 @@ select:focus:invalid:focus {
.input-group-btn,
.input-group input {
display: table-cell;
/*margin: 0;*/
border-radius: 0;
}
.input-group-addon.input-small,
.input-group-btn.input-small,
.input-group input.input-small {
border-radius: 0;
}
.input-group-addon.input-large,
.input-group-btn.input-large,
.input-group input.input-large {
.input-group-addon:not(:first-child):not(:last-child),
.input-group-btn:not(:first-child):not(:last-child),
.input-group input:not(:first-child):not(:last-child) {
border-radius: 0;
}
@@ -1633,6 +1624,7 @@ select:focus:invalid:focus {
text-shadow: 0 1px 0 #fff;
background-color: #eeeeee;
border: 1px solid #ccc;
border-radius: 4px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
@@ -1641,29 +1633,21 @@ select:focus:invalid:focus {
.input-group-addon.input-small {
padding: 2px 10px;
font-size: 11.9px;
border-radius: 3px;
}
.input-group-addon.input-large {
padding: 11px 14px;
font-size: 17.5px;
border-radius: 6px;
}
.input-group input:first-child,
.input-group-addon:first-child {
border-bottom-left-radius: 4px;
border-top-left-radius: 4px;
}
.input-group input:first-child.input-small,
.input-group-addon:first-child.input-small {
border-bottom-left-radius: 3px;
border-top-left-radius: 3px;
}
.input-group input:first-child.input-large,
.input-group-addon:first-child.input-large {
border-bottom-left-radius: 6px;
border-top-left-radius: 6px;
.input-group-addon:first-child,
.input-group-btn:first-child > .btn:first-child,
.input-group-btn:first-child > .dropdown-toggle:first-child {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.input-group-addon:first-child {
@@ -1671,21 +1655,11 @@ select:focus:invalid:focus {
}
.input-group input:last-child,
.input-group-addon:last-child {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
.input-group input:last-child.input-small,
.input-group-addon:last-child.input-small {
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
.input-group input:last-child.input-large,
.input-group-addon:last-child.input-large {
border-top-right-radius: 6px;
border-bottom-right-radius: 6px;
.input-group-addon:last-child,
.input-group-btn:last-child > .btn:last-child,
.input-group-btn:last-child > .dropdown-toggle {
border-bottom-left-radius: 0;
border-top-left-radius: 0;
}
.input-group-addon:last-child {
@@ -1700,7 +1674,6 @@ select:focus:invalid:focus {
.input-group-btn > .btn {
position: relative;
float: left;
border-radius: 0;
}
.input-group-btn > .btn + .btn {
@@ -1712,42 +1685,6 @@ select:focus:invalid:focus {
z-index: 2;
}
.input-group-btn:first-child > .btn:first-child,
.input-group-btn:first-child > .dropdown-toggle:first-child {
border-bottom-left-radius: 4px;
border-top-left-radius: 4px;
}
.input-group-btn:first-child > .btn:first-child.btn-large,
.input-group-btn:first-child > .dropdown-toggle:first-child.btn-large {
border-bottom-left-radius: 6px;
border-top-left-radius: 6px;
}
.input-group-btn:first-child > .btn:first-child.btn-small,
.input-group-btn:first-child > .dropdown-toggle:first-child.btn-small {
border-bottom-left-radius: 3px;
border-top-left-radius: 3px;
}
.input-group-btn:last-child > .btn:last-child,
.input-group-btn:last-child > .dropdown-toggle {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
}
.input-group-btn:last-child > .btn:last-child.btn-large,
.input-group-btn:last-child > .dropdown-toggle.btn-large {
border-top-right-radius: 6px;
border-bottom-right-radius: 6px;
}
.input-group-btn:last-child > .btn:last-child.btn-small,
.input-group-btn:last-child > .dropdown-toggle.btn-small {
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
.form-inline input,
.form-inline select,
.form-inline textarea,
@@ -2115,6 +2052,7 @@ input[type="button"].btn-block {
.glyphicon:before {
font-family: 'Glyphicons Halflings';
-webkit-font-smoothing: antialiased;
font-style: normal;
font-weight: normal;
line-height: 1;