From: Mark Otto <otto@github.com>
Date: Sat, 2 Feb 2013 05:41:13 +0000 (-0800)
Subject: Merge branch 'dospuntocero-master' into 2.3.0-wip
X-Git-Tag: v2.3.0^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f0bc9e79ba2fee466a100995a9fe9deca03a226;p=thirdparty%2Fbootstrap.git

Merge branch 'dospuntocero-master' into 2.3.0-wip
---

8f0bc9e79ba2fee466a100995a9fe9deca03a226
diff --cc less/tests/css-tests.html
index cdb6c7bcaa,98496b7620..c69688c763
--- a/less/tests/css-tests.html
+++ b/less/tests/css-tests.html
@@@ -1291,61 -1291,13 +1291,64 @@@
  <h4>Striped</h4>
  <div class="gradient-striped"></div>
  
+ <h4>Horizontal three colors</h4>
+ <div class="gradient-horizontal-three"></div>
+ 
  
  
 +<div class="page-header">
 +  <h1>Alerts</h1>
 +</div>
 +
 +<h4>Alert default</h4>
 +<div class="alert">
 +  <button type="button" class="close" data-dismiss="alert">&times;</button>
 +  <strong>Alert!</strong> Best check yourself, you're not looking too good.
 +</div>
 +<div class="alert alert-block">
 +  <button type="button" class="close" data-dismiss="alert">&times;</button>
 +  <p><strong>Alert!</strong> Best check yourself, you're not looking too good.</p>
 +</div>
  
 +<h4>Success</h4>
 +<div class="alert alert-success">
 +  <button type="button" class="close" data-dismiss="alert">&times;</button>
 +  <strong>Success!</strong> Best check yourself, you're not looking too good.
 +</div>
 +<div class="alert alert-block alert-success">
 +  <button type="button" class="close" data-dismiss="alert">&times;</button>
 +  <p><strong>Success!</strong> Best check yourself, you're not looking too good.</p>
 +</div>
  
 +<h4>Info</h4>
 +<div class="alert alert-info">
 +  <button type="button" class="close" data-dismiss="alert">&times;</button>
 +  <strong>Info!</strong> Best check yourself, you're not looking too good.
 +</div>
 +<div class="alert alert-block alert-info">
 +  <button type="button" class="close" data-dismiss="alert">&times;</button>
 +  <p><strong>Info!</strong> Best check yourself, you're not looking too good.</p>
 +</div>
 +
 +<h4>Warning</h4>
 +<div class="alert ">
 +  <button type="button" class="close" data-dismiss="alert">&times;</button>
 +  <strong>Warning!</strong> Best check yourself, you're not looking too good.
 +</div>
 +<div class="alert alert-block alert-warning">
 +  <button type="button" class="close" data-dismiss="alert">&times;</button>
 +  <p><strong>Warning!</strong> Best check yourself, you're not looking too good.</p>
 +</div>
 +
 +<h4>Error</h4>
 +<div class="alert alert-error">
 +  <button type="button" class="close" data-dismiss="alert">&times;</button>
 +  <strong>Error!</strong> Best check yourself, you're not looking too good.
 +</div>
 +<div class="alert alert-block alert-error">
 +  <button type="button" class="close" data-dismiss="alert">&times;</button>
 +  <p><strong>Error!</strong> Best check yourself, you're not looking too good.</p>
 +</div>
  
  
      </div><!-- /container -->