diff --git a/bootstrap.css b/bootstrap.css index 33be3d9660..3b04dc30e8 100644 --- a/bootstrap.css +++ b/bootstrap.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 Jan 24 23:35:08 PST 2012 + * Date: Wed Jan 25 01:02:35 PST 2012 */ article, aside, @@ -577,9 +577,9 @@ textarea { margin-left: 10px; } input, textarea { - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; -ms-transition: border linear 0.2s, box-shadow linear 0.2s; @@ -588,9 +588,9 @@ input, textarea { } input:focus, textarea:focus { border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); outline: 0; } input[type=file]:focus, input[type=checkbox]:focus, select:focus { diff --git a/bootstrap.min.css b/bootstrap.min.css index 3c2b70663b..4cbd235022 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -108,8 +108,8 @@ textarea{height:auto;} .controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:6px;} .radio.inline,.checkbox.inline{display:inline-block;margin-bottom:0;} .radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} -input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} -input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);outline:0;} +input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} +input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;} input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;} .input-mini{width:60px;} .input-small{width:90px;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8c30e733d8..12c534fb2d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -442,68 +442,78 @@ section { } -/* CSS Chop Shop +/* Download page -------------------------------------------------- */ -.builder { +.download .page-header { + margin-top: 36px; } -.builder .span2 { - width: 160px; -} -.builder ul { - margin: 0; - list-style: none; -} -.builder .tabs { - margin-right: 0; -} -.builder .tabs a { - width: 160px; - padding: 14px; - font-size: 14px; -} -.builder .tab-content { - padding: 19px; - margin-left: 189px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 0 4px 4px 4px; - -moz-border-radius: 0 4px 4px 4px; - border-radius: 0 4px 4px 4px; +.page-header .toggle-all { + margin-top: 13px; } /* Space out h3s when following a section */ -.builder input + h3, -.builder .checkbox + h3 { +.download h3 { + margin-bottom: 5px; +} +.download-builder input + h3, +.download-builder .checkbox + h3 { margin-top: 9px; } /* Fields for variables */ -.builder input + h3 { - margin-top: 9px; -} -.builder #variables label { - margin-bottom: 2px; - color: #555; -} -.builder input[type=text] { +.download-builder input[type=text] { margin-bottom: 9px; font-family: Menlo, Monaco, "Courier New", monospace; font-size: 12px; color: #d14; background-color: #f7f7f9; } -.builder input[type=text]:focus { +.download-builder input[type=text]:focus { background-color: #fff; } - -.builder-actions { - margin-top: 18px; - padding-top: 18px; - border-top: 1px solid #eee; +/* Custom, larger checkbox labels */ +.download .checkbox { + padding: 6px 10px 6px 25px; + font-size: 14px; + color: #555; + background-color: #f9f9f9; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + cursor: pointer; } -.builder-actions .toggle-all { - float: right; - line-height: 36px; +.download .checkbox:hover { + color: #333; + background-color: #f5f5f5; +} +.download .checkbox input[type=checkbox] { + position: relative; + top: 1px; +} +.download .checkbox small { + font-size: 12px; + color: #777; +} + +/* Giant download button */ +.download-btn { + pading: 18px 20px; + margin: 45px 0; + text-align: center; + border: 1px solid #eee; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; +} +.btn.xlarge { + margin: 36px auto; + padding: 14px 24px; + font-size: 30px; + text-align: center; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; } diff --git a/docs/assets/js/google-code-prettify/prettify.css b/docs/assets/js/google-code-prettify/prettify.css index 0d54905fbc..aedd8d1a91 100644 --- a/docs/assets/js/google-code-prettify/prettify.css +++ b/docs/assets/js/google-code-prettify/prettify.css @@ -27,8 +27,4 @@ ol.linenums li { color: #bebec5; line-height: 18px; text-shadow: 0 1px 0 #fff; -} -/* Alternate shading for lines */ -li.L1, li.L3, li.L5, li.L7, li.L9 { - } \ No newline at end of file diff --git a/docs/base-css.html b/docs/base-css.html index 6847c0616a..75c7efe5e6 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -51,6 +51,9 @@
  • Using LESS
  • +
  • + Download +
  • @@ -65,11 +68,11 @@

    On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.

    diff --git a/docs/components.html b/docs/components.html index d823998d95..c1cec739cd 100644 --- a/docs/components.html +++ b/docs/components.html @@ -51,6 +51,9 @@
  • Using LESS
  • +
  • + Download +
  • @@ -65,15 +68,15 @@

    Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.

    diff --git a/docs/download.html b/docs/download.html new file mode 100644 index 0000000000..1d74c4f78b --- /dev/null +++ b/docs/download.html @@ -0,0 +1,312 @@ + + + + + Bootstrap, from Twitter + + + + + + + + + + + + + + + + + + + + + + + + +
    + +
    + Heads up! This page is still under construction and is missing plenty of documentation. Hang tight! +
    + + +
    +

    Download and customize Bootstrap

    +

    Download the full repository or customize your entire Bootstrap build by selecting only the components, javascript plugins, and assets you need.

    +
    + +
    + +
    +
    +

    Scaffolding

    + + + +

    Base CSS

    + + + + + + + +
    +
    +

    Components

    + + + + + + + + + + +
    +
    +

    JS Components

    + + + + + + + +
    +
    +

    Miscellaneous

    + + + + +

    Responsive

    + + + +
    +
    + + +
    +
    +

    Links

    + + + + +

    Grid system

    + + + + + + + + + + +
    +
    +

    Typography

    + + + + + + +

    Forms

    + + + + +

    Navbar

    + + + + + + +
    +
    +

    Form states & alerts

    + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + + +
    +
    + + + + + + +
    +
    + + + + + + +
    +
    +

    Heads up!

    +

    All plugins require the latest version of jQuery to be included.

    +
    +
    + + +
    + + + + +
    + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/index.html b/docs/index.html index 2bbcaa78aa..83e65c97e6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -51,6 +51,9 @@
  • Using LESS
  • +
  • + Download +
  • diff --git a/docs/javascript.html b/docs/javascript.html index 425d347cb8..a7818ff461 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -51,6 +51,9 @@
  • Using LESS
  • +
  • + Download +
  • @@ -65,18 +68,18 @@

    Bring Bootstrap's components to life—now with 12 custom jQuery plugins.

    diff --git a/docs/less.html b/docs/less.html index 55138c71aa..6bb04e8d86 100644 --- a/docs/less.html +++ b/docs/less.html @@ -51,6 +51,9 @@
  • Using LESS
  • +
  • + Download +
  • @@ -69,177 +72,16 @@

    Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.

    - -
    - - -
    -
    - -
    -
    -
    -
    -

    Scaffolding

    - - - -

    Base CSS

    - - - - - - - -
    -
    -

    Components

    - - - - - - - - - - -
    -
    -

    JS Components

    - - - - - - - -
    -
    -

    Responsive

    - - - -

    Miscellaneous

    - - - - -
    -
    - -
    -
    -
    -
    -

    Links

    - - - - -

    Grid system

    - - - - - - - - - - -
    -
    -

    Typography

    - - - - - - -

    Forms

    - - - - -

    Navbar

    - - - - - - -
    -
    -

    Form states & alerts

    - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    - -
    -
    -

    And you're set!

    -

    We've compiled your selected CSS and customized variables and have them ready to download as a tidy ZIP file. Choose from compiled or compiled and minified CSS files.

    - Download CSS Download minified CSS -
    -

    Looking to customize your javascript? Head over to the Javascript plugins page to build your own Bootstrap JS bundle.

    -
    -
    -
    -
    - -
    - - -
    @@ -249,7 +91,7 @@

    Why LESS?

    -

    Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

    +

    Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by our good friend, Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

    What's included?

    @@ -283,7 +125,7 @@ ================================================== -->

    Hyperlinks

    @@ -554,85 +396,8 @@ - - - - - - - - - - - - - - - -
    - -
    -
    -

    Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.

    -

    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.

    -
    -
    -

    How to use it

    -

    Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.

    -
    -<link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
    -<script src="js/less-1.1.3.min.js"></script>
    -

    Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.

    - -

    What’s included

    -

    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.

    -

    Variables

    -

    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.

    -
    -// Links
    -@linkColor:         #8b59c2;
    -@linkColorHover:    darken(@linkColor, 10);
    -
    -// Grays
    -@black:             #000;
    -@grayDark:          lighten(@black, 25%);
    -@gray:              lighten(@black, 50%);
    -@grayLight:         lighten(@black, 70%);
    -@grayLighter:       lighten(@black, 90%);
    -@white:             #fff;
    -
    -// Accent Colors
    -@blue:              #08b5fb;
    -@green:             #46a546;
    -@red:               #9d261d;
    -@yellow:            #ffc40d;
    -@orange:            #f89406;
    -@pink:              #c3325f;
    -@purple:            #7a43b6;
    -
    -// Baseline grid
    -@basefont:          13px;
    -@baseline:          18px;
    -
    - -

    Commenting

    -

    Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.

    -
    -// This is a comment
    -/* This is also a comment */
    -
    -

    Mixins up the wazoo

    Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.

    Font stacks

    @@ -686,69 +451,59 @@ } -

    Compiling Less

    -

    After modifying the .less files in /lib/, you'll need to recompile them in order to regenerate the bootstrap-*.*.*.css and bootstrap-*.*.*.min.css files. If you're submitting a pull request to GitHub, you must always recompile.

    -

    Ways to compile

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    MethodSteps
    Node with makefile -

    Install the LESS command line compiler with npm by running the following command:

    -
    $ npm install less
    -

    Once installed just run make from the root of your bootstrap directory and you're all set.

    -

    Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).

    -
    Javascript -

    Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.

    + + +
    + +
    + Note: If you're submitting a pull request to GitHub with modified CSS, you must recompile the CSS via any of these methods. +
    +

    Tools for compiling

    +
    +
    +

    Node with makefile

    +

    Install the LESS command line compiler with npm by running the following command:

    +
    $ npm install less
    +

    Once installed just run make from the root of your bootstrap directory and you're all set.

    +

    Additionally, if you have watchr installed, you may run make watch to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).

    +
    +
    +

    Command line

    +

    Install the LESS command line tool via Node and run the following command:

    +
    $ lessc ./lib/bootstrap.less > bootstrap.css
    +

    Be sure to include --compress in that command if you're trying to save some bytes!

    +
    +
    +

    Javascript

    +

    Download the latest Less.js and include the path to it (and Bootstrap) in the <head>.

     <link rel="stylesheet/less" href="/path/to/bootstrap.less">
     <script src="/path/to/less.js"></script>
     
    -

    To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.

    -
    Command line -

    Install the LESS command line tool via Node and run the following command:

    -
    $ lessc ./lib/bootstrap.less > bootstrap.css
    -

    Be sure to include --compress in that command if you're trying to save some bytes!

    -
    Unofficial Mac app -

    The unofficial Mac app watches directories of .less files and compiles the code to local files after every save of a watched .less file.

    -

    If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.

    -
    CrunchCrunch is a great looking LESS editor and compiler built on Adobe Air.
    CodeKitCreated by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.
    SimplessMac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.
    -
    -
    - +

    To recompile the .less files, just save them and reload your page. Less.js compiles them and stores them in local storage.

    +
    +
    +
    +
    +

    Unofficial Mac app

    +

    The unofficial Mac app watches directories of .less files and compiles the code to local files after every save of a watched .less file.

    +

    If you like, you can toggle preferences in the app for automatic minifying and which directory the compiled files end up in.

    +
    +
    +

    More Mac apps

    +

    Crunch

    +

    Crunch is a great looking LESS editor and compiler built on Adobe Air.

    +

    CodeKit

    +

    Created by the same guy as the unofficial Mac app, CodeKit is a Mac app that compiles LESS, SASS, Stylus, and CoffeeScript.

    +

    Simpless

    +

    Mac, Linux, and PC app for drag and drop compiling of LESS files. Plus, the source code is on GitHub.

    +
    +
    +