diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | bootstrap-1.0.0.css | 4 | ||||
| -rw-r--r-- | bootstrap-1.0.0.min.css | 2 | ||||
| -rw-r--r-- | docs/index.html | 24 | ||||
| -rw-r--r-- | lib/bootstrap.less | 3 | ||||
| -rw-r--r-- | lib/type.less | 2 |
6 files changed, 18 insertions, 19 deletions
@@ -26,7 +26,7 @@ For more info, refer to the docs! Reporting bugs -------------- -Please create an issue here on github! :P +Please create an issue here on GitHub! :P Google Group diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index fc8f7359ac..375ed11882 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: Tue Aug 16 22:54:18 PDT 2011 + * Date: Wed Aug 17 23:02:19 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). @@ -617,7 +617,7 @@ code, pre { code { background-color: #fee9cc; color: rgba(0, 0, 0, 0.75); - padding: 2px 3px; + padding: 1px 3px; } pre { background-color: #f5f5f5; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 18283c4ad3..82ad946923 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -76,7 +76,7 @@ blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}bloc blockquote cite{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote cite:before{content:'\2014 \00A0';} address{display:block;line-height:18px;margin-bottom:18px;} code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:2px 3px;} +code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre-wrap;} form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;color:#404040;} form div.clearfix{margin-bottom:18px;} diff --git a/docs/index.html b/docs/index.html index 3199f5fc32..ba46ef69af 100644 --- a/docs/index.html +++ b/docs/index.html @@ -33,7 +33,7 @@ <li><a href="#navigation">Navigation</a></li> <li><a href="#alerts">Alerts</a></li> <li><a href="#popovers">Popovers</a></li> - <li><a href="#less">LESS</a></li> + <li><a href="#less">Less</a></li> </ul> </div> </div> @@ -41,12 +41,12 @@ <div id="masthead"> <div class="inner"> <div class="container"> - <h1>Bootstrap from Twitter</h1> + <h1>Twitter Bootstrap</h1> <p class="lead"> Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.<br /> It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.<br /> </p> - <p><strong>Nerd alert:</strong> Bootstrap is <a href="#less" title="Read about using Bootstrap with LESS">built with LESS</a> and was designed to work out of the gate with only modern browsers in mind.</p> + <p><strong>Nerd alert:</strong> Bootstrap is <a href="#less" title="Read about using Bootstrap with Less">built with Less</a> and was designed to work out of the gate with only modern browsers in mind.</p> </div> <!-- /container --> </div> </div> @@ -62,8 +62,8 @@ </form> </div> <div class="span5 columns"> - <h6>Use it with LESS</h6> - <p>A fan of using LESS.js? No problem, just clone the repo and add these lines:</p> + <h6>Use it with Less</h6> + <p>A fan of using Less? No problem, just clone the repo and add these lines:</p> <form> <textarea class="copy-code" rows="2"><link rel="stylesheet/less" type="text/css" href="/path/to/bootstrap.less"> <script src="/path/to/less.js"></script></textarea> @@ -1145,25 +1145,25 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita <section id="less"> <div class="page-header"> - <h1>Using Bootstrap with LESS <small>Supercharge your CSS with variables, mixins, and functions</small></h1> + <h1>Using Bootstrap with Less <small>Supercharge your CSS with variables, mixins, and functions</small></h1> </div> <div class="row"> <div class="span4 columns"> - <p>Bootstrap was built with <a href="http://markdotto.com/bootstrap/">Preboot</a>, an open-source pack of mixins and variables to be used in conjunction with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor for faster and easier web development.</p> - <p>Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run LESS on your next project.</p> + <p>Bootstrap was built with <a href="http://markdotto.com/bootstrap/">Preboot</a>, an open-source pack of mixins and variables to be used in conjunction with <a href="http://lesscss.org" target="_blank">Less</a>, a CSS preprocessor for faster and easier web development.</p> + <p>Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.</p> </div> <div class="span12 columns"> <h2>How to use it</h2> - <p>Use this option to make full use of Bootstrap's LESS variables, mixins, and nesting in CSS via javascript in your browser.</p> + <p>Use this option to make full use of Bootstrap's Less variables, mixins, and nesting in CSS via javascript in your browser.</p> <pre class="prettyprint linenums"> <link rel="stylesheet/less" type="text/css" href="less/bootstrap.less" media="all" /> <script type="text/javascript" src="js/less-1.0.41.min.js"></script></pre> -<p>Not feeling the .js solution? <a href="http://incident57.com/less" target="_blank">Try the LESS Mac app</a> or <a href="http://lesscss.org/#-client-side-usage" target="_blank">use Node.js</a> to compile when you deploy your code.</p> +<p>Not feeling the .js solution? <a href="http://incident57.com/less" target="_blank">Try the Less Mac app</a> or <a href="http://lesscss.org/#-client-side-usage" target="_blank">use Node.js</a> to compile when you deploy your code.</p> <h2>What's included</h2> <p>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.</p> <h3>Color variables</h3> - <p>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.</p> + <p>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.</p> <pre class="prettyprint linenums"> // Links @linkColor: #8b59c2; @@ -1191,7 +1191,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita </pre> <h3>Commenting</h3> -<p>LESS also provides another style of commenting in addition to CSS's normal <code>/* ... */</code> syntax.</p> +<p>Less also provides another style of commenting in addition to CSS's normal <code>/* ... */</code> syntax.</p> <pre class="prettyprint linenums"> // This is a comment /* This is also a comment */ diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 28ac8cbfe7..ead0c8f832 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -20,5 +20,4 @@ @import "type.less"; @import "forms.less"; @import "tables.less"; -@import "patterns.less"; - +@import "patterns.less";
\ No newline at end of file diff --git a/lib/type.less b/lib/type.less index 7d6b392596..1ba44ad660 100644 --- a/lib/type.less +++ b/lib/type.less @@ -169,7 +169,7 @@ code, pre { code { background-color: lighten(@orange, 40%); color: rgba(0,0,0,.75); - padding: 2px 3px; + padding: 1px 3px; } pre { background-color: #f5f5f5; |