From b4e0e4fee65fb50f7981d28bb875083e0da1a303 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Wed, 26 Jun 2013 15:59:33 +0200 Subject: Adjust info callout, add callouts to docs * Adjust the background-color of bs-callout-info to match danger and warning in tone * Convert all the callouts * Change some callouts to info/warning * Add new callout --- docs/getting-started.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/getting-started.html') diff --git a/docs/getting-started.html b/docs/getting-started.html index 718e8ed79..1acea891f 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -49,7 +49,7 @@ lead: "An overview of Bootstrap, how to download and use, basic templates and ex {% endhighlight %} -
+

LESS compilation

If you download the original files, you need to compile Bootstrap's LESS files into usable CSS. To do that, Bootstrap only officially supports Recess, Twitter's CSS hinter built on top of less.js.

@@ -81,7 +81,7 @@ bootstrap/ {% endhighlight %}

This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). The image files are compressed using ImageOptim, a Mac app for compressing PNGs.

-
+

jQuery required

Please note that all JavaScript plugins require jQuery to be included, as shown in the starter template.

@@ -228,7 +228,7 @@ bootstrap/

Once you've downloaded and included Bootstrap's CSS into your templates, you can move on to customizing the included components. To do so, create a new stylesheet (LESS, if you like, or just plain CSS) to house your customizations.

-
+

Compiled or minified?

Unless you plan on reading a good chunk of the compiled CSS, go with the minified. It's the same code, just compacted. Less bandwidth is good, especially in production environments.

@@ -282,7 +282,7 @@ bootstrap/

Going beyond light customizations and into visual overhauls is just as straightforward as the above custom button. For a site like Karma, which uses Bootstrap as a CSS reset with heavy modifications, more extensive work is involved, but well worth it in the end.

-
+

Alternate customization methods

While not recommended for folks new to Bootstrap, you may use one of two alternate methods for customization. The first is modifying the source .less files (making upgrades super difficult), and the second is mapping source LESS code to your own classes via mixins. For the time being, neither options are documented here.

-- cgit v1.2.3 From aa49c919c65ea4eb7777d3f54cdc9da0e1a05f9f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 17 Jul 2013 19:08:08 -0700 Subject: Fixes #8356: Move browser compatibility from wiki into real docs --- docs/getting-started.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'docs/getting-started.html') diff --git a/docs/getting-started.html b/docs/getting-started.html index 56e6cbc32..f951cfc78 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -81,6 +81,24 @@ bootstrap/
+ +
+
+

Browser compatibility

+
+

Bootstrap is built to work best in the latest desktop and mobile browsers, meaning older and less advanced browsers might receive a less stylized, though fully functional, version of certain components.

+

Specifically, we support the latest versions of the following:

+
    +
  • Chrome (Mac, Windows, iOS, and Android)
    • +
  • Safari (Mac and iOS only, as Windows has more or less been discontinued)
    • +
  • Firefox (Mac, Windows)
    • +
  • Internet Explorer
    • +
  • Opera (Mac, Windows)
    • +
+

Unofficially, Bootstrap should look and behave just fine in Chromium for Linux and Internet Explorer 7-8, though full support is not guaranteed.

+
+
-- cgit v1.2.3 From f4b9938d8c0c23ff3b1b5e1e8fee9229d2e67bfa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 17 Jul 2013 19:20:08 -0700 Subject: Move license FAQs to the docs, add link to side nav --- docs/getting-started.html | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'docs/getting-started.html') diff --git a/docs/getting-started.html b/docs/getting-started.html index f951cfc78..4ff2a9d88 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -231,6 +231,52 @@ bootstrap/ + +
+
+

License FAQs

+
+

Bootstrap is released under the Apache 2 license. Boiled down to smaller chunks, it can be described with the following conditions.

+ +
+
+

It allows you to:

+
    +
  • Freely download and use Twitter open source software, in whole or in part, for personal, company internal or commercial purposes
    • +
  • Use Twitter open source software in packages or distributions that you create
    • +
+
+
+

It forbids you to:

+
    +
  • Redistribute any piece of Twitter open source originated software without proper attribution
    • +
  • Use any marks owned by Twitter in any way that might state or imply that Twitter endorses your distribution
    • +
  • Use any marks owned by Twitter in any way that might state or imply that you created the Twitter software in question
    • +
+
+
+
+
+

It requires you to:

+
    +
  • Include a copy of the license in any redistribution you may make that includes Twitter software
    • +
  • Provide clear attribution to Twitter for any distributions that include Twitter open source software
    • +
+
+
+

It does not require you to:

+
    +
  • Include the source of the Twitter software itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it
    • +
  • Submit changes that you make to the software back to Twitter (though such feedback is encouraged)
    • +
+
+
+

The full Bootstrap license is located in the project repository for more information.

+
+ + +
-- cgit v1.2.3 From 06d47b008233c487844146cf1cc037d691068a0a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 17 Jul 2013 19:26:37 -0700 Subject: Fixes #8360: Add mention of IE compatibility mode to docs --- docs/getting-started.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/getting-started.html') diff --git a/docs/getting-started.html b/docs/getting-started.html index 4ff2a9d88..32ff37530 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -88,6 +88,8 @@ bootstrap/

Browser compatibility

Bootstrap is built to work best in the latest desktop and mobile browsers, meaning older and less advanced browsers might receive a less stylized, though fully functional, version of certain components.

+ +

Supported browsers

Specifically, we support the latest versions of the following:

  • Chrome (Mac, Windows, iOS, and Android)
    • @@ -97,6 +99,9 @@ bootstrap/
  • Opera (Mac, Windows)

Unofficially, Bootstrap should look and behave just fine in Chromium for Linux and Internet Explorer 7-8, though full support is not guaranteed.

+ +

IE Compatibility modes

+

Bootstrap is not supported in the old Internet Explorer compatibility modes. To be sure you're using the latest rendering mode for IE, consider including <meta http-equiv="X-UA-Compatible" content="IE=edge"> in your pages. See this StackOverflow question for more information.