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

Merge branch 'noahblon-master' into 2.0.1-wip

Browse Source 
Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Mark Otto
2012-02-05 01:26:44 -08:00
parent 2f42f35c69 f922a0800b
commit 9b5b8460b4
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
docs/templates/pages/base-css.mustache vendored
View File

@@ -938,9 +938,9 @@
</div>
</div>
<div class="control-group warning">
<label class="control-label" for="inputError">{{_i}}Input with warning{{/i}}</label>
<label class="control-label" for="inputWarning">{{_i}}Input with warning{{/i}}</label>
<div class="controls">
<input type="text" id="inputError">
<input type="text" id="inputWarning">
<span class="help-inline">{{_i}}Something may have gone wrong{{/i}}</span>
</div>
</div>
@@ -952,9 +952,9 @@
</div>
</div>
<div class="control-group success">
<label class="control-label" for="inputError">{{_i}}Input with success{{/i}}</label>
<label class="control-label" for="inputSuccess">{{_i}}Input with success{{/i}}</label>
<div class="controls">
<input type="text" id="inputError">
<input type="text" id="inputSuccess">
<span class="help-inline">{{_i}}Woohoo!{{/i}}</span>
</div>
</div>
@@ -1458,11 +1458,11 @@
<div class="span4">
<form>
<div class="control-group">
<label class="control-label" for="prependedInput">{{_i}}Email address{{/i}}</label>
<label class="control-label" for="inputIcon">{{_i}}Email address{{/i}}</label>
<div class="controls">
<div class="input-prepend">
<span class="add-on"><i class="icon-envelope"></i></span>
<input class="span2" id="iconInput" type="text">
<input class="span2" id="inputIcon" type="text">
</div>
</div>
</div>

2
docs/templates/pages/download.mustache vendored
View File

@@ -17,7 +17,7 @@
<div class="page-header">
<a class="btn btn-small pull-right toggle-all" href="#">{{_i}}Toggle all{{/i}}</a>
<h1>
{{_i}}1. Chose components{{/i}}
{{_i}}1. Choose components{{/i}}
<small>{{_i}}Get just the CSS you need{{/i}}</small>
</h1>
</div>

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

@@ -847,7 +847,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<hr>
<h2>{{_i}}Using bootstrap-alerts.js{{/i}}</h2>
<p>{{_i}}Enable dismissal of an alert via javascript:{{/i}}</p>
<pre class="prettyprint linenums">$(".alert-message").alert()</pre>
<pre class="prettyprint linenums">$(".alert").alert()</pre>
<h3>{{_i}}Markup{{/i}}</h3>
<p>{{_i}}Just add <code>data-dismiss="alert"</code> to your close button to automatically give an alert close functionality.{{/i}}</p>
<pre class="prettyprint linenums">&lt;a class="close" data-dismiss="alert" href="#"&gt;&amp;times;&lt;/a&gt;</pre>
@@ -856,7 +856,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<p>{{_i}}Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the <code>.fade</code> and <code>.in</code> class already applied to them.{{/i}}</p>
<h4>.alert('close')</h4>
<p>{{_i}}Closes an alert.{{/i}}</p>
<pre class="prettyprint linenums">$(".alert-message").alert('close')</pre>
<pre class="prettyprint linenums">$(".alert").alert('close')</pre>
<h3>{{_i}}Events{{/i}}</h3>
<p>{{_i}}Bootstrap's alert class exposes a few events for hooking into alert functionality.{{/i}}</p>
<table class="table table-bordered table-striped">