From 4993ab6e0038f73aed82ecfdcb58d51b8d6be917 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 10 Jul 2014 17:54:06 -0700 Subject: start markdowning getting started and moving things to separate pages --- docs/_includes/footer.html | 14 ++-- docs/_includes/getting-started/download.md | 84 --------------------- docs/_includes/getting-started/grunt.html | 32 -------- docs/_includes/getting-started/whats-included.html | 42 ----------- docs/_includes/header.html | 18 ++--- docs/_includes/nav/docs.html | 87 ++++++++++------------ 6 files changed, 55 insertions(+), 222 deletions(-) delete mode 100644 docs/_includes/getting-started/download.md delete mode 100644 docs/_includes/getting-started/grunt.html delete mode 100644 docs/_includes/getting-started/whats-included.html (limited to 'docs/_includes') diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 6aff132af..5edc365f0 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -32,19 +32,19 @@ {% if site.github %} - + {% else %} - + {% endif %} {% if site.github %} - + {% else %} - - - + + + {% endif %} {% if page.slug == "customize" %} - + {% endif %} {% comment %} diff --git a/docs/_includes/getting-started/download.md b/docs/_includes/getting-started/download.md deleted file mode 100644 index b719026ac..000000000 --- a/docs/_includes/getting-started/download.md +++ /dev/null @@ -1,84 +0,0 @@ - - -# Quick start - -Quickly add Bootstrap to your project via the [Bootstrap CDN](http://bootstrapcdn.com), graciously provided by the [MaxCDN](http://www.maxcdn.com/) folks. Copy-paste the stylesheet `` into your `` before all other stylesheets. - -{% highlight html %} - -{% endhighlight %} - -Then, add the Bootstrap JavaScript—and jQuery—near the end of your pages. It's best placed right before the closing `` tag. Be sure to place jQuery first as our code depends on it. - -{% highlight html %} - - -{% endhighlight %} - -Be sure to have your pages set up with the latest design and development standards. That means: - -* Using an HTML5 doctype -* Forcing Internet Explorer to use it's latest rendering mode ([read more]()) -* And, utilizing the viewport meta tag. - -Put it all together and your pages should look like this: - -{% highlight html %} - - - - - - - - -

Hello, world!

- - - - - -{% endhighlight %} - -And that's it. Happy Bootstrapping! - - - - - -# Download - -Bootstrap is available for download via ZIP file in two flavors: precompiled CSS and Javascript, and the complete source code with documentation. - - - -### Precompiled - -Compiled and minified CSS and JavaScript. No docs or original source files are included. - -Download Bootstrap - - - -### Source code and docs - -Source Less, JavaScript, and documentation. **Requires a Less compiler and [some setup](#grunt).** - -Download source - - - -### Bower - -Install and manage Bootstrap's Less, CSS, and JavaScript using [Bower](http://bower.io). - -{% highlight bash %}$ bower install bootstrap{% endhighlight %} - - - - -### npm - -Bootstrap is available as [an npm package](https://www.npmjs.org/package/bootstrap). Install it into your Node powered apps with: - -{% highlight bash %}$ npm install bootstrap{% endhighlight %} diff --git a/docs/_includes/getting-started/grunt.html b/docs/_includes/getting-started/grunt.html deleted file mode 100644 index 93fa44a70..000000000 --- a/docs/_includes/getting-started/grunt.html +++ /dev/null @@ -1,32 +0,0 @@ -
-

Compiling CSS and JavaScript

- -

Bootstrap uses Grunt for its build system, with convenient methods for working with the framework. It's how we compile our code, run tests, and more.

- -

Installing Grunt

-

To install Grunt, you must first download and install node.js (which includes npm). npm stands for node packaged modules and is a way to manage development dependencies through node.js.

- - Then, from the command line: -
    -
  1. Install grunt-cli globally with npm install -g grunt-cli.
    2. -
  2. Navigate to the root /bootstrap/ directory, then run npm install. npm will look at the package.json file and automatically install the necessary local dependencies listed there.
    3. -
- -

When completed, you'll be able to run the various Grunt commands provided from the command line.

- -

Available Grunt commands

-

grunt dist (Just compile CSS and JavaScript)

-

Regenerates the /dist/ directory with compiled and minified CSS and JavaScript files. As a Bootstrap user, this is normally the command you want.

- -

grunt watch (Watch)

-

Watches the Less source files and automatically recompiles them to CSS whenever you save a change.

- -

grunt test (Run tests)

-

Runs JSHint and runs the QUnit tests headlessly in PhantomJS.

- -

grunt (Build absolutely everything and run tests)

-

Compiles and minifies CSS and JavaScript, builds the documentation website, runs the HTML5 validator against the docs, regenerates the Customizer assets, and more. Usually only necessary if you're hacking on Bootstrap itself.

- -

Troubleshooting

-

Should you encounter problems with installing dependencies or running Grunt commands, first delete the /node_modules/ directory generated by npm. Then, rerun npm install.

-
diff --git a/docs/_includes/getting-started/whats-included.html b/docs/_includes/getting-started/whats-included.html deleted file mode 100644 index cf1fec0c3..000000000 --- a/docs/_includes/getting-started/whats-included.html +++ /dev/null @@ -1,42 +0,0 @@ -
-

What's included

- -

Bootstrap is downloadable in two forms, within which you'll find the following directories and files, logically grouping common resources and providing both compiled and minified variations.

- -
-

jQuery required

-

Please note that all JavaScript plugins require jQuery to be included, as shown in the starter template. Consult our bower.json to see which versions of jQuery are supported.

-
- -

Precompiled Bootstrap

-

Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:

- -{% highlight bash %} -bootstrap/ -├── css/ -│ ├── bootstrap.css -│ ├── bootstrap.min.css -│ ├── bootstrap-theme.css -│ └── bootstrap-theme.min.css -└── js/ - ├── bootstrap.js - └── bootstrap.min.js -{% endhighlight %} - -

This is the most basic form of Bootstrap: precompiled 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.*). Also included is the optional Bootstrap theme.

- -

Bootstrap source code

-

The Bootstrap source code download includes the precompiled CSS and JavaScript assets, along with source Less, JavaScript, and documentation. More specifically, it includes the following and more:

-{% highlight bash %} -bootstrap/ -├── less/ -├── js/ -├── dist/ -│ ├── css/ -│ └── js/ -└── docs/ - └── examples/ -{% endhighlight %} -

The less/ and js/ are the source code for our CSS and JavaScript. The dist/ folder includes everything listed in the precompiled download section above. The docs/ folder includes the source code for our documentation, and examples/ of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.

-
diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 47e7e9839..8514235a9 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -15,29 +15,29 @@ {% if site.github %} - + {% else %} - + {% endif %} {% if page.slug == "css" or page.slug == "components" or page.slug == "js" %} {% if site.github %} - + {% else %} - + {% endif %} {% endif %} - + - - + + - - + +