Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

Commit

Permalink
Updated README and regenerated css files
Browse files Browse the repository at this point in the history
  • Loading branch information
flowonyx committed Feb 17, 2012
1 parent 57750b6 commit 7cfe183
Show file tree
Hide file tree
Showing 9 changed files with 1,203 additions and 765 deletions.
24 changes: 12 additions & 12 deletions README.md
@@ -1,18 +1,18 @@
#Twitter Bootstrap 2.0 with HTML5 Boilerplate 3.0 styles ported to Stylus
#Twitter Bootstrap 2.0.1 with HTML5 Boilerplate 3.0 styles ported to Stylus

Sorry I couldn't think up a cool name. It is what it is. :)

All the credit goes to the [Twitter Bootstrap](https://github.com/twitter/bootstrap) and [HTML5 Boilerplate](https://github.com/h5bp/html5-boilerplate) guys and gals.
All the credit goes to the [Twitter Bootstrap](https://github.com/twitter/bootstrap) and [HTML5 Boilerplate](https://github.com/h5bp/html5-boilerplate) guys and gals as well as @visionmedia for [nib](https://github.com/visionmedia/nib).

## What is it?

If you haven't already, go read about [Twitter Bootstrap](http://twitter.github.com/bootstrap/) and [HTML5 Boilerplate](http://html5boilerplate.com/).

This project only uses the css portion of HTML5 Boilerplate. Since both Twitter Bootstrap 2.0 and HTML5 Boilerplate include/are based on [normalize.css](https://github.com/necolas/normalize.css/), there is a lot of overlap, but Bootstrap does not include everything. I have included here only the parts of HTML5 Boilerplate that I saw were missing in Bootstrap.

## Changes in final CSS from the official Twitter Bootstrap 2.0
This project also now includes a customized version of [nib](https://github.com/visionmedia/nib) so all the goodness of nib is automatically available for your custom styles. The reason it is a customized version is to bring its output more in line with Twitter Bootstrap's output. Everything still works the same, only some of the `vendor` mixins now only output for the vendors that have actually implemented those prefixed styles.

## Changes in final CSS from the official Twitter Bootstrap 2.0.1

Below is a list of everything you should see if you do a diff on the outputted bootstrap.css and the official version. Most of the changes in the css make no semantic difference, although some do.
Below used to be a list of everything you should see if you do a diff on the outputted bootstrap.css and the official version. Since updating to use `nib`, this is not entirely accurate, but it will give you an idea of the differences. Most of the changes in the css make no semantic difference, although some do.

* Stylus stacks multiple selectors instead of placing them on one line:
* Instead of `audio, canvas, video` on one line, you get them on three lines.
Expand Down Expand Up @@ -85,14 +85,14 @@ I certainly hope this is helpful to somebody. It was an interesting exercise an

Copyright and license for any changes made
------------------------------------------
Anything added/changed, etc. which does not fall under the licensing of HTML5 Boilerplate or Twitter Bootstrap 2.0 is released to the Public Domain.
Anything added/changed, etc. which does not fall under the licensing of HTML5 Boilerplate or Twitter Bootstrap 2.0.1 is released to the Public Domain.

Copyright and license for HTML5 Boilerplate
-------------------------------------------
The parts included here are released to the Public Domain.

Copyright and license for Twitter Bootstrap 2.0
-----------------------------------------------
Copyright and license for Twitter Bootstrap 2.0.1
-------------------------------------------------

Copyright 2012 Twitter, Inc.

Expand All @@ -108,9 +108,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

Glyphicons use in Twitter Bootstrap 2.0
---------------------------------------
Glyphicons use in Twitter Bootstrap 2.0.1
-----------------------------------------

From the Twitter Bootstrap 2.0 docs:
From the Twitter Bootstrap 2.0.1 docs:

[Glyphicons](http://glyphicons.com/) has granted us use of the Halflings set in our open-source toolkit so long as we provide a link and credit here in the docs. Please consider doing the same in your projects.
64 changes: 9 additions & 55 deletions css/bootstrap-responsive.css
@@ -1,5 +1,5 @@
/*
* Bootstrap Responsive v2.0.0
* Bootstrap Responsive v2.0.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand All @@ -13,7 +13,7 @@
}
@media (max-width: 480px) {
.nav-collapse {
-webkit-transform: translate3d(0, 0, 0);
-webkit-transform: transform: translate(0, 0, 0);;
}
.page-header h1 small {
display: block;
Expand All @@ -25,7 +25,7 @@
.uneditable-input {
display: block;
width: 100%;
height: 28px;
min-height: 28px;
/* Make inputs at least the height of their button counterpart */
/* Makes inputs behave like true block-level elements */
-webkit-box-sizing: border-box;
Expand All @@ -34,8 +34,6 @@
/* Older FF */
-ms-box-sizing: border-box;
/* IE8 */
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
/* CSS3 spec*/
}
Expand Down Expand Up @@ -101,18 +99,9 @@
margin: 0;
}
}
@media (min-width: 768px) and (max-width: 980px) {
@media (min-width: 768px) and (max-width: 979px) {
.row {
margin-left: -20px;
*zoom: 1;
}
.row:before,
.row:after {
display: table;
content: "";
}
.row:after {
clear: both;
}
[class*="span"] {
float: left;
Expand Down Expand Up @@ -190,15 +179,6 @@
}
.row-fluid {
width: 100%;
*zoom: 1;
}
.row-fluid:before,
.row-fluid:after {
display: table;
content: "";
}
.row-fluid:after {
clear: both;
}
.row-fluid > [class*="span"] {
float: left;
Expand Down Expand Up @@ -304,7 +284,7 @@
width: 714px;
}
}
@media (max-width: 980px) {
@media (max-width: 979px) {
body {
padding-top: 0;
}
Expand Down Expand Up @@ -340,14 +320,15 @@
.navbar .nav > .divider-vertical {
display: none;
}
.navbar .nav .nav-header {
color: #999;
text-shadow: none;
}
.navbar .nav > li > a,
.navbar .dropdown-menu a {
padding: 6px 15px;
font-weight: bold;
color: #999;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.navbar .dropdown-menu li + li a {
margin-bottom: 2px;
Expand All @@ -367,12 +348,6 @@
padding: 0;
background-color: transparent;
border: none;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}
.navbar .dropdown-menu:before,
.navbar .dropdown-menu:after {
Expand All @@ -388,9 +363,6 @@
margin: 9px 0;
border-top: 1px solid #222;
border-bottom: 1px solid #222;
-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.10), 0 1px 0 rgba(255,255,255,0.10);
-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.10), 0 1px 0 rgba(255,255,255,0.10);
box-shadow: inset 0 1px 0 rgba(255,255,255,0.10), 0 1px 0 rgba(255,255,255,0.10);
}
.navbar .nav.pull-right {
float: none;
Expand All @@ -416,15 +388,6 @@
@media (min-width: 1200px) {
.row {
margin-left: -30px;
*zoom: 1;
}
.row:before,
.row:after {
display: table;
content: "";
}
.row:after {
clear: both;
}
[class*="span"] {
float: left;
Expand Down Expand Up @@ -502,15 +465,6 @@
}
.row-fluid {
width: 100%;
*zoom: 1;
}
.row-fluid:before,
.row-fluid:after {
display: table;
content: "";
}
.row-fluid:after {
clear: both;
}
.row-fluid > [class*="span"] {
float: left;
Expand Down
31 changes: 12 additions & 19 deletions css/bootstrap-responsive.min.css
@@ -1,5 +1,5 @@
/*
* Bootstrap Responsive v2.0.0
* Bootstrap Responsive v2.0.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
Expand All @@ -8,9 +8,9 @@
* Designed and built with all the love in the world @twitter by @mdo and @fat.
*/
.hidden{display:none;visibility:hidden}
@media (max-width: 480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}
@media (max-width: 480px){.nav-collapse{-webkit-transform:transform:translate(0, 0, 0)}
.page-header h1 small{display:block;line-height:18px}
input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;}
.input-prepend input[class*="span"],.input-append input[class*="span"]{width:auto}
input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}
.form-horizontal .control-group > label{float:none;width:auto;padding-top:0;text-align:left}
Expand All @@ -25,9 +25,7 @@ input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}
.row-fluid{width:100%}
.row{margin-left:0}
.row > [class*="span"],.row-fluid > [class*="span"]{float:none;display:block;width:auto;margin:0}
}@media (min-width: 768px) and (max-width: 980px){.row{margin-left:-20px;*zoom:1;}
.row:before,.row:after{display:table;content:""}
.row:after{clear:both}
}@media (min-width: 768px) and (max-width: 979px){.row{margin-left:-20px;}
[class*="span"]{float:left;margin-left:20px}
.span1{width:42px}
.span2{width:104px}
Expand All @@ -52,9 +50,7 @@ input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}
.offset9{margin-left:578px}
.offset10{margin-left:640px}
.offset11{margin-left:702px}
.row-fluid{width:100%;*zoom:1;}
.row-fluid:before,.row-fluid:after{display:table;content:""}
.row-fluid:after{clear:both}
.row-fluid{width:100%;}
.row-fluid > [class*="span"]{float:left;margin-left:2.762430939%}
.row-fluid > [class*="span"]:first-child{margin-left:0}
.row-fluid .span1{width:5.801104972%}
Expand All @@ -81,7 +77,7 @@ input.span9,textarea.span9,.uneditable-input.span9{width:528px}
input.span10,textarea.span10,.uneditable-input.span10{width:590px}
input.span11,textarea.span11,.uneditable-input.span11{width:652px}
input.span12,textarea.span12,.uneditable-input.span12{width:714px}
}@media (max-width: 980px){body{padding-top:0}
}@media (max-width: 979px){body{padding-top:0}
.navbar-fixed-top{position:static;margin-bottom:18px}
.navbar-fixed-top .navbar-inner{padding:5px}
.navbar .container{width:auto;padding:0}
Expand All @@ -91,21 +87,20 @@ input.span12,textarea.span12,.uneditable-input.span12{width:714px}
.navbar .nav > li{float:none}
.navbar .nav > li > a{margin-bottom:2px}
.navbar .nav > .divider-vertical{display:none}
.navbar .nav > li > a,.navbar .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
.navbar .nav .nav-header{color:#999;text-shadow:none}
.navbar .nav > li > a,.navbar .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999;}
.navbar .dropdown-menu li + li a{margin-bottom:2px}
.navbar .nav > li > a:hover,.navbar .dropdown-menu a:hover{background-color:#222}
.navbar .dropdown-menu{position:static;top:auto;left:auto;float:none;display:block;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}
.navbar .dropdown-menu{position:static;top:auto;left:auto;float:none;display:block;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:none;}
.navbar .dropdown-menu:before,.navbar .dropdown-menu:after{display:none}
.navbar .dropdown-menu .divider{display:none}
.navbar-form,.navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222;border-bottom:1px solid #222;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.10),0 1px 0 rgba(255,255,255,0.10);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.10),0 1px 0 rgba(255,255,255,0.10);box-shadow:inset 0 1px 0 rgba(255,255,255,0.10),0 1px 0 rgba(255,255,255,0.10)}
.navbar-form,.navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222;border-bottom:1px solid #222;}
.navbar .nav.pull-right{float:none;margin-left:0}
.navbar-static .navbar-inner{padding-left:10px;padding-right:10px}
.btn-navbar{display:block}
.nav-collapse{overflow:hidden;height:0}
}@media (min-width: 980px){.nav-collapse.collapse{height:auto !important}
}@media (min-width: 1200px){.row{margin-left:-30px;*zoom:1;}
.row:before,.row:after{display:table;content:""}
.row:after{clear:both}
}@media (min-width: 1200px){.row{margin-left:-30px;}
[class*="span"]{float:left;margin-left:30px}
.span1{width:70px}
.span2{width:170px}
Expand All @@ -130,9 +125,7 @@ input.span12,textarea.span12,.uneditable-input.span12{width:714px}
.offset9{margin-left:930px}
.offset10{margin-left:1030px}
.offset11{margin-left:1130px}
.row-fluid{width:100%;*zoom:1;}
.row-fluid:before,.row-fluid:after{display:table;content:""}
.row-fluid:after{clear:both}
.row-fluid{width:100%;}
.row-fluid > [class*="span"]{float:left;margin-left:2.564102564%}
.row-fluid > [class*="span"]:first-child{margin-left:0}
.row-fluid .span1{width:5.982905983%}
Expand Down

0 comments on commit 7cfe183

Please sign in to comment.