Skip to content

Commit

Permalink
updated apple touch icons and moved input responsive fix from <480 to…
Browse files Browse the repository at this point in the history
… <767
  • Loading branch information
mdo committed Mar 12, 2012
1 parent ce292a8 commit 8fd126b
Show file tree
Hide file tree
Showing 20 changed files with 76 additions and 100 deletions.
Binary file modified docs/assets/bootstrap.zip
Binary file not shown.
69 changes: 28 additions & 41 deletions docs/assets/css/bootstrap-responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -76,34 +76,6 @@
display: block;
line-height: 18px;
}
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
.uneditable-input {
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;
/* Older Webkit */

-moz-box-sizing: border-box;
/* Older FF */

-ms-box-sizing: border-box;
/* IE8 */

box-sizing: border-box;
/* CSS3 spec*/

}
.input-prepend input[class*="span"],
.input-append input[class*="span"] {
width: auto;
}
input[type="checkbox"],
input[type="radio"] {
border: 1px solid #ccc;
Expand Down Expand Up @@ -171,19 +143,34 @@
.thumbnails [class*="span"] {
width: auto;
}
/*
// FORM FIELDS
// -----------
// Make them behave like divs
input,
textarea,
select,
.uneditable-input {
.box-sizing(border-box);
max-width: 100%;
min-height: 20px;
}
*/
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
.uneditable-input {
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;
/* Older Webkit */

-moz-box-sizing: border-box;
/* Older FF */

-ms-box-sizing: border-box;
/* IE8 */

box-sizing: border-box;
/* CSS3 spec*/

}
.input-prepend input[class*="span"],
.input-append input[class*="span"] {
width: auto;
}
}
@media (min-width: 768px) and (max-width: 979px) {
.row {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/assets/ico/bootstrap-apple-114x114.png
Binary file not shown.
Binary file removed docs/assets/ico/bootstrap-apple-57x57.png
Binary file not shown.
Binary file removed docs/assets/ico/bootstrap-apple-72x72.png
Binary file not shown.
Binary file modified docs/assets/ico/favicon.ico
Binary file not shown.
6 changes: 3 additions & 3 deletions docs/base-css.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/ico/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/ico/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
</head>

<body data-spy="scroll" data-target=".subnav" data-offset="50">
Expand Down
6 changes: 3 additions & 3 deletions docs/components.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/ico/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/ico/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
</head>

<body data-spy="scroll" data-target=".subnav" data-offset="50">
Expand Down
6 changes: 3 additions & 3 deletions docs/download.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/ico/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/ico/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
</head>

<body data-spy="scroll" data-target=".subnav" data-offset="50">
Expand Down
6 changes: 3 additions & 3 deletions docs/examples.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/ico/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/ico/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
</head>

<body data-spy="scroll" data-target=".subnav" data-offset="50">
Expand Down
6 changes: 3 additions & 3 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/ico/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/ico/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
</head>

<body data-spy="scroll" data-target=".subnav" data-offset="50">
Expand Down
6 changes: 3 additions & 3 deletions docs/javascript.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/ico/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/ico/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
</head>

<body data-spy="scroll" data-target=".subnav" data-offset="50">
Expand Down
6 changes: 3 additions & 3 deletions docs/less.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/ico/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/ico/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
</head>

<body data-spy="scroll" data-target=".subnav" data-offset="50">
Expand Down
6 changes: 3 additions & 3 deletions docs/scaffolding.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/ico/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/ico/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
</head>

<body data-spy="scroll" data-target=".subnav" data-offset="50">
Expand Down
6 changes: 3 additions & 3 deletions docs/templates/layout.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/ico/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/ico/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
</head>

<body data-spy="scroll" data-target=".subnav" data-offset="50">
Expand Down
6 changes: 3 additions & 3 deletions docs/upgrading.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="assets/ico/apple-touch-icon.png">
<link rel="apple-touch-icon" sizes="72x72" href="assets/ico/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="assets/ico/apple-touch-icon-114x114.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
</head>

<body data-spy="scroll" data-target=".subnav" data-offset="50">
Expand Down
47 changes: 18 additions & 29 deletions less/responsive.less
Original file line number Diff line number Diff line change
Expand Up @@ -80,26 +80,6 @@
line-height: @baseLineHeight;
}

// Make span* classes full width
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
.uneditable-input {
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; /* 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
.input-prepend input[class*="span"],
.input-append input[class*="span"] {
width: auto;
}

// Update checkboxes for iOS
input[type="checkbox"],
input[type="radio"] {
Expand Down Expand Up @@ -195,19 +175,28 @@
width: auto;
}

/*
// FORM FIELDS
// -----------
// Make them behave like divs
input,
textarea,
select,
// Make span* classes full width
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
.uneditable-input {
.box-sizing(border-box);
max-width: 100%;
min-height: 20px;
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; /* 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
.input-prepend input[class*="span"],
.input-append input[class*="span"] {
width: auto;
}

}


Expand Down

0 comments on commit 8fd126b

Please sign in to comment.