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
498b7d98
Commit
498b7d98
authored
12 years ago
by
Jacob Thornton
Browse files
Options
Download
Email Patches
Plain Diff
a few property reordering things
parent
cad8f2b4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/css/bootstrap-responsive.css
+2
-18
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
+4
-12
docs/assets/css/bootstrap.css
less/mixins.less
+4
-5
less/mixins.less
less/reset.less
+2
-2
less/reset.less
with
12 additions
and
37 deletions
+12
-37
docs/assets/css/bootstrap-responsive.css
+
2
-
18
View file @
498b7d98
...
@@ -19,20 +19,16 @@
...
@@ -19,20 +19,16 @@
clear
:
both
;
clear
:
both
;
}
}
.hide-text
{
.hide-text
{
border
:
0
;
font
:
0
/
0
a
;
font
:
0
/
0
a
;
text-shadow
:
none
;
color
:
transparent
;
color
:
transparent
;
text-shadow
:
none
;
background-color
:
transparent
;
background-color
:
transparent
;
border
:
0
;
}
}
.input-block-level
{
.input-block-level
{
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
min-height
:
28px
;
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
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
...
@@ -175,10 +171,6 @@
...
@@ -175,10 +171,6 @@
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
min-height
:
28px
;
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
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
...
@@ -302,10 +294,6 @@
...
@@ -302,10 +294,6 @@
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
min-height
:
28px
;
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
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
...
@@ -504,10 +492,6 @@
...
@@ -504,10 +492,6 @@
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
min-height
:
28px
;
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
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
...
...
This diff is collapsed.
Click to expand it.
docs/assets/css/bootstrap.css
+
4
-
12
View file @
498b7d98
...
@@ -58,9 +58,9 @@ sub {
...
@@ -58,9 +58,9 @@ sub {
}
}
img
{
img
{
max-width
:
100%
;
max-width
:
100%
;
vertical-align
:
middle
;
border
:
0
;
border
:
0
;
-ms-interpolation-mode
:
bicubic
;
-ms-interpolation-mode
:
bicubic
;
vertical-align
:
middle
;
}
}
button
,
button
,
input
,
input
,
...
@@ -88,10 +88,10 @@ input[type="submit"] {
...
@@ -88,10 +88,10 @@ input[type="submit"] {
-webkit-appearance
:
button
;
-webkit-appearance
:
button
;
}
}
input
[
type
=
"search"
]
{
input
[
type
=
"search"
]
{
-webkit-appearance
:
textfield
;
-webkit-box-sizing
:
content-box
;
-webkit-box-sizing
:
content-box
;
-moz-box-sizing
:
content-box
;
-moz-box-sizing
:
content-box
;
box-sizing
:
content-box
;
box-sizing
:
content-box
;
-webkit-appearance
:
textfield
;
}
}
input
[
type
=
"search"
]
::-webkit-search-decoration
,
input
[
type
=
"search"
]
::-webkit-search-decoration
,
input
[
type
=
"search"
]
::-webkit-search-cancel-button
{
input
[
type
=
"search"
]
::-webkit-search-cancel-button
{
...
@@ -113,20 +113,16 @@ textarea {
...
@@ -113,20 +113,16 @@ textarea {
clear
:
both
;
clear
:
both
;
}
}
.hide-text
{
.hide-text
{
border
:
0
;
font
:
0
/
0
a
;
font
:
0
/
0
a
;
text-shadow
:
none
;
color
:
transparent
;
color
:
transparent
;
text-shadow
:
none
;
background-color
:
transparent
;
background-color
:
transparent
;
border
:
0
;
}
}
.input-block-level
{
.input-block-level
{
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
min-height
:
28px
;
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
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
...
@@ -257,10 +253,6 @@ a:hover {
...
@@ -257,10 +253,6 @@ a:hover {
display
:
block
;
display
:
block
;
width
:
100%
;
width
:
100%
;
min-height
:
28px
;
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
;
-webkit-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-moz-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
-ms-box-sizing
:
border-box
;
...
...
This diff is collapsed.
Click to expand it.
less/mixins.less
+
4
-
5
View file @
498b7d98
...
@@ -102,11 +102,11 @@
...
@@ -102,11 +102,11 @@
// -------------------------
// -------------------------
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
.hide-text {
.hide-text {
border: 0;
font: 0/0 a;
font: 0/0 a;
text-shadow: none;
color: transparent;
color: transparent;
text-shadow: none;
background-color: transparent;
background-color: transparent;
border: 0;
}
}
...
@@ -152,9 +152,8 @@
...
@@ -152,9 +152,8 @@
.input-block-level {
.input-block-level {
display: block;
display: block;
width: 100%;
width: 100%;
min-height: 28px; /* Make inputs at least the height of their button counterpart */
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); // Makes inputs behave like true block-level elements
.box-sizing(border-box);
}
}
...
...
This diff is collapsed.
Click to expand it.
less/reset.less
+
2
-
2
View file @
498b7d98
...
@@ -76,9 +76,9 @@ sub {
...
@@ -76,9 +76,9 @@ sub {
img {
img {
max-width: 100%; // Make images inherently responsive
max-width: 100%; // Make images inherently responsive
vertical-align: middle;
border: 0;
border: 0;
-ms-interpolation-mode: bicubic;
-ms-interpolation-mode: bicubic;
vertical-align: middle;
}
}
// Forms
// Forms
...
@@ -111,10 +111,10 @@ input[type="submit"] {
...
@@ -111,10 +111,10 @@ input[type="submit"] {
-webkit-appearance: button; // Style clickable inputs in iOS
-webkit-appearance: button; // Style clickable inputs in iOS
}
}
input[type="search"] { // Appearance in Safari/Chrome
input[type="search"] { // Appearance in Safari/Chrome
-webkit-appearance: textfield;
-webkit-box-sizing: content-box;
-webkit-box-sizing: content-box;
-moz-box-sizing: content-box;
-moz-box-sizing: content-box;
box-sizing: content-box;
box-sizing: content-box;
-webkit-appearance: textfield;
}
}
input[type="search"]::-webkit-search-decoration,
input[type="search"]::-webkit-search-decoration,
input[type="search"]::-webkit-search-cancel-button {
input[type="search"]::-webkit-search-cancel-button {
...
...
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