Skip to content
GitLab
Commit 04aae2f5 authored by Mark Otto's avatar Mark Otto
Browse files

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

parents c64aa26d 24f0505b
Hide whitespace changes
Inline Side-by-side
Showing
with 148 additions and 14 deletions
+148 -14
docs/assets/css/bootstrap.css
+ 86
- 5
View file @ 04aae2f5
......@@ -1253,9 +1253,8 @@ input[type="search"].input-large,
input[type="tel"].input-large,
input[type="color"].input-large,
.uneditable-input.input-large {
padding: 11px 19px;
padding-right: 14px;
padding-left: 14px;
min-height: 44px;
padding: 10px 14px;
font-size: 17.5px;
border-radius: 6px;
}
......@@ -1277,6 +1276,7 @@ input[type="search"].input-small,
input[type="tel"].input-small,
input[type="color"].input-small,
.uneditable-input.input-small {
min-height: 26px;
padding: 2px 10px;
font-size: 11.9px;
border-radius: 3px;
......@@ -1299,6 +1299,7 @@ input[type="search"].input-mini,
input[type="tel"].input-mini,
input[type="color"].input-mini,
.uneditable-input.input-mini {
min-height: 26px;
padding: 0 6px;
font-size: 10.5px;
border-radius: 3px;
......@@ -1473,6 +1474,20 @@ select:focus:invalid:focus {
border-radius: 0;
}
.input-group-addon.input-small,
.input-group-btn.input-small,
.input-group input.input-small,
.input-group .uneditable-input.input-small {
border-radius: 0;
}
.input-group-addon.input-large,
.input-group-btn.input-large,
.input-group input.input-large,
.input-group .uneditable-input.input-large {
border-radius: 0;
}
.input-group-addon,
.input-group-btn {
width: 1%;
......@@ -1493,6 +1508,16 @@ select:focus:invalid:focus {
box-sizing: border-box;
}
.input-group-addon.input-small {
padding: 2px 10px;
font-size: 11.9px;
}
.input-group-addon.input-large {
padding: 10px 14px;
font-size: 17.5px;
}
.input-group input:first-child,
.input-group .uneditable-input:first-child,
.input-group-addon:first-child {
......@@ -1500,6 +1525,24 @@ select:focus:invalid:focus {
border-top-left-radius: 4px;
}
.input-group input:first-child.input-small,
.input-group .uneditable-input:first-child.input-small,
.input-group-addon:first-child.input-small {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 3px;
border-top-left-radius: 3px;
}
.input-group input:first-child.input-large,
.input-group .uneditable-input:first-child.input-large,
.input-group-addon:first-child.input-large {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 6px;
border-top-left-radius: 6px;
}
.input-group-addon:first-child {
border-right: 0;
}
......@@ -1511,6 +1554,24 @@ select:focus:invalid:focus {
border-bottom-right-radius: 4px;
}
.input-group input:last-child.input-small,
.input-group .uneditable-input:last-child.input-small,
.input-group-addon:last-child.input-small {
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
}
.input-group input:last-child.input-large,
.input-group .uneditable-input:last-child.input-large,
.input-group-addon:last-child.input-large {
border-top-right-radius: 6px;
border-bottom-right-radius: 6px;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
}
.input-group-addon:last-child {
border-left: 0;
}
......@@ -1543,6 +1604,16 @@ select:focus:invalid:focus {
border-radius: 4px 0 0 4px;
}
.input-group-btn:first-child > .btn.btn-large,
.input-group-btn.btn-group:first-child > .btn.btn-large {
border-radius: 6px 0 0 6px;
}
.input-group-btn:first-child > .btn.btn-small,
.input-group-btn.btn-group:first-child > .btn.btn-small {
border-radius: 3px 0 0 3px;
}
.input-group-btn:last-child > .btn,
.input-group-btn.btn-group:last-child > .btn:first-child {
border-left: 0;
......@@ -1553,6 +1624,16 @@ select:focus:invalid:focus {
border-radius: 0 4px 4px 0;
}
.input-group-btn:last-child > .btn.btn-large,
.input-group-btn.btn-group:last-child > .btn.btn-large {
border-radius: 0 6px 6px 0;
}
.input-group-btn:last-child > .btn.btn-small,
.input-group-btn.btn-group:last-child > .btn.btn-small {
border-radius: 0 3px 3px 0;
}
@media screen and (min-width: 768px) {
.form-horizontal .control-group {
position: relative;
......@@ -1627,7 +1708,7 @@ fieldset[disabled] .btn {
}
.btn-large {
padding: 11px 19px;
padding: 11px 14px;
font-size: 17.5px;
border-radius: 6px;
}
......@@ -3463,7 +3544,7 @@ button.close {
.pagination-large > li > a,
.pagination-large > li > span {
padding: 11px 19px;
padding: 11px 14px;
font-size: 17.5px;
}
......
less/forms.less
+ 51
- 7
View file @ 04aae2f5
......@@ -57,7 +57,7 @@ input[type="color"],
.uneditable-input {
display: inline-block;
.box-sizing(border-box); // Makes inputs behave like true block-level elements
min-height: @input-height; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
min-height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
padding: 6px 9px;
// margin-bottom: @line-height-base / 2;
font-size: @font-size-base;
......@@ -134,8 +134,8 @@ input[type="checkbox"] {
// Set the height of select and file controls to match text inputs
select,
input[type="file"] {
height: @input-height; /* In IE7, the height of the select element cannot be changed by height, only font-size. TODO: Check if this is still needed when dropping IE7 support */
line-height: @input-height;
height: @input-height-base; /* In IE7, the height of the select element cannot be changed by height, only font-size. TODO: Check if this is still needed when dropping IE7 support */
line-height: @input-height-base;
}
// Make select elements obey height by applying a border
......@@ -270,21 +270,22 @@ input[type="tel"],
input[type="color"],
.uneditable-input {
&.input-large {
padding: @padding-large;
padding-left: 14px;
padding-right: 14px; // TODO: Resolve this override
padding: @padding-large-input;
font-size: @font-size-large;
border-radius: @border-radius-large;
min-height: @input-height-large;
}
&.input-small {
padding: @padding-small;
font-size: @font-size-small;
border-radius: @border-radius-small;
min-height: @input-height-small;
}
&.input-mini {
padding: @padding-mini;
font-size: @font-size-mini;
border-radius: @border-radius-small;
min-height: @input-height-small;
}
}
......@@ -315,7 +316,7 @@ input[class*="span"],
select[class*="span"],
textarea[class*="span"],
.uneditable-input[class*="span"] {
height: @input-height;
height: @input-height-base;
}
......@@ -447,6 +448,12 @@ select:focus:invalid {
display: table-cell;
margin: 0;
border-radius: 0;
&.input-small {
border-radius: 0;
}
&.input-large {
border-radius: 0;
}
}
// Addon and addon wrapper for buttons
.input-group-addon,
......@@ -467,6 +474,15 @@ select:focus:invalid {
text-shadow: 0 1px 0 #fff;
background-color: @grayLighter;
border: 1px solid #ccc;
&.input-small {
padding: @padding-small;
font-size: @font-size-small;
}
&.input-large {
padding: @padding-large-input;
font-size: @font-size-large;
}
}
// Reset rounded corners
......@@ -474,6 +490,14 @@ select:focus:invalid {
.input-group .uneditable-input:first-child,
.input-group-addon:first-child {
.border-left-radius(@border-radius-base);
&.input-small {
.border-left-radius(@border-radius-small);
.border-right-radius(0);
}
&.input-large {
.border-left-radius(@border-radius-large);
.border-right-radius(0);
}
}
.input-group-addon:first-child {
border-right: 0;
......@@ -482,6 +506,14 @@ select:focus:invalid {
.input-group .uneditable-input:last-child,
.input-group-addon:last-child {
.border-right-radius(@border-radius-base);
&.input-small {
.border-right-radius(@border-radius-small);
.border-left-radius(0);
}
&.input-large {
.border-right-radius(@border-radius-large);
.border-left-radius(0);
}
}
.input-group-addon:last-child {
border-left: 0;
......@@ -512,6 +544,12 @@ select:focus:invalid {
&:first-child > .btn,
&.btn-group:first-child > .btn {
border-radius: @border-radius-base 0 0 @border-radius-base;
&.btn-large {
border-radius:@border-radius-large 0 0 @border-radius-large;
}
&.btn-small {
border-radius:@border-radius-small 0 0 @border-radius-small;
}
}
}
// Append
......@@ -523,6 +561,12 @@ select:focus:invalid {
&:last-child > .btn,
&.btn-group:last-child > .btn {
border-radius: 0 @border-radius-base @border-radius-base 0;
&.btn-large {
border-radius: 0 @border-radius-large @border-radius-large 0;
}
&.btn-small {
border-radius: 0 @border-radius-small @border-radius-small 0;
}
}
}
......
less/variables.less
+ 11
- 2
View file @ 04aae2f5
......@@ -60,10 +60,14 @@
// -------------------------
// Based on 14px font-size and 1.5 line-height
@padding-large: 11px 19px; // 44px
@padding-large: 11px 14px; // 44px
@padding-small: 2px 10px; // 26px
@padding-mini: 0 6px; // 22px
@padding-large-input: 10px 14px; // 44px
// firefox hack since it doesn't accept custom line-height for inputs and automatically sets line-height as font-size + 4 px.
// input-large at 18 + 4 = 22, so I tried to compensate on padding.
@border-radius-base: 4px;
@border-radius-large: 6px;
@border-radius-small: 3px;
......@@ -115,7 +119,12 @@
@input-color-placeholder: @grayLight;
@input-height: @line-height-base + 14px; // base line-height + 12px vertical padding + 2px top/bottom border
@input-height-base: @line-height-base + 14px; // base line-height + 12px vertical padding + 2px top/bottom border
@input-height-large: @line-height-base + 24px; // base line-height + 22px vertical padding + 2px top/bottom border
@input-height-small: @line-height-base + 6px; // base line-height + 4px vertical padding + 2px top/bottom border
// adjust min-height on input sizes
@form-actions-background: #f5f5f5;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment