Skip to content

B
bootstrap
Commit 0e13f8dc authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

Merge branch 'master' of github.com:twitter/bootstrap into js-examples 

Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
	lib/patterns.less
	lib/scaffolding.less
parents b4a84e1e 2589c0ac
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1043 additions and 686 deletions
Makefile
View file @ 0e13f8dc
DATE=$(shell DATE)
BOOTSTRAP = ./bootstrap-1.1.1.css
BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css
BOOTSTRAP = ./bootstrap-1.2.0.css
BOOTSTRAP_MIN = ./bootstrap-1.2.0.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc`
WATCHR ?= `which watchr`
......
README.md
View file @ 0e13f8dc
......@@ -18,11 +18,29 @@ Here's what the LESS version looks like:
Or if you prefer, the standard css way:
<link rel="stylesheet" type="text/css" href="bootstrap-1.1.1.css">
<link rel="stylesheet" type="text/css" href="bootstrap-1.2.0.css">
For more info, refer to the docs!
Versioning
----------
For transparency and insight into our release cycle, and for striving to maintain backwards compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.
Releases will be numbered with the follow format:
`<major>.<minor>.<patch>`
And constructed with the following guidelines:
* Breaking backwards compatibility bumps the major
* New additions without breaking backwards compatibility bumps the minor
* Bug fixes and misc changes bump the patch
For more information on SemVer, please visit http://semver.org/.
Bug Tracker
-----------
......
bootstrap-1.1.1.css → bootstrap-1.2.0.css
View file @ 0e13f8dc
This diff is collapsed.
docs/assets/css/docs.css
View file @ 0e13f8dc
......@@ -24,8 +24,7 @@ section > .row {
background-image: -moz-linear-gradient(#004D9F, #049cd9);
background-image: -o-linear-gradient(top, #004D9F, #049cd9);
background-image: -khtml-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9));
filter: progid:DXImageTransform.Microsoft.Gradient(StartColorStr='#004D9F', EndColorStr='#049cd9', GradientType=0);
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#004D9F', EndColorStr='#049cd9', GradientType=0))";
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#004D9F', endColorstr='#049cd9', GradientType=0); /* IE8 and down */
}
#masthead div.inner, #footer div.inner {
background: transparent url(../img/grid-18px.png) top center;
......@@ -200,8 +199,7 @@ div.topbar-wrapper div.topbar {
position: absolute;
margin: 0 -20px;
}
div.topbar-wrapper div.topbar .fill {
div.topbar-wrapper div.topbar .topbar-inner {
padding-left: 20px;
padding-right: 20px;
-webkit-border-radius: 4px;
......
docs/assets/js/application.js
View file @ 0e13f8dc
......@@ -5,6 +5,7 @@ $(document).ready(function(){
prettyPrint();
// scroll spy logic
// ================
......@@ -19,7 +20,6 @@ $(document).ready(function(){
return $(id).offset().top;
});
function setButton(id) {
nav.parent("li").removeClass('active');
$(nav[$.inArray(id, targets)]).parent("li").addClass('active');
......@@ -48,10 +48,9 @@ $(document).ready(function(){
// ===============================
$("body").bind("click", function (e) {
$('a.menu').parent("li").removeClass("open");
$('.dropdown-toggle, .menu').parent("li").removeClass("open");
});
$("a.menu").click(function (e) {
$(".dropdown-toggle, .menu").click(function (e) {
var $li = $(this).parent("li").toggleClass('open');
return false;
});
......
docs/index.html
View file @ 0e13f8dc
This diff is collapsed.
examples/hero.html
View file @ 0e13f8dc
......@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.1.1.css" rel="stylesheet">
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
<!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico">
......@@ -27,7 +27,7 @@
<div class="fill">
<div class="container">
<h3><a href="#">Project name</a></h3>
<ul>
<ul class="nav">
<li class="active"><a href="#">Home</a></li>
<li><a href="#about">About</a></li>
<li><a href="#contact">Contact</a></li>
......
lib/adaptive.less 0 → 100644
View file @ 0e13f8dc
/* Responsive.less
* Adjusted grid styles to handle some common screen sizes
* ------------------------------------------------------- */
// MOBILE PORTRAIT & LANDSCAPE
// ---------------------------
// For devices narrower than 480px
@media only screen and (max-width: 480px) {
// Remove fixed width of containers
.container {
width: auto;
padding: 0 10px;
}
// Undo the floating of columns
.row {
margin-left: 0;
}
.row [class^="span"] {
float: none;
width: 100%;
display: block;
margin-left: 0;
}
// Stack form elements instead of floating them
fieldset legend {
margin-left: 0;
}
label {
float: none;
width: auto;
text-align: left;
}
div.input {
margin-left: 0;
width: 100%;
}
.input-xxlarge,
input.xxlarge,
textarea.xxlarge,
select.xxlarge {
width: 80%;
}
// Adjust modal
.modal-backdrop {
padding: 10px;
}
.modal {
width: 100%;
margin: 0;
left: auto;
}
}
\ No newline at end of file
lib/bootstrap.less
View file @ 0e13f8dc
/*!
* Bootstrap v1.1.1
* Bootstrap v1.2.0
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
......
lib/forms.less
View file @ 0e13f8dc
......@@ -61,29 +61,58 @@ input[type=radio] {
}
// Inputs, Textareas, Selects
input[type=text],
input[type=password],
input,
textarea,
select,
.uneditable-input {
display: inline-block;
width: 210px;
height: @baseline;
padding: 4px;
font-size: 13px;
line-height: @baseline;
height: @baseline;
color: @gray;
border: 1px solid #ccc;
.border-radius(3px);
}
/* mini reset for non-html5 file types */
input[type=checkbox],
input[type=radio] {
width: auto;
height: auto;
padding: 0;
margin: 3px 0;
*margin-top: 0; /* IE6-7 */
line-height: normal;
border: none;
}
input[type=file] {
background-color: #fff;
padding: initial;
border: initial;
line-height: initial;
.box-shadow(none);
}
input[type=button],
input[type=reset],
input[type=submit] {
width: auto;
height: auto;
}
select,
input[type=file] {
height: @baseline * 1.5;
line-height: @baseline * 1.5;
}
textarea {
height: auto;
}
.uneditable-input {
background-color: #eee;
display: block;
......@@ -100,15 +129,13 @@ textarea {
}
// Focus states
input[type=text],
input[type=password],
input,
select, textarea {
@transition: border linear .2s, box-shadow linear .2s;
.transition(@transition);
.box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
}
input[type=text]:focus,
input[type=password]:focus,
input:focus,
textarea:focus {
outline: none;
border-color: rgba(82,168,236,.8);
......@@ -128,8 +155,7 @@ form div.error {
span.help-block {
color: @red;
}
input[type=text],
input[type=password],
input,
textarea {
border-color: @error-text;
.box-shadow(0 0 3px rgba(171,41,32,.25));
......@@ -221,7 +247,7 @@ input.disabled {
// Inline Fields (input fields that appear as inline objects
.inline-inputs {
color: @gray;
span, input[type=text] {
span, input {
display: inline-block;
}
input.mini {
......@@ -238,8 +264,7 @@ input.disabled {
// Allow us to put symbols and text within the input field for a cleaner look
.input-prepend,
.input-append {
input[type=text],
input[type=password] {
input {
.border-radius(0 3px 3px 0);
}
.add-on {
......@@ -270,8 +295,7 @@ input.disabled {
}
}
.input-append {
input[type=text],
input[type=password] {
input {
float: left;
.border-radius(3px 0 0 3px);
}
......
lib/patterns.less
View file @ 0e13f8dc
This diff is collapsed.
lib/preboot.less
View file @ 0e13f8dc
......@@ -36,7 +36,7 @@
@gridColumns: 16;
@gridColumnWidth: 40px;
@gridGutterWidth: 20px;
@extraSpace: 40px;
@extraSpace: (@gridGutterWidth * 2); // For our grid calculations
@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
// Color Scheme
......@@ -231,6 +231,7 @@
background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
background-image: linear-gradient(left, @startColor, @endColor); // Le standard
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE9 and down
}
.vertical (@startColor: #555, @endColor: #333) {
background-color: @endColor;
......@@ -242,6 +243,7 @@
background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
background-image: linear-gradient(top, @startColor, @endColor); // The standard
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down
}
.directional (@startColor: #555, @endColor: #333, @deg: 45deg) {
background-color: @endColor;
......@@ -257,13 +259,19 @@
background-repeat: no-repeat;
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-image: -moz-linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
background-image: -ms-linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor);
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down, gets no color-stop at all for proper fallback
}
}
// Reset filters for IE
.reset-filter() {
filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
}
// Opacity
.opacity(@opacity: 100) {
filter: e(%("alpha(opacity=%d)", @opacity));
......
lib/reset.less
View file @ 0e13f8dc
......@@ -133,14 +133,4 @@ input[type="search"]::-webkit-search-decoration {
textarea {
overflow: auto; // Remove vertical scrollbar in IE6-9
vertical-align: top; // Readability and alignment cross-browser
}
// Tables
// -------------------------
// Source: http://github.com/necolas/normalize.css
// Remove spacing between table cells
table {
border-collapse: collapse;
border-spacing: 0;
}
\ No newline at end of file
lib/scaffolding.less
View file @ 0e13f8dc
......@@ -9,28 +9,14 @@
.row {
.clearfix();
margin-left: -20px;
margin-left: -1 * @gridGutterWidth;
// Default columns
.span1,
.span2,
.span3,
.span4,
.span5,
.span6,
.span7,
.span8,
.span9,
.span10,
.span11,
.span12,
.span13,
.span14,
.span15,
.span16 {
// Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
// Credit to @dhg for the idea
[class^="span"] {
display: inline;
float: left;
margin-left: 20px;
margin-left: @gridGutterWidth;
}
// Default columns
......@@ -64,6 +50,12 @@
.offset10 { .offset(10); }
.offset11 { .offset(11); }
.offset12 { .offset(12); }
// Unique column sizes for 16-column grid
.span-one-third { width: 300px; }
.span-two-thirds { width: 620px; }
.offset-one-third { margin-left: 340px; }
.offset-two-thirds { margin-left: 660px; }
}
......@@ -77,7 +69,6 @@ body {
margin: 0;
#font > .sans-serif(normal,@basefont,@baseline);
color: @gray;
text-rendering: optimizeLegibility;
}
// Container (centered, fixed-width layouts)
......@@ -90,11 +81,12 @@ body {
.container-fluid {
padding: 0 20px;
.clearfix();
.sidebar {
> .sidebar {
float: left;
width: 220px;
}
.content {
// TODO in v2: rename this and .popover .content to be more specific
> .content {
min-width: 700px;
max-width: 1180px;
margin-left: 240px;
......
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