diff options
| author | Mark Otto <[email protected]> | 2012-03-27 09:21:35 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-27 09:21:35 -0700 |
| commit | 5b3268317c479c9cc50d7a1270b9138e748b8956 (patch) | |
| tree | 0fd6e3a39f10527091f4b2758d1ea09d50b2d66f /docs/components.html | |
| parent | d27fc24aa027f4c9bdb9aa3648eebfcd6aed5acf (diff) | |
| parent | 155a7c10675c907e5407c2b78cc83b41b90b15ff (diff) | |
| download | bootstrap-5b3268317c479c9cc50d7a1270b9138e748b8956.tar.xz bootstrap-5b3268317c479c9cc50d7a1270b9138e748b8956.zip | |
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/components.html b/docs/components.html index 5df760459..7854df523 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1879,8 +1879,10 @@ <div class="span4"> <h2>Close icon</h2> <p>Use the generic close icon for dismissing content like modals and alerts.</p> - <p><a class="close" style="float: none;">×</a></p> -<pre class="prettyprint linenums"><a class="close">&times;</a></pre> + <p><button class="close" style="float: none;">×</button></p> +<pre class="prettyprint linenums"><button class="close">&times;</button></pre> + <p>iOS devices require an href="#" for click events if you rather use an anchor.</p> +<pre class="prettyprint linenums"><a class="close" href="#">&times;</a></pre> </div><!--/span--> </div><!--/row--> </section> |