Skip to content

B
bootstrap
Commit 418e2c7d authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

Conflicts:
	bootstrap.css
parents b81b0e2b 3eb80591
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 388 additions and 1 deletion
bootstrap.css
View file @ 418e2c7d
This diff is collapsed.
bootstrap.min.css
View file @ 418e2c7d
This diff is collapsed.
docs/components.html
View file @ 418e2c7d
......@@ -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">
......
docs/javascript.html
View file @ 418e2c7d
......@@ -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">
......
lib/bootstrap.less
View file @ 418e2c7d
......@@ -30,6 +30,7 @@
@import "wells.less";
@import "component-animations.less";
@import "close.less";
@import "progress-bars.less";
// Components: Nav
@import "navbar.less";
......
lib/mixins.less
View file @ 418e2c7d
......@@ -270,6 +270,15 @@
background-repeat: no-repeat;
// Opera cannot do radial gradients yet
}
.striped(@color,@angle: -45deg) {
background-color: @color;
background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255, 255, 255, .2)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.75, rgba(255, 255, 255, .2)), color-stop(.75, transparent), to(transparent));
background-image: -webkit-linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
background-image: -moz-linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
background-image: -ms-linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
background-image: -o-linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
background-image: linear-gradient(@angle, rgba(255, 255, 255, .2) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .2) 50%, rgba(255, 255, 255, .2) 75%, transparent 75%, transparent);
}
}
// Reset filters for IE
......@@ -320,3 +329,10 @@
border-right: @arrowWidth solid @black;
}
}
.background-size(@width, @height){
-webkit-background-size: @width @height;
-moz-background-size: @width @height;
-o-background-size: @width @height;
background-size: @width @height;
}
lib/progress-bars.less 0 → 100644
View file @ 418e2c7d
@-webkit-keyframes progress-bar-stripes {
from {
background-position: 0 0;
}
to {
background-position: 40px 0;
}
}
/* COMMENTED OUT SO LESS COMPILES
@-moz-keyframes progress-bar-stripes {
from {
background-position: 0 0;
}
to {
background-position: 40px 0;
}
}
*/
@keyframes progress-bar-stripes {
from {
background-position: 0 0;
}
to {
background-position: 40px 0;
}
}
.progress {
height: 25px;
margin-bottom: 18px;
overflow: hidden;
.box-shadow(inset 0 1px 1px 0 rgba(0,0,0,.3), 0 1px 0 0 #fff);
#gradient > .vertical(#fff, #f5f5f5);
.border-radius(10px);
border: 1px solid #ddd;
border-color: rgba(0,0,0,.0);
&.active {
.bar {
-webkit-animation: progress-bar-stripes 2s linear infinite;
-moz-animation: progress-bar-stripes 2s linear infinite;
animation: progress-bar-stripes 2s linear infinite;
}
}
&.animated {
.bar {
.transition(width .6s ease);
}
}
&.danger,
&.error {
.bar {
#gradient > .vertical(#ee5f5b, #c43c35);
}
&.striped {
.bar {
.background-size(40px, 40px);
#gradient > .striped(#ee5f5b);
}
}
}
&.success {
.bar {
#gradient > .vertical(#62c462, #57a957);
}
&.striped {
.bar {
.background-size(40px, 40px);
#gradient > .striped(#62c462);
}
}
}
&.info {
.bar {
#gradient > .vertical(#5bc0de, #339bb9);
}
&.striped {
.bar {
.background-size(40px, 40px);
#gradient > .striped(#5bc0de);
}
}
}
&.striped {
.bar {
.background-size(40px, 40px);
#gradient > .striped(#62c462);
}
}
.bar {
width: 0%;
height: 100%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
.gradientBar(#62c462, #57a957);
@shadow: inset 0 2px 0 rgba(255,255,255,.2), inset -1px -1px 0 rgba(0,0,0,.25),inset 1px 1px 0 rgba(0,0,0,.25);
.box-shadow(@shadow);
.border-radius(10px);
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment