Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
ee5d2ec9
Commit
ee5d2ec9
authored
13 years ago
by
Mark Otto
Browse files
Options
Download
Email Patches
Plain Diff
add block level input mixin for border-box box-sizing
parent
c8f4325c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
docs/assets/bootstrap.zip
+0
-0
docs/assets/bootstrap.zip
docs/assets/css/bootstrap-responsive.css
+13
-8
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
+13
-0
docs/assets/css/bootstrap.css
less/mixins.less
+12
-1
less/mixins.less
less/responsive.less
+1
-8
less/responsive.less
with
39 additions
and
17 deletions
+39
-17
docs/assets/bootstrap.zip
+
0
-
0
View file @
ee5d2ec9
No preview for this file type
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap-responsive.css
+
13
-
8
View file @
ee5d2ec9
...
@@ -23,6 +23,19 @@
...
@@ -23,6 +23,19 @@
text-indent
:
100%
;
text-indent
:
100%
;
white-space
:
nowrap
;
white-space
:
nowrap
;
}
}
.input-block-level
{
display
:
block
;
width
:
100%
;
min-height
:
28px
;
/* Make inputs at least the height of their button counterpart */
/* Makes inputs behave like true block-level elements */
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
.hidden
{
.hidden
{
display
:
none
;
display
:
none
;
visibility
:
hidden
;
visibility
:
hidden
;
...
@@ -160,17 +173,9 @@
...
@@ -160,17 +173,9 @@
/* Makes inputs behave like true block-level elements */
/* Makes inputs behave like true block-level elements */
-webkit-box-sizing
:
border-box
;
-webkit-box-sizing
:
border-box
;
/* Older Webkit */
-moz-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
/* Older FF */
-ms-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
/* IE8 */
box-sizing
:
border-box
;
box-sizing
:
border-box
;
/* CSS3 spec*/
}
}
.input-prepend
input
[
class
*=
"span"
],
.input-prepend
input
[
class
*=
"span"
],
.input-append
input
[
class
*=
"span"
]
{
.input-append
input
[
class
*=
"span"
]
{
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap.css
+
13
-
0
View file @
ee5d2ec9
...
@@ -117,6 +117,19 @@ textarea {
...
@@ -117,6 +117,19 @@ textarea {
text-indent
:
100%
;
text-indent
:
100%
;
white-space
:
nowrap
;
white-space
:
nowrap
;
}
}
.input-block-level
{
display
:
block
;
width
:
100%
;
min-height
:
28px
;
/* Make inputs at least the height of their button counterpart */
/* Makes inputs behave like true block-level elements */
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
body
{
body
{
margin
:
0
;
margin
:
0
;
font-family
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
font-family
:
"Helvetica Neue"
,
Helvetica
,
Arial
,
sans-serif
;
...
...
This diff is collapsed.
Click to expand it.
less/mixins.less
+
12
-
1
View file @
ee5d2ec9
...
@@ -107,6 +107,7 @@
...
@@ -107,6 +107,7 @@
white-space: nowrap;
white-space: nowrap;
}
}
// FONTS
// FONTS
// --------------------------------------------------
// --------------------------------------------------
...
@@ -142,9 +143,19 @@
...
@@ -142,9 +143,19 @@
}
}
// F
orm field states (used in forms.less)
// F
ORMS
// --------------------------------------------------
// --------------------------------------------------
// Block level inputs
.input-block-level {
display: block;
width: 100%;
min-height: 28px; /* Make inputs at least the height of their button counterpart */
/* Makes inputs behave like true block-level elements */
.box-sizing(border-box);
}
// Mixin for form field states
// Mixin for form field states
.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
// Set the text color
// Set the text color
...
...
This diff is collapsed.
Click to expand it.
less/responsive.less
+
1
-
8
View file @
ee5d2ec9
...
@@ -182,14 +182,7 @@
...
@@ -182,14 +182,7 @@
select[class*="span"],
select[class*="span"],
textarea[class*="span"],
textarea[class*="span"],
.uneditable-input {
.uneditable-input {
display: block;
.input-block-level();
width: 100%;
min-height: 28px; /* Make inputs at least the height of their button counterpart */
/* Makes inputs behave like true block-level elements */
-webkit-box-sizing: border-box; /* Older Webkit */
-moz-box-sizing: border-box; /* Older FF */
-ms-box-sizing: border-box; /* IE8 */
box-sizing: border-box; /* CSS3 spec*/
}
}
// But don't let it screw up prepend/append inputs
// But don't let it screw up prepend/append inputs
.input-prepend input[class*="span"],
.input-prepend input[class*="span"],
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment