1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
This commit is contained in:
Jacob Thornton 2011-08-21 22:30:39 -07:00
parent 109027433d
commit 3ef86aa703
6 changed files with 8 additions and 8 deletions

View file

@ -1,6 +1,6 @@
DATE=$(shell DATE)
BOOTSTRAP = ./bootstrap-1.0.0.css
BOOTSTRAP_MIN = ./bootstrap-1.0.0.min.css
BOOTSTRAP = ./bootstrap-1.1.0.css
BOOTSTRAP_MIN = ./bootstrap-1.1.0.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc`
WATCHR ?= `which watchr`

View file

@ -18,7 +18,7 @@ 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.0.0.css">
<link rel="stylesheet" type="text/css" href="bootstrap-1.1.0.css">
For more info, refer to the docs!

View file

@ -1,12 +1,12 @@
/*!
* Bootstrap v1.0.0
* Bootstrap v1.1.0
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Sun Aug 21 22:26:51 PDT 2011
* Date: Sun Aug 21 22:29:48 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).

View file

@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.0.0.css" rel="stylesheet">
<link href="../bootstrap-1.1.0.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
@ -78,7 +78,7 @@
<h6>Hotlink the CSS</h6>
<p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
<form>
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.0.0.min.css"></textarea>
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.1.0.min.css"></textarea>
</form>
</div>
<div class="span5 columns">

2
lib/bootstrap.less vendored
View file

@ -1,5 +1,5 @@
/*!
* Bootstrap v1.0.0
* Bootstrap v1.1.0
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0