rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #2817 from andriijas/2.0.3-wip

Browse Source 
Finish of a.close to button.close
This commit is contained in:
Mark Otto 2012-03-27 09:14:39 -07:00
commit 155a7c1067
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View File

Binary file not shown.

6
docs/components.html
View File

@ -1879,8 +1879,10 @@
<div class="span4"> <div class="span4">
<h2>Close icon</h2> <h2>Close icon</h2>
<p>Use the generic close icon for dismissing content like modals and alerts.</p> <p>Use the generic close icon for dismissing content like modals and alerts.</p>
<p><a class="close" style="float: none;">&times;</a></p> <p><button class="close" style="float: none;">&times;</button></p>
<pre class="prettyprint linenums">&lt;a class="close"&gt;&amp;times;&lt;/a&gt;</pre> <pre class="prettyprint linenums">&lt;button class="close"&gt;&amp;times;&lt;/button&gt;</pre>
<p>iOS devices require an href="#" for click events if you rather use an anchor.</p>
<pre class="prettyprint linenums">&lt;a class="close" href="#"&gt;&amp;times;&lt;/a&gt;</pre>
</div><!--/span--> </div><!--/span-->
</div><!--/row--> </div><!--/row-->
</section> </section>

10
docs/javascript.html
View File

@ -208,7 +208,7 @@
<div class="well modal-example" style="background-color: #888; border: none;"> <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" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
<div class="modal-header"> <div class="modal-header">
<a href="#" class="close" data-dismiss="modal">&times;</a> <button class="close" data-dismiss="modal">&times;</button>
<h3>Modal header</h3> <h3>Modal header</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@ -226,7 +226,7 @@
<!-- sample modal content --> <!-- sample modal content -->
<div id="myModal" class="modal hide fade"> <div id="myModal" class="modal hide fade">
<div class="modal-header"> <div class="modal-header">
<a class="close" data-dismiss="modal" >&times;</a> <button class="close" data-dismiss="modal">&times;</button>
<h3>Modal Heading</h3> <h3>Modal Heading</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@ -303,7 +303,7 @@
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="modal" id="myModal"&gt; &lt;div class="modal" id="myModal"&gt;
&lt;div class="modal-header"&gt; &lt;div class="modal-header"&gt;
&lt;a class="close" data-dismiss="modal"&gt;&times;&lt;/a&gt; &lt;button class="close" data-dismiss="modal"&gt;&times;&lt;/button&gt;
&lt;h3&gt;Modal header&lt;/h3&gt; &lt;h3&gt;Modal header&lt;/h3&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;div class="modal-body"&gt; &lt;div class="modal-body"&gt;
@ -964,11 +964,11 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h2>Example alerts</h2> <h2>Example alerts</h2>
<p>The alerts plugin works on regular alert messages, and block messages.</p> <p>The alerts plugin works on regular alert messages, and block messages.</p>
<div class="alert fade in"> <div class="alert fade in">
<a class="close" data-dismiss="alert" href="#">&times;</a> <button class="close" data-dismiss="alert">&times;</button>
<strong>Holy guacamole!</strong> Best check yo self, you're not looking too good. <strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
</div> </div>
<div class="alert alert-block alert-error fade in"> <div class="alert alert-block alert-error fade in">
<a class="close" data-dismiss="alert" href="#">&times;</a> <button class="close" data-dismiss="alert">&times;</button>
<h4 class="alert-heading">Oh snap! You got an error!</h4> <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>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> <p>

6
docs/templates/pages/components.mustache vendored
View File

@ -1802,8 +1802,10 @@
<div class="span4"> <div class="span4">
<h2>{{_i}}Close icon{{/i}}</h2> <h2>{{_i}}Close icon{{/i}}</h2>
<p>{{_i}}Use the generic close icon for dismissing content like modals and alerts.{{/i}}</p> <p>{{_i}}Use the generic close icon for dismissing content like modals and alerts.{{/i}}</p>
<p><a class="close" style="float: none;">&times;</a></p> <p><button class="close" style="float: none;">&times;</button></p>
<pre class="prettyprint linenums">&lt;a class="close"&gt;&amp;times;&lt;/a&gt;</pre> <pre class="prettyprint linenums">&lt;button class="close"&gt;&amp;times;&lt;/button&gt;</pre>
<p>{{_i}}iOS devices require an href="#" for click events if you rather use an anchor.{{/i}}</p>
<pre class="prettyprint linenums">&lt;a class="close" href="#"&gt;&amp;times;&lt;/a&gt;</pre>
</div><!--/span--> </div><!--/span-->
</div><!--/row--> </div><!--/row-->
</section> </section>

10
docs/templates/pages/javascript.mustache vendored
View File

@ -131,7 +131,7 @@
<div class="well modal-example" style="background-color: #888; border: none;"> <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" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
<div class="modal-header"> <div class="modal-header">
<a href="#" class="close" data-dismiss="modal">&times;</a> <button class="close" data-dismiss="modal">&times;</button>
<h3>{{_i}}Modal header{{/i}}</h3> <h3>{{_i}}Modal header{{/i}}</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@ -149,7 +149,7 @@
<!-- sample modal content --> <!-- sample modal content -->
<div id="myModal" class="modal hide fade"> <div id="myModal" class="modal hide fade">
<div class="modal-header"> <div class="modal-header">
<a class="close" data-dismiss="modal" >&times;</a> <button class="close" data-dismiss="modal">&times;</button>
<h3>{{_i}}Modal Heading{{/i}}</h3> <h3>{{_i}}Modal Heading{{/i}}</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@ -226,7 +226,7 @@
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="modal" id="myModal"&gt; &lt;div class="modal" id="myModal"&gt;
&lt;div class="modal-header"&gt; &lt;div class="modal-header"&gt;
&lt;a class="close" data-dismiss="modal"&gt;&times;&lt;/a&gt; &lt;button class="close" data-dismiss="modal"&gt;&times;&lt;/button&gt;
&lt;h3&gt;Modal header&lt;/h3&gt; &lt;h3&gt;Modal header&lt;/h3&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;div class="modal-body"&gt; &lt;div class="modal-body"&gt;
@ -887,11 +887,11 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<h2>{{_i}}Example alerts{{/i}}</h2> <h2>{{_i}}Example alerts{{/i}}</h2>
<p>{{_i}}The alerts plugin works on regular alert messages, and block messages.{{/i}}</p> <p>{{_i}}The alerts plugin works on regular alert messages, and block messages.{{/i}}</p>
<div class="alert fade in"> <div class="alert fade in">
<a class="close" data-dismiss="alert" href="#">&times;</a> <button class="close" data-dismiss="alert">&times;</button>
<strong>{{_i}}Holy guacamole!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}} <strong>{{_i}}Holy guacamole!{{/i}}</strong> {{_i}}Best check yo self, you're not looking too good.{{/i}}
</div> </div>
<div class="alert alert-block alert-error fade in"> <div class="alert alert-block alert-error fade in">
<a class="close" data-dismiss="alert" href="#">&times;</a> <button class="close" data-dismiss="alert">&times;</button>
<h4 class="alert-heading">{{_i}}Oh snap! You got an error!{{/i}}</h4> <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>{{_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> <p>