mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-27 15:19:52 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.0-wip' of https://github.com/pokonski/bootstrap into pokonski-2.0-wip

Browse Source 
Conflicts:
	bootstrap.css
This commit is contained in:
Mark Otto
2012-01-07 13:52:36 -08:00
parent b81b0e2b15 3eb80591b2
commit 418e2c7d58
7 changed files with 388 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
docs/components.html
View File

@@ -925,6 +925,47 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="bottom">ipsum</a> verit
</div><!-- /row -->
</section>
<!-- Progress bars
================================================== -->
<section id="progresss">
<div class="page-header">
<h1>Progress bars <small>... for indicating progress</small></h1>
</div>
<div class="row">
<div class="span3">
<h2>Basic bars</h2>
<p>Default look of progress bars. Absolute minimum.</p>
</div>
<div class="span9">
<div class="progress">
<div class="bar" style="width: 50%;"></div>
</div>
</div>
</div>
<div class="row">
<div class="span3">
<h2>Striped bars</h2>
<p>Bars with stripes painted.</p>
</div>
<div class="span9">
<div class="progress info striped">
<div class="bar" style="width: 20%;"></div>
</div>
</div>
</div>
<div class="row">
<div class="span3">
<h2>Active state</h2>
<p>Animated stripes! <small>Not on Opera, though :(</small></p>
</div>
<div class="span3">
<div class="progress danger active striped">
<div class="bar" style="width: 45%"></div>
</div>
</div>
</div>
</section>
<!-- Footer
================================================== -->
<footer class="footer">

43
docs/javascript.html
View File

@@ -23,6 +23,49 @@
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
<!-- Le javascript -->
<!-- placed up here so that the inline demos can be next to their markup -->
<script src="http://code.jquery.com/jquery-1.7.min.js"></script>
<script type="text/javascript">
// NOT FINAL BY ANY MEANS, JUST MAH JANK CODE BRO
$(document).ready(function() {
$('.nav .active').click(function(e) {
e.preventDefault();
$(this).siblings().toggle();
});
});
</script>
<script src="assets/js/google-code-prettify/prettify.js"></script>
<script>$(function () { prettyPrint() })</script>
<script src="../js/bootstrap-transition.js"></script>
<script src="../js/bootstrap-alert.js"></script>
<script src="../js/bootstrap-modal.js"></script>
<script src="../js/bootstrap-dropdown.js"></script>
<script src="../js/bootstrap-scrollspy.js"></script>
<script src="../js/bootstrap-tab.js"></script>
<script src="../js/bootstrap-twipsy.js"></script>
<script src="../js/bootstrap-popover.js"></script>
<script src="../js/bootstrap-button.js"></script>
<script>
$(function () {
// twipsy demo
$("a[rel=twipsy]").twipsy({
live: true
})
//popover demo
$("a[rel=popover]")
.popover({
offset: 10
})
.click(function(e) {
e.preventDefault()
})
})
</script>
</head>
<body id="bootstrap-js">