diff --git a/Makefile b/Makefile
index 64a958f22d..f4f367567f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.1.0.css
-BOOTSTRAP_MIN = ./bootstrap-1.1.0.min.css
+BOOTSTRAP = ./bootstrap-1.1.1.css
+BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc`
WATCHR ?= `which watchr`
diff --git a/README.md b/README.md
index 81ba72042f..8ac5f78ff5 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Here's what the LESS version looks like:
Or if you prefer, the standard css way:
- Nerd alert: Bootstrap is built with Less and was designed to work out of the gate with modern browsers in mind.
-
+
@@ -78,7 +78,7 @@
Hotlink the CSS
For the quickest and easiest start, just copy this snippet into your webpage.
@@ -94,7 +94,7 @@
Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.
Bootstrap on GitHub »
Browser support
Bootstrap is tested and supported in major modern browsers like Chrome, Safari, Internet Explorer, and Firefox.
-
+
Latest Safari
Latest Google Chrome
Firefox 4+
Internet Explorer 7+
+ Opera 11
@@ -136,7 +137,7 @@
Example page template (more to come soon)
-
+
@@ -166,7 +167,7 @@
</div>
-
+
1
1
@@ -184,7 +185,7 @@
1
1
1
-
+
2
2
@@ -194,7 +195,7 @@
2
2
2
-
+
3
3
@@ -202,45 +203,45 @@
3
3
1
-
+
+
+
+
+
+
Offsetting columns
+
+
+
+
@@ -252,13 +253,10 @@
Layouts Basic templates to create webpages
-
-
+
Fixed layout
-
A basic 940px wide, centered container layout for just about any site or page.
-
-
+
The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div.container>.
@@ -269,16 +267,10 @@
</div>
</body>
-
-
-
-
-
-
+
+
Fluid layout
-
A flexible fluid or liquid page structure with min- and max-widths and a left-hand sidebar. Great for apps.
-
-
+
An alternative, flexible fluid page structure with min- and max-widths and a left-hand sidebar. Great for apps and docs.
@@ -295,8 +287,8 @@
</div>
</body>
-
-
+
+
-
Headings and copy
+
Headings & copy
A standard typographic hierarchy for structuring your webpages.
+
The entire typographic grid is based on two Less variables in our preboot.less file: @basefont and @baseline. The first is the base font-size used throughout and the second is the base line-height.
+
We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.
h1. Heading 1
@@ -346,7 +340,7 @@
Emphasis tags (<strong> and <em>) should be used to indicate additional importance or emphasis of a word or phrase relative to its surrounding copy. Use <strong> for importance and <em> for stress emphasis.
Emphasis in a paragraph
Fusce dapibus , tellus ac cursus commodo , tortor mauris condimentum nibh , ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.
-
Note: It's still okay to use <b> and <i> tags in HTML5, but they don't come with inherent styles anymore. <b> is meant to highlight words or phrases without conveying additional importance, while <i> is mostly for voice, technical terms, etc.
+
Note: It's still okay to use <b> and <i> tags in HTML5 and they don't have to be styled bold and italic, respectively (although if there is a more semantic element, use it). <b> is meant to highlight words or phrases without conveying additional importance, while <i> is mostly for voice, technical terms, etc.
Addresses
The <address> element is used for contact information for its nearest ancestor, or the entire body of work. Here’s how it looks:
@@ -359,7 +353,7 @@
Abbreviations
For abbreviations and acronyms, use the <abbr> tag (<acronym> is deprecated in HTML5 ). Put the shorthand form within the tag and set a title for the complete name.
-
+
@@ -379,7 +373,7 @@
Dr. Julius Hibbert
-
+
Lists
@@ -448,7 +442,7 @@
Etiam porta sem malesuada magna mollis euismod.
-
+
@@ -511,7 +505,7 @@
-<table class="common-table">
+<table>
...
</table>
Example: Zebra-striped
@@ -548,7 +542,7 @@
Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.
-<table class="common-table zebra-striped">
+<table class="zebra-striped">
...
</table>
Example: Zebra-striped w/ TableSorter.js
@@ -590,11 +584,11 @@
$("table#sortTableExample").tablesorter({ sortList: [[1,0]] });
});
</script>
-<table class="common-table zebra-striped">
+<table class="zebra-striped">
...
</table>
-
+
@@ -619,7 +613,7 @@
-
+
Select
@@ -631,7 +625,7 @@
5
-
+
Select
@@ -643,26 +637,26 @@
5
-
+
Uneditable Input
Some Value Here
-
+
+
+
Example form legend
@@ -674,7 +668,7 @@
Example form legend
@@ -735,7 +729,7 @@
Note: Labels surround all the options for much larger click areas and a more usable form.
-
+
Date Range
@@ -748,7 +742,7 @@
All times are shown as Pacific Standard Time (GMT -08:00).
-
+
Textarea
@@ -757,7 +751,7 @@
Block of help text to describe the field above if need be.
-
+
List of Options
@@ -776,14 +770,14 @@
-
+
Save Changes Cancel
-
+
-
+
Select
@@ -813,7 +807,7 @@
5
-
+
Example form legend
@@ -823,7 +817,7 @@
Small snippet of help text
-
+
List of Options
@@ -845,26 +839,30 @@
Note: Labels surround all the options for much larger click areas and a more usable form.
-
+
Save Changes Cancel
-
+
Buttons
As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.
-
All buttons default to a light gray style, but a blue .primary class and a red .danger class is available. Plus, rolling your own styles is easy peasy.
+
All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue .primary class, a light-blue .info class, a green .success class, and a red .danger class. Plus, rolling your own styles is easy peasy.
Example buttons
Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:
- Submit Cancel Delete
+ Primary
+ Default
+ Info
+ Success
+ Danger
Alternate sizes
Fancy larger or smaller buttons? Have at it!
@@ -888,7 +886,7 @@
Primary action Action
-
+
@@ -927,9 +925,9 @@
-
-
-
+
+
+
@@ -945,6 +943,7 @@
As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done.
+ Note: When using the topbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your body.
@@ -1052,7 +1051,7 @@
</div>
-
+
@@ -1068,17 +1067,18 @@
Basic alerts
+
div.alert-message
One-line messages for highlighting the failure, possible failure, or success of an action. Particularly useful for forms.
-
-
×
-
Oh snap! Change this and that and try again.
-
×
Holy gaucamole! Best check yo self, you’re not looking too good.
+
+
×
+
Oh snap! Change this and that and try again.
+
×
Well done! You successfully read this alert message.
@@ -1088,36 +1088,45 @@
Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.
-
+
Block messages
+
div.alert-message.block-message
For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.
-
-
×
-
Oh snap! You got an error! Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.
-
Take this action Or do this
-
×
Holy gaucamole! This is a warning! Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
-
Take this action Or do this
+
+
+
+
×
+
Oh snap! You got an error! Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.
+
×
Well done! You successfully read this alert message. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Maecenas faucibus mollis interdum.
-
Take this action Or do this
+
-
+
@@ -1150,7 +1159,7 @@
-
+
@@ -1183,7 +1192,7 @@ Lorem ipsum dolar sit amet illo error
ipsum verita
@@ -1207,7 +1216,7 @@ Lorem ipsum dolar sit amet illo error
ipsum verita
ipsum verita
Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.
<link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
-<script src="js/less-1.0.41.min.js"></script>
+<script src="js/less-1.1.3.min.js"></script>
Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.
What’s included
Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.
- Color variables
+ Variables
Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.
// Links
@@ -1257,8 +1266,9 @@ Lorem ipsum dolar sit amet illo error ipsum verita
@pink: #c3325f;
@purple: #7a43b6;
-// Baseline
-@baseline: 20px;
+// Baseline grid
+@basefont: 13px;
+@baseline: 18px;
Commenting
@@ -1310,8 +1320,6 @@ Lorem ipsum dolar sit amet illo error ipsum verita
background-image: -webkit-gradient(linear, left top, right top, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
- -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+
- filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7
background-image: linear-gradient(left, @startColor, @endColor); // Le standard
}
.vertical (@startColor: #555, @endColor: #333) {
@@ -1323,14 +1331,12 @@ Lorem ipsum dolar sit amet illo error ipsum verita
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10
- -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+
- filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7
background-image: linear-gradient(@startColor, @endColor); // The standard
}
.directional (@startColor: #555, @endColor: #333, @deg: 45deg) {
...
}
- .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 0.5, @endColor: #c3325f) {
+ .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
...
}
}
@@ -1343,6 +1349,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita
@gridColumns: 16;
@gridColumnWidth: 40px;
@gridGutterWidth: 20px;
+@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1));
// Grid System
.container {
@@ -1351,16 +1358,10 @@ Lorem ipsum dolar sit amet illo error ipsum verita
.clearfix();
}
.columns(@columnSpan: 1) {
- display: inline;
- float: left;
width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1));
- margin-left: @gridGutterWidth;
- &:first-child {
- margin-left: 0;
- }
}
.offset(@columnOffset: 1) {
- margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) !important;
+ margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace;
}
@@ -1368,7 +1369,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita
-
+
+