Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <mark.otto@twitter.com>2011-07-29 23:30:59 +0400
committerMark Otto <mark.otto@twitter.com>2011-07-29 23:30:59 +0400
commit68d4b85ffc542ef85eb4fe1bfba7acf6d504f522 (patch)
tree3ebf117feb386f2e92c336e450e0a5667fdb6499
parenta7d65d7d8fdb65d514fb7638209175f87eb92a04 (diff)
no idea what these changes are
-rw-r--r--.DS_Storebin6148 -> 6148 bytes
-rw-r--r--README.md11
-rw-r--r--bootstrap-1.0.0.css2
-rw-r--r--lib/type.less2
4 files changed, 9 insertions, 6 deletions
diff --git a/.DS_Store b/.DS_Store
index 4372a5b717..a8a6c98ff3 100644
--- a/.DS_Store
+++ b/.DS_Store
Binary files differ
diff --git a/README.md b/README.md
index 94e8233481..ee1bfbb138 100644
--- a/README.md
+++ b/README.md
@@ -1,20 +1,20 @@
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 ==
-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:
- <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>
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!
@@ -29,6 +29,9 @@ Please create an issue here on github! :P
**Mark Otto**
http://twitter.com/mdo
+**Jacob Thornton**
+http://twitter.com/fat
+
== Copyright and License ==
diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index 2f592d3579..c5eb05684e 100644
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* 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
diff --git a/lib/type.less b/lib/type.less
index cc18bff602..2f2bcac42a 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -10,7 +10,7 @@ p {
#font > .shorthand(normal,@basefont,@baseline);
margin-bottom: @baseline;
small {
- font-size: 12px;
+ font-size: 11px;
color: @grayLight;
}
}