mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
This commit is contained in:
Mark Otto
2013-01-17 20:23:33 -08:00
parent f068cdeb63 01b465928e
commit d9b35c2602
27 changed files with 5491 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/tests/css-tests.html
+51
View File
@@ -994,8 +994,59 @@
<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 -->
less/type.less
+4
View File
@@ -44,6 +44,10 @@ a.text-success:hover { color: darken(@state-success-text, 10%); }
.text-right { text-align: right; }
.text-center { text-align: center; }
.text-left { text-align: left; }
.text-right { text-align: right; }
.text-center { text-align: center; }
// Headings
// -------------------------