diff options
| author | Jacob Thornton <[email protected]> | 2012-01-26 16:12:51 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-26 16:12:51 -0800 |
| commit | c31ac846d7f8cf59199fc5be58c1a4ba4417b1fa (patch) | |
| tree | 44e23e94a2d756ebb5407815b8be9506cfccf71c | |
| parent | d531f72645b72d648d52bd56698a80fcfff38043 (diff) | |
| parent | b260544de02788bc921c4c713df0f754d96c5a27 (diff) | |
| download | bootstrap-c31ac846d7f8cf59199fc5be58c1a4ba4417b1fa.tar.xz bootstrap-c31ac846d7f8cf59199fc5be58c1a4ba4417b1fa.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
| -rw-r--r-- | docs/base-css.html | 8 | ||||
| -rw-r--r-- | docs/components.html | 6 | ||||
| -rw-r--r-- | docs/download.html | 6 | ||||
| -rw-r--r-- | docs/examples.html | 6 | ||||
| -rw-r--r-- | docs/index.html | 6 | ||||
| -rw-r--r-- | docs/javascript.html | 6 | ||||
| -rw-r--r-- | docs/less.html | 6 | ||||
| -rw-r--r-- | docs/scaffolding.html | 6 | ||||
| -rw-r--r-- | docs/templates/layout.mustache | 6 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 2 | ||||
| -rw-r--r-- | docs/upgrading.html | 6 |
11 files changed, 32 insertions, 32 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index ebc6285dc..239b963c4 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon" href="images/apple-touch-icon.png"> - <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> - <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> + <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"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> @@ -962,7 +962,7 @@ <label class="control-label" for="select01">Select list</label> <div class="controls"> <select id="select01"> - <option>1</option> + <option>something</option> <option>2</option> <option>3</option> <option>4</option> diff --git a/docs/components.html b/docs/components.html index 49f3f8369..252e1a0c3 100644 --- a/docs/components.html +++ b/docs/components.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon" href="images/apple-touch-icon.png"> - <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> - <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> + <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"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/download.html b/docs/download.html index afc189fb3..a81f31ceb 100644 --- a/docs/download.html +++ b/docs/download.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon" href="images/apple-touch-icon.png"> - <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> - <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> + <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"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/examples.html b/docs/examples.html index 0d3e11f5a..6fcbc5855 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon" href="images/apple-touch-icon.png"> - <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> - <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> + <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"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/index.html b/docs/index.html index 8d66e3568..d7a870e8d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon" href="images/apple-touch-icon.png"> - <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> - <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> + <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"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/javascript.html b/docs/javascript.html index 2bd5bbd05..07c55e834 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon" href="images/apple-touch-icon.png"> - <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> - <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> + <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"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/less.html b/docs/less.html index dc0e83443..c827df453 100644 --- a/docs/less.html +++ b/docs/less.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon" href="images/apple-touch-icon.png"> - <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> - <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> + <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"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 2c8d873e7..11f3b4486 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon" href="images/apple-touch-icon.png"> - <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> - <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> + <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"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 547b99bb4..014f248d6 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon" href="images/apple-touch-icon.png"> - <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> - <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> + <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"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 27386d47f..6f928dfa3 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -897,7 +897,7 @@ <label class="control-label" for="select01">{{_i}}Select list{{/i}}</label> <div class="controls"> <select id="select01"> - <option>1</option> + <option>something</option> <option>2</option> <option>3</option> <option>4</option> diff --git a/docs/upgrading.html b/docs/upgrading.html index e80fac2d6..d0234a8ba 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon" href="images/apple-touch-icon.png"> - <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> - <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> + <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"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> |