mirror of https://github.com/twbs/bootstrap.git
no idea what these changes are
This commit is contained in:
parent
a7d65d7d8f
commit
68d4b85ffc
11
README.md
11
README.md
|
@ -1,20 +1,20 @@
|
||||||
TWITTER BASELINE
|
TWITTER BASELINE
|
||||||
----------------
|
----------------
|
||||||
Baseline is Twitter's toolkit for kickstarting CSS for websites, apps, and more. It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more.
|
Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps, and more. It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more.
|
||||||
|
|
||||||
|
|
||||||
== Usage ==
|
== Usage ==
|
||||||
|
|
||||||
You can use Twitter Baseline in one of two ways: just drop the compiled CSS into any new project and start cranking, or run LESS on your site and compile on the fly like a boss.
|
You can use Twitter Bootstrap in one of two ways: just drop the compiled CSS into any new project and start cranking, or run LESS on your site and compile on the fly like a boss.
|
||||||
|
|
||||||
Here's what the LESS version looks like:
|
Here's what the LESS version looks like:
|
||||||
|
|
||||||
<link rel="stylesheet/less" type="text/css" href="lib/global.less">
|
<link rel="stylesheet/less" type="text/css" href="lib/bootstrap.less">
|
||||||
<script src="less.js" type="text/javascript"></script>
|
<script src="less.js" type="text/javascript"></script>
|
||||||
|
|
||||||
Or if you prefer, the standard css way:
|
Or if you prefer, the standard css way:
|
||||||
|
|
||||||
<link rel="stylesheet" type="text/css" href="baseline-1.0.0.css">
|
<link rel="stylesheet" type="text/css" href="bootstrap-1.0.0.css">
|
||||||
|
|
||||||
For more info, refer to the docs!
|
For more info, refer to the docs!
|
||||||
|
|
||||||
|
@ -29,6 +29,9 @@ Please create an issue here on github! :P
|
||||||
**Mark Otto**
|
**Mark Otto**
|
||||||
http://twitter.com/mdo
|
http://twitter.com/mdo
|
||||||
|
|
||||||
|
**Jacob Thornton**
|
||||||
|
http://twitter.com/fat
|
||||||
|
|
||||||
|
|
||||||
== Copyright and License ==
|
== Copyright and License ==
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
*
|
*
|
||||||
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
||||||
* Date: Sat Jul 2 15:34:02 PDT 2011
|
* Date: Sat Jul 23 22:37:22 PDT 2011
|
||||||
*/
|
*/
|
||||||
/*
|
/*
|
||||||
* Reset.less
|
* Reset.less
|
||||||
|
|
|
@ -10,7 +10,7 @@ p {
|
||||||
#font > .shorthand(normal,@basefont,@baseline);
|
#font > .shorthand(normal,@basefont,@baseline);
|
||||||
margin-bottom: @baseline;
|
margin-bottom: @baseline;
|
||||||
small {
|
small {
|
||||||
font-size: 12px;
|
font-size: 11px;
|
||||||
color: @grayLight;
|
color: @grayLight;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue