github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated to 3.1.1

Browse Source
This commit is contained in:
Arnold Daniels
2014-03-28 05:18:11 +01:00
parent a8b87c0c06
commit 007440da6d
16 changed files with 52 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
javascript/index.html
View File

@@ -326,6 +326,12 @@
<td>true</td>
<td>Calculate if off canvas should be disabled for this viewport width on window resize. If your elements always gets hidden on window resize, try setting this to false.</td>
</tr>
<tr>
<td>disableScrolling</td>
<td>boolean</td>
<td>true</td>
<td>Disable scrolling when the off canvas element is shown, by setting overflow to hidden for the body.</td>
</tr>
</tbody>
</table>
@@ -558,20 +564,16 @@
<h3>File input widgets</h3>
<div class="bs-example">
<div class="fileinput fileinput-new" data-provides="fileinput">
<div class="input-group">
<div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i> <span class="fileinput-filename"></span></div>
<span class="input-group-addon btn btn-default btn-file"><span class="fileinput-new">Select file</span><span class="fileinput-exists">Change</span><input type="file"></span>
<a href="#" class="input-group-addon btn btn-default fileinput-exists" data-dismiss="fileinput">Remove</a>
</div>
<div class="fileinput fileinput-new input-group" data-provides="fileinput">
<div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i> <span class="fileinput-filename"></span></div>
<span class="input-group-addon btn btn-default btn-file"><span class="fileinput-new">Select file</span><span class="fileinput-exists">Change</span><input type="file"></span>
<a href="#" class="input-group-addon btn btn-default fileinput-exists" data-dismiss="fileinput">Remove</a>
</div>
</div>
<div class="highlight"><pre><code class="html"><span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;fileinput fileinput-new&quot;</span> <span class="na">data-provides=</span><span class="s">&quot;fileinput&quot;</span><span class="nt">&gt;</span>
<span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;input-group&quot;</span><span class="nt">&gt;</span>
<span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;form-control&quot;</span> <span class="na">data-trigger=</span><span class="s">&quot;fileinput&quot;</span><span class="nt">&gt;&lt;i</span> <span class="na">class=</span><span class="s">&quot;glyphicon glyphicon-file fileinput-exists&quot;</span><span class="nt">&gt;&lt;/i&gt;</span> <span class="nt">&lt;span</span> <span class="na">class=</span><span class="s">&quot;fileinput-filename&quot;</span><span class="nt">&gt;&lt;/span&gt;&lt;/div&gt;</span>
<span class="nt">&lt;span</span> <span class="na">class=</span><span class="s">&quot;input-group-addon btn btn-default btn-file&quot;</span><span class="nt">&gt;&lt;span</span> <span class="na">class=</span><span class="s">&quot;fileinput-new&quot;</span><span class="nt">&gt;</span>Select file<span class="nt">&lt;/span&gt;&lt;span</span> <span class="na">class=</span><span class="s">&quot;fileinput-exists&quot;</span><span class="nt">&gt;</span>Change<span class="nt">&lt;/span&gt;&lt;input</span> <span class="na">type=</span><span class="s">&quot;file&quot;</span> <span class="na">name=</span><span class="s">&quot;...&quot;</span><span class="nt">&gt;&lt;/span&gt;</span>
<span class="nt">&lt;a</span> <span class="na">href=</span><span class="s">&quot;#&quot;</span> <span class="na">class=</span><span class="s">&quot;input-group-addon btn btn-default fileinput-exists&quot;</span> <span class="na">data-dismiss=</span><span class="s">&quot;fileinput&quot;</span><span class="nt">&gt;</span>Remove<span class="nt">&lt;/a&gt;</span>
<span class="nt">&lt;/div&gt;</span>
<div class="highlight"><pre><code class="html"><span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;fileinput fileinput-new input-group&quot;</span> <span class="na">data-provides=</span><span class="s">&quot;fileinput&quot;</span><span class="nt">&gt;</span>
<span class="nt">&lt;div</span> <span class="na">class=</span><span class="s">&quot;form-control&quot;</span> <span class="na">data-trigger=</span><span class="s">&quot;fileinput&quot;</span><span class="nt">&gt;&lt;i</span> <span class="na">class=</span><span class="s">&quot;glyphicon glyphicon-file fileinput-exists&quot;</span><span class="nt">&gt;&lt;/i&gt;</span> <span class="nt">&lt;span</span> <span class="na">class=</span><span class="s">&quot;fileinput-filename&quot;</span><span class="nt">&gt;&lt;/span&gt;&lt;/div&gt;</span>
<span class="nt">&lt;span</span> <span class="na">class=</span><span class="s">&quot;input-group-addon btn btn-default btn-file&quot;</span><span class="nt">&gt;&lt;span</span> <span class="na">class=</span><span class="s">&quot;fileinput-new&quot;</span><span class="nt">&gt;</span>Select file<span class="nt">&lt;/span&gt;&lt;span</span> <span class="na">class=</span><span class="s">&quot;fileinput-exists&quot;</span><span class="nt">&gt;</span>Change<span class="nt">&lt;/span&gt;&lt;input</span> <span class="na">type=</span><span class="s">&quot;file&quot;</span> <span class="na">name=</span><span class="s">&quot;...&quot;</span><span class="nt">&gt;&lt;/span&gt;</span>
<span class="nt">&lt;a</span> <span class="na">href=</span><span class="s">&quot;#&quot;</span> <span class="na">class=</span><span class="s">&quot;input-group-addon btn btn-default fileinput-exists&quot;</span> <span class="na">data-dismiss=</span><span class="s">&quot;fileinput&quot;</span><span class="nt">&gt;</span>Remove<span class="nt">&lt;/a&gt;</span>
<span class="nt">&lt;/div&gt;</span>
</code></pre></div>
@@ -739,7 +741,7 @@
<p>Jasny Bootstrap is a fork of <a href="http://getbootstrap.com/" target="_blank">Twitter Bootstrap</a>. This fork is developed and maintained by <a href="http://twitter.com/ArnoldDaniels" target="_blank">Arnold Daniels</a>.</p>
<p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
<ul class="footer-links">
<li>Currently v3.1.0</li>
<li>Currently v3.1.1</li>
<li class="muted">&middot;</li>
<li><a href="../2.3.1/">Bootstrap 2.3.1 docs</a></li>
<li class="muted">&middot;</li>