Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitcc6fda2

Browse files
committed
Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip
2 parents2c7ab23 +2877f84 commitcc6fda2

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

‎docs/base-css.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1479,7 +1479,7 @@ <h4>Grid sizing</h4>
14791479
&lt;/select&gt;
14801480
</pre>
14811481

1482-
<p>For multiple grid inputs per line,<strong>use the<code>.controls-row</code> modifier class for proper spacing</strong>. It floats the inputs to collapse white-space, sets the proper margins, andtheclears the float.</p>
1482+
<p>For multiple grid inputs per line,<strong>use the<code>.controls-row</code> modifier class for proper spacing</strong>. It floats the inputs to collapse white-space, sets the proper margins, and clears the float.</p>
14831483
<formclass="bs-docs-example"style="padding-bottom: 15px;">
14841484
<divclass="controls">
14851485
<inputclass="span5"type="text"placeholder=".span5">

‎docs/components.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2069,16 +2069,16 @@ <h2>Default alert</h2>
20692069
</div>
20702070
<preclass="prettyprint linenums">
20712071
&lt;div class="alert"&gt;
2072-
&lt;button type="button" data-dismiss="alert"&gt;&times;&lt;/button&gt;
2072+
&lt;button type="button" data-dismiss="alert"&gt;&amp;times;&lt;/button&gt;
20732073
&lt;strong&gt;Warning!&lt;/strong&gt; Best check yo self, you're not looking too good.
20742074
&lt;/div&gt;
20752075
</pre>
20762076

20772077
<h3>Dismiss buttons</h3>
20782078
<p>Mobile Safari and Mobile Opera browsers, in addition to the<code>data-dismiss="alert"</code> attribute, require an<code>href="#"</code> for the dismissal of alerts when using an<code>&lt;a&gt;</code> tag.</p>
2079-
<preclass="prettyprint linenums">&lt;a href="#" data-dismiss="alert"&gt;&times;&lt;/a&gt;</pre>
2079+
<preclass="prettyprint linenums">&lt;a href="#" data-dismiss="alert"&gt;&amp;times;&lt;/a&gt;</pre>
20802080
<p>Alternatively, you may use a<code>&lt;button&gt;</code> element with the data attribute, which we have opted to do for our docs. When using<code>&lt;button&gt;</code>, you must include<code>type="button"</code> or your forms may not submit.</p>
2081-
<preclass="prettyprint linenums">&lt;button type="button" data-dismiss="alert"&gt;&times;&lt;/button&gt;</pre>
2081+
<preclass="prettyprint linenums">&lt;button type="button" data-dismiss="alert"&gt;&amp;times;&lt;/button&gt;</pre>
20822082

20832083
<h3>Dismiss alerts via JavaScript</h3>
20842084
<p>Use the<ahref="./javascript.html#alerts">alerts jQuery plugin</a> for quick and easy dismissal of alerts.</p>
@@ -2098,7 +2098,7 @@ <h4>Warning!</h4>
20982098
</div>
20992099
<preclass="prettyprint linenums">
21002100
&lt;div class="alert alert-block"&gt;
2101-
&lt;button type="button" data-dismiss="alert"&gt;&times;&lt;/button&gt;
2101+
&lt;button type="button" data-dismiss="alert"&gt;&amp;times;&lt;/button&gt;
21022102
&lt;h4&gt;Warning!&lt;/h4&gt;
21032103
Best check yo self, you're not...
21042104
&lt;/div&gt;

‎docs/templates/pages/base-css.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1416,7 +1416,7 @@
14161416
&lt;/select&gt;
14171417
</pre>
14181418

1419-
<p>{{_i}}For multiple grid inputs per line, <strong>use the <code>.controls-row</code> modifier class for proper spacing</strong>. It floats the inputs to collapse white-space, sets the proper margins, andtheclears the float.{{/i}}</p>
1419+
<p>{{_i}}For multiple grid inputs per line, <strong>use the <code>.controls-row</code> modifier class for proper spacing</strong>. It floats the inputs to collapse white-space, sets the proper margins, and clears the float.{{/i}}</p>
14201420
<formclass="bs-docs-example"style="padding-bottom:15px;">
14211421
<divclass="controls">
14221422
<inputclass="span5"type="text"placeholder=".span5">

‎docs/templates/pages/components.mustache‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1998,16 +1998,16 @@
19981998
</div>
19991999
<preclass="prettyprint linenums">
20002000
&lt;div class="alert"&gt;
2001-
&lt;button type="button" data-dismiss="alert"&gt;&times;&lt;/button&gt;
2001+
&lt;button type="button" data-dismiss="alert"&gt;&amp;times;&lt;/button&gt;
20022002
&lt;strong&gt;{{_i}}Warning!{{/i}}&lt;/strong&gt;{{_i}}Best check yo self, you're not looking too good.{{/i}}
20032003
&lt;/div&gt;
20042004
</pre>
20052005

20062006
<h3>{{_i}}Dismiss buttons{{/i}}</h3>
20072007
<p>{{_i}}Mobile Safari and Mobile Opera browsers, in addition to the <code>data-dismiss="alert"</code> attribute, require an <code>href="#"</code> for the dismissal of alerts when using an <code>&lt;a&gt;</code> tag.{{/i}}</p>
2008-
<preclass="prettyprint linenums">&lt;a href="#" data-dismiss="alert"&gt;&times;&lt;/a&gt;</pre>
2008+
<preclass="prettyprint linenums">&lt;a href="#" data-dismiss="alert"&gt;&amp;times;&lt;/a&gt;</pre>
20092009
<p>{{_i}}Alternatively, you may use a <code>&lt;button&gt;</code> element with the data attribute, which we have opted to do for our docs. When using <code>&lt;button&gt;</code>, you must include <code>type="button"</code> or your forms may not submit.{{/i}}</p>
2010-
<preclass="prettyprint linenums">&lt;button type="button" data-dismiss="alert"&gt;&times;&lt;/button&gt;</pre>
2010+
<preclass="prettyprint linenums">&lt;button type="button" data-dismiss="alert"&gt;&amp;times;&lt;/button&gt;</pre>
20112011

20122012
<h3>{{_i}}Dismiss alerts via JavaScript{{/i}}</h3>
20132013
<p>{{_i}}Use the <ahref="./javascript.html#alerts">alerts jQuery plugin</a> for quick and easy dismissal of alerts.{{/i}}</p>
@@ -2027,7 +2027,7 @@
20272027
</div>
20282028
<preclass="prettyprint linenums">
20292029
&lt;div class="alert alert-block"&gt;
2030-
&lt;button type="button" data-dismiss="alert"&gt;&times;&lt;/button&gt;
2030+
&lt;button type="button" data-dismiss="alert"&gt;&amp;times;&lt;/button&gt;
20312031
&lt;h4&gt;{{_i}}Warning!{{/i}}&lt;/h4&gt;
20322032
{{_i}}Best check yo self, you're not...{{/i}}
20332033
&lt;/div&gt;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp