From 138b5a8c0569e548ec93803aaa88ea7033363680 Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Wed, 5 Sep 2012 23:07:52 -0300 Subject: Fix small documentatio typos. --- docs/getting-started.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/getting-started.html') diff --git a/docs/getting-started.html b/docs/getting-started.html index 5ef902688..74f91b795 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -199,7 +199,7 @@

4. Basic HTML template

-

With a brief intro into the contents out of the way, we can focus putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the File structure.

+

With a brief intro into the contents out of the way, we can focus on putting Bootstrap to use. To do that, we'll utilize a basic HTML template that includes everything we mentioned in the File structure.

Now, here's a look at a typical HTML file:

 <!DOCTYPE html>
-- 
cgit v1.2.3


From 39791a8ea8445932cebab737087da8710255556a Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 10 Sep 2012 22:44:08 -0700
Subject: fixes #5059 manually: include media type in css getting started block

---
 docs/getting-started.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/getting-started.html')

diff --git a/docs/getting-started.html b/docs/getting-started.html
index 74f91b795..8f00b155f 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -220,7 +220,7 @@
   <head>
     <title>Bootstrap 101 Template</title>
     <!-- Bootstrap -->
-    <link href="css/bootstrap.min.css" rel="stylesheet">
+    <link href="css/bootstrap.min.css" rel="stylesheet" media="screen">
   </head>
   <body>
     <h1>Hello, world!</h1>
-- 
cgit v1.2.3


From 595e1a189c1911ada7c4bd4c769c28b1741611ac Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 13 Sep 2012 10:07:57 -0700
Subject: fixes #5119: javascript in navbar typo

---
 docs/getting-started.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/getting-started.html')

diff --git a/docs/getting-started.html b/docs/getting-started.html
index 8f00b155f..8722fd594 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -58,7 +58,7 @@
                 Components
               
               
  • 
-                Javascript
+                JavaScript
               
    • 
               
  • 
                 Customize
-- 
cgit v1.2.3


From 2ead9a5bc34608c982f06391a55fa82cbd856701 Mon Sep 17 00:00:00 2001
From: Martin Bean 
Date: Fri, 14 Sep 2012 14:06:15 +0100
Subject: Standardized spelling of 'JavaScript'; added icons to file trees

---
 docs/getting-started.html | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'docs/getting-started.html')

diff --git a/docs/getting-started.html b/docs/getting-started.html
index 8722fd594..aa709026a 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -130,18 +130,18 @@
           
           
    Within the download you'll find the following file structure and contents, logically grouping common assets and providing both compiled and minified variations.
    
           
    Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:
    
-
    -  bootstrap/
-  ├── css/
-  │   ├── bootstrap.css
-  │   ├── bootstrap.min.css
-  ├── js/
-  │   ├── bootstrap.js
-  │   ├── bootstrap.min.js
-  ├── img/
-  │   ├── glyphicons-halflings.png
-  │   ├── glyphicons-halflings-white.png
-  └── README.md
+
    +   bootstrap/
+       css/
+           bootstrap.css
+           bootstrap.min.css
+       js/
+           bootstrap.js
+           bootstrap.min.js
+       img/
+           glyphicons-halflings.png
+           glyphicons-halflings-white.png
+       README.md
 
    
           
    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.
    
           
    Please note that all JavaScript plugins require jQuery to be included.
    
@@ -164,11 +164,11 @@
           
    Styles for common HTML elements like typography, code, tables, forms, and buttons. Also includes Glyphicons, a great little icon set.
    
           
    Components
    
           
    Basic styles for common interface components like tabs and pills, navbar, alerts, page headers, and more.
    
-          
    Javascript plugins
    
-          
    Similar to Components, these Javascript plugins are interactive components for things like tooltips, popovers, modals, and more.
    
+          
    JavaScript plugins
    
+          
    Similar to Components, these JavaScript plugins are interactive components for things like tooltips, popovers, modals, and more.
    
 
           
    List of components
    
-          
    Together, the Components and Javascript plugins sections provide the following interface elements:
    
