diff options
| author | Mark Otto <[email protected]> | 2012-09-25 22:00:41 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-25 22:00:41 -0700 |
| commit | ce19e63d5b068ba0698dee4e2d99c725f6799b0d (patch) | |
| tree | bda8377cdc83204780bdf624833725a127ded586 /docs/examples | |
| parent | 527d01ce99a0cae8eae7868c0649dca60cda338c (diff) | |
| parent | f4d3d7da2e3ddbd751e053729935df1f3dd4c051 (diff) | |
| download | bootstrap-ce19e63d5b068ba0698dee4e2d99c725f6799b0d.tar.xz bootstrap-ce19e63d5b068ba0698dee4e2d99c725f6799b0d.zip | |
Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/base-css.html
docs/templates/pages/base-css.mustache
less/forms.less
less/mixins.less
Diffstat (limited to 'docs/examples')
| -rw-r--r-- | docs/examples/fluid.html | 4 | ||||
| -rw-r--r-- | docs/examples/hero.html | 4 | ||||
| -rw-r--r-- | docs/examples/starter-template.html | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index 24ea26582..517e209b7 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/fluid.html @@ -20,12 +20,12 @@ </style> <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet"> - <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> + <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> - <!-- Le fav and touch icons --> + <!-- Fav and touch icons --> <link rel="shortcut icon" href="../assets/ico/favicon.ico"> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png"> diff --git a/docs/examples/hero.html b/docs/examples/hero.html index b567647ae..97e0d2410 100644 --- a/docs/examples/hero.html +++ b/docs/examples/hero.html @@ -17,12 +17,12 @@ </style> <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet"> - <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> + <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> - <!-- Le fav and touch icons --> + <!-- Fav and touch icons --> <link rel="shortcut icon" href="../assets/ico/favicon.ico"> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png"> diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html index 7eac55de8..8f14bf7e1 100644 --- a/docs/examples/starter-template.html +++ b/docs/examples/starter-template.html @@ -16,12 +16,12 @@ </style> <link href="../assets/css/bootstrap-responsive.css" rel="stylesheet"> - <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> + <!-- HTML5 shim, for IE6-8 support of HTML5 elements --> <!--[if lt IE 9]> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> - <!-- Le fav and touch icons --> + <!-- Fav and touch icons --> <link rel="shortcut icon" href="../assets/ico/favicon.ico"> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png"> |