From 5d2062a3ccb0fed4901fc9f312c961d042f569bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Cederstro=CC=88m?= <andreas@klydd.se>
Date: Tue, 27 Mar 2012 08:36:34 +0200
Subject: [PATCH] Finish of close conversion from a to button
---
docs/assets/bootstrap.zip | Bin 56904 -> 56904 bytes
docs/components.html | 6 ++++--
docs/javascript.html | 10 +++++-----
docs/templates/pages/components.mustache | 6 ++++--
docs/templates/pages/javascript.mustache | 10 +++++-----
5 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 93f495965d448721786e5075f640b38ea5a13a10..9a2c46153d6c73a1f76eb723de50c30c8308860f 100644
GIT binary patch
delta 918
zcmX@Hhxx=FX5IjAW)?065NLL(p2(}9axK2l|2hztR&X;gvV3D?U|?|r$|BUY0M!Mm
zsDRYqP$vRZ&%ppvH`7K0o4SoJ4{<UB<tMM>a=@x!GZVKt2Q$z`lWl|zML<phVPq$5
zZWNX>2b(d^%M@$|hKlE2`o<tLCI(9DX6B~rhlX%6Fyrwa#MvNA6YHF?Te`h2TLA1V
z)qWf7DoXov1;EaFI$xQnFq*8hKp%S;<S(dF0vq+_kTG@@#)s>~z|PrnQ%?!q|KLbt
zWRhcsL@y|~f8CazEPqQ}32VH8l)__fa>Ok!Vw4@Z<wr;vC_qha+v9d0!qTa?opGB6
zPo+R_7!fiJWU1es0AiFKxZ{Oe86xa-?i%8D8^R0qcWsGLcJHpE0D3G;*1snS0C`aG
AR{#J2
delta 918
zcmX@Hhxx=FX5IjAW)?065a{%-n#il5qBOI>Uj>LuE4UdLS-vtdFtCUKWfAJSfa(HO
zRFrY61F7d=0I8d4BLY$f!pP=re0hkI87Mz_9hU=E1)G_;%{jm-Y=jNLDnQOcHez$5
zu#`Di#XK)l>}EXo(l=%X`6^IaH#0X~KQx4sff<kYAkGGAn4DPWBmz>1Vd?g|Yypsw
zlU4g|u&XHT&lLbW>*;)D6;L?h2upYvP1aeU4|YGg!p->$s+7P+y*Xqog3YMS#)s>~
zz|PrnQ%?!qvEWE!WRhcsL@y|~f8CazEPqQ}2|YgGN)fJ#xaCERvLm<rh*4&8+nyL@
zQ*S%tRt8U{KyMh~_AMe7{q6)1qwK&PFWkxyVW)G~PzgPXu!LLvU0d8<Km_l-yN&|r
KrcKtrCkX%$wcBz4
diff --git a/docs/components.html b/docs/components.html
index 5df760459f..7854df5236 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>
diff --git a/docs/javascript.html b/docs/javascript.html
index 70646afdbb..4f777e0312 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -208,7 +208,7 @@
<div class="well modal-example" style="background-color: #888; border: none;">
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
<div class="modal-header">
- <a href="#" class="close" data-dismiss="modal">×</a>
+ <button class="close" data-dismiss="modal">×</button>
<h3>Modal header</h3>
</div>
<div class="modal-body">
@@ -226,7 +226,7 @@
<!-- sample modal content -->
<div id="myModal" class="modal hide fade">
<div class="modal-header">
- <a class="close" data-dismiss="modal" >×</a>
+ <button class="close" data-dismiss="modal">×</button>
<h3>Modal Heading</h3>
</div>
<div class="modal-body">
@@ -303,7 +303,7 @@
<pre class="prettyprint linenums">
<div class="modal" id="myModal">
<div class="modal-header">
- <a class="close" data-dismiss="modal">×</a>
+ <button class="close" data-dismiss="modal">×</button>
<h3>Modal header</h3>
</div>
<div class="modal-body">
@@ -964,11 +964,11 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h2>Example alerts</h2>
<p>The alerts plugin works on regular alert messages, and block messages.</p>
<div class="alert fade in">
- <a class="close" data-dismiss="alert" href="#">×</a>
+ <button class="close" data-dismiss="alert">×</button>
<strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
</div>
<div class="alert alert-block alert-error fade in">
- <a class="close" data-dismiss="alert" href="#">×</a>
+ <button class="close" data-dismiss="alert">×</button>
<h4 class="alert-heading">Oh snap! You got an error!</h4>
<p>Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p>
<p>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index ac06367ce1..b0d88dd14f 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1802,8 +1802,10 @@
<div class="span4">
<h2>{{_i}}Close icon{{/i}}</h2>
<p>{{_i}}Use the generic close icon for dismissing content like modals and alerts.{{/i}}</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>{{_i}}iOS devices require an href="#" for click events if you rather use an anchor.{{/i}}</p>
+<pre class="prettyprint linenums"><a class="close" href="#">&times;</a></pre>
</div><!--/span-->
</div><!--/row-->
</section>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index a5010f2262..d61a364f03 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -131,7 +131,7 @@
<div class="well modal-example" style="background-color: #888; border: none;">
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
<div class="modal-header">
- <a href="#" class="close" data-dismiss="modal">×</a>
+ <button class="close" data-dismiss="modal">×</button>
<h3>{{_i}}Modal header{{/i}}</h3>
</div>
<div class="modal-body">
@@ -149,7 +149,7 @@
<!-- sample modal content -->
<div id="myModal" class="modal hide fade">
<div class="modal-header">
- <a class="close" data-dismiss="modal" >×</a>
+ <button class="close" data-dismiss="modal">×</button>
<h3>{{_i}}Modal Heading{{/i}}</h3>
</div>
<div class="modal-body">
@@ -226,7 +226,7 @@
<pre class="prettyprint linenums">
<div class="modal" id="myModal">
<div class="modal-header">
- <a class="close" data-dismiss="modal">×</a>
+ <button class="close" data-dismiss="modal">×</button>
<h3>Modal header</h3>
</div>
<div class="modal-body">
@@ -887,11 +887,11 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h2>{{_i}}Example alerts{{/i}}</h2>
<p>{{_i}}The alerts plugin works on regular alert messages, and block messages.{{/i}}</p>
<div class="alert fade in">
- <a class="close" data-dismiss="alert" href="#">×</a>
+ <button class="close" data-dismiss="alert">×</button>
<strong>{{_i}}Holy guacamole!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
</div>
<div class="alert alert-block alert-error fade in">
- <a class="close" data-dismiss="alert" href="#">×</a>
+ <button class="close" data-dismiss="alert">×</button>
<h4 class="alert-heading">{{_i}}Oh snap! You got an error!{{/i}}</h4>
<p>{{_i}}Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.{{/i}}</p>
<p>
--
GitLab