+          
    Together, the Components and JavaScript plugins sections provide the following interface elements:
    
           
      
             
    • Button groups
      • 
             
    • Button dropdowns
      • 
@@ -261,7 +261,7 @@
                 
               
               
      Starter template
      
-              
      A barebones HTML document with all the Bootstrap CSS and javascript included.
      
+              
      A barebones HTML document with all the Bootstrap CSS and JavaScript included.
      
             
           
    
         
-- 
cgit v1.2.3


From faa760f563635c6b3f4f94246ff23ed7f49ae8fb Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 14 Sep 2012 10:30:55 -0700
Subject: revert docs change

---
 docs/getting-started.html | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'docs/getting-started.html')

diff --git a/docs/getting-started.html b/docs/getting-started.html
index aa709026a..7495ef2c2 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -130,18 +130,17 @@
           
           
    Within the download you'll find the following file structure and contents, logically grouping common assets and providing both compiled and minified variations.
    
           
    Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:
    
-
    -   bootstrap/
-       css/
-           bootstrap.css
-           bootstrap.min.css
-       js/
-           bootstrap.js
-           bootstrap.min.js
-       img/
-           glyphicons-halflings.png
-           glyphicons-halflings-white.png
-       README.md
+
    +  bootstrap/
+  ├── css/
+  │   ├── bootstrap.css
+  │   ├── bootstrap.min.css
+  ├── js/
+  │   ├── bootstrap.js
+  │   ├── bootstrap.min.js
+  └── img/
+      ├── glyphicons-halflings.png
+      └── glyphicons-halflings-white.png
 
    
           
    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.
    
           
    Please note that all JavaScript plugins require jQuery to be included.
    
-- 
cgit v1.2.3


From 6c4b276cd4ca648db0afcd84aba809a74fa23bda Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 14 Sep 2012 15:55:46 -0700
Subject: way cooler carousel example, along with updated screenshots for
 examples

---
 docs/getting-started.html | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'docs/getting-started.html')

diff --git a/docs/getting-started.html b/docs/getting-started.html
index 7495ef2c2..7a6d05e42 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -262,6 +262,29 @@
               
    Starter template
    
               
    A barebones HTML document with all the Bootstrap CSS and JavaScript included.
    
             
    • 
+
+            
  • 
+              
+                
+              
+              
    Narrow marketing
    
+              
    Slim, lightweight marketing template for small projects or teams.
    
+            
    • 
+            
  • 
+              
+                
+              
+              
    Sign in
    
+              
    Barebones sign in form with custom, larger form controls and a flexible layout.
    
+            
    • 
+            
  • 
+              
+                
+              
+              
    Carousel jumbotron
    
+              
    A more interactive riff on the basic marketing site featuring a prominent carousel.
    
+            
    • 
+
           
         
 
-- 
cgit v1.2.3


From a4a6244eb7a7514ad7410403bf5b60d1bf3e88b0 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Sun, 30 Sep 2012 22:09:51 -0700
Subject: add sticky footer example per martin bean's suggestion, using the
 implementation by ryan fait

---
 docs/getting-started.html | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'docs/getting-started.html')

diff --git a/docs/getting-started.html b/docs/getting-started.html
index 7a6d05e42..814bb67f2 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -277,6 +277,15 @@
               
    Sign in
    
               
    Barebones sign in form with custom, larger form controls and a flexible layout.
    
             
+            
  • 
+              
+                
+              
+              
    Sticky footer
    
+              
    Pin a fixed-height footer to the bottom of the user's viewport.
    
+            
    • 
+
+
           
         
 
-- 
cgit v1.2.3


From e73cd15fc8eaa80ab7913d51a23a8e61c0e1bb30 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 2 Oct 2012 17:01:18 -0700
Subject: copy and style changes to improve docs rendering on mobile devices

---
 docs/getting-started.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'docs/getting-started.html')

diff --git a/docs/getting-started.html b/docs/getting-started.html
index 814bb67f2..34c43ea60 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -326,12 +326,14 @@