3.0.0 -> 3.0.1
[bootswatch] / tests / components.html
index 9c3c8a3..9133222 100644 (file)
@@ -1,24 +1,31 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Bootswatch: Default Bootstrap</title>
+    <title>Bootswatch: Components</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta charset="utf-8">
-    <link rel="stylesheet" href="../build/cerulean/bootstrap.min.css" media="screen">
+    <link rel="stylesheet" href="../amelia/bootstrap.css" media="screen">
     <link rel="stylesheet" href="../bower_components/font-awesome/css/font-awesome.min.css">
     <link rel="stylesheet" href="../assets/css/bootswatch.min.css">
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="../bower_components/bootstrap/assets/js/html5shiv.js"></script>
+      <script src="../bower_components/bootstrap/assets/js/respond.min.js"></script>
+    <![endif]-->
   </head>
   <body>
 
-    <div class="navbar navbar-fixed-top">
+    <div class="navbar navbar-default navbar-fixed-top">
       <div class="container">
-        <a href="../" class="navbar-brand">Bootswatch</a>
-        <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <div class="nav-collapse collapse" id="navbar-main">
+        <div class="navbar-header">
+          <a href="../" class="navbar-brand">Bootswatch</a>
+          <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+        </div>
+        <div class="navbar-collapse collapse" id="navbar-main">
           <ul class="nav navbar-nav">
             <li class="dropdown">
               <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="themes">Themes <span class="caret"></span></a>
@@ -35,7 +42,6 @@
                 <li><a tabindex="-1" href="../simplex/">Simplex</a></li>
                 <li><a tabindex="-1" href="../slate/">Slate</a></li>
                 <li><a tabindex="-1" href="../spacelab/">Spacelab</a></li>
-                <li><a tabindex="-1" href="../superhero/">Superhero</a></li>
                 <li><a tabindex="-1" href="../united/">United</a></li>
               </ul>
             </li>
@@ -57,7 +63,7 @@
             </li>
           </ul>
 
-          <ul class="nav navbar-nav pull-right">
+          <ul class="nav navbar-nav navbar-right">
             <li><a href="http://builtwithbootstrap.com/" target="_blank">Built With Bootstrap</a></li>
             <li><a href="https://wrapbootstrap.com/?ref=bsw" target="_blank">WrapBootstrap</a></li>
           </ul>
         </div>
 
         <h2 id="tables-example">Basic example</h2>
-        <div class="bs-example">
+        <div class="bs-example table-responsive">
           <table class="table">
             <thead>
               <tr>
 
 
         <h2 id="forms-control-sizes">Control sizing</h2>
-        <p>Set heights using classes like <code>.input-large</code>, and set widths using grid column classes like <code>.col-lg-*</code>.</p>
+        <p>Set heights using classes like <code>.input-lg</code>, and set widths using grid column classes like <code>.col-lg-*</code>.</p>
 
         <h3>Height sizing</h3>
         <p>Create larger or smaller form controls that match button sizes.</p>
         <form class="bs-example bs-example-control-sizing">
           <div class="controls docs-input-sizes">
-            <input class="form-control input-large" type="text" placeholder=".input-large">
+            <input class="form-control input-lg" type="text" placeholder=".input-lg">
             <input type="text" class="form-control" placeholder="Default input">
-            <input class="form-control input-small" type="text" placeholder=".input-small">
+            <input class="form-control input-sm" type="text" placeholder=".input-sm">
 
-            <select class="form-control input-large">
-              <option value="">.input-large</option>
+            <select class="form-control input-lg">
+              <option value="">.input-lg</option>
             </select>
             <select class="form-control">
               <option value="">Default select</option>
             </select>
-            <select class="form-control input-small">
-              <option value="">.input-small</option>
+            <select class="form-control input-sm">
+              <option value="">.input-sm</option>
             </select>
           </div>
         </form>
         </div>
 
         <h2 id="buttons-sizes">Button sizes</h2>
-        <p>Fancy larger or smaller buttons? Add <code>.btn-large</code> or <code>.btn-small</code> for additional sizes.</p>
+        <p>Fancy larger or smaller buttons? Add <code>.btn-lg</code> or <code>.btn-sm</code> for additional sizes.</p>
         <div class="bs-example">
           <p>
-            <button type="button" class="btn btn-primary btn-large">Large button</button>
-            <button type="button" class="btn btn-default btn-large">Large button</button>
+            <button type="button" class="btn btn-primary btn-lg">Large button</button>
+            <button type="button" class="btn btn-default btn-lg">Large button</button>
           </p>
           <p>
             <button type="button" class="btn btn-primary">Default button</button>
             <button type="button" class="btn btn-default">Default button</button>
           </p>
           <p>
-            <button type="button" class="btn btn-primary btn-small">Small button</button>
-            <button type="button" class="btn btn-default btn-small">Small button</button>
+            <button type="button" class="btn btn-primary btn-sm">Small button</button>
+            <button type="button" class="btn btn-default btn-sm">Small button</button>
           </p>
           <p>
-            <button type="button" class="btn btn-primary btn-mini">Mini button</button>
-            <button type="button" class="btn btn-default btn-mini">Mini button</button>
+            <button type="button" class="btn btn-primary btn-xs">Mini button</button>
+            <button type="button" class="btn btn-default btn-xs">Mini button</button>
           </p>
         </div>
 
         <p>Create block level buttons—those that span the full width of a parent— by adding <code>.btn-block</code>.</p>
         <div class="bs-example">
           <div class="well" style="max-width: 400px; margin: 0 auto 10px;">
-            <button type="button" class="btn btn-primary btn-large btn-block">Block level button</button>
-            <button type="button" class="btn btn-default btn-large btn-block">Block level button</button>
+            <button type="button" class="btn btn-primary btn-lg btn-block">Block level button</button>
+            <button type="button" class="btn btn-default btn-lg btn-block">Block level button</button>
           </div>
         </div>
 
         <h3>Button element</h3>
         <p>Add the <code>disabled</code> attribute to <code>&lt;button&gt;</code> buttons.</p>
         <p class="bs-example">
-          <button type="button" class="btn btn-primary btn-large" disabled="disabled">Primary button</button>
-          <button type="button" class="btn btn-default btn-large" disabled="disabled">Button</button>
+          <button type="button" class="btn btn-primary btn-lg" disabled="disabled">Primary button</button>
+          <button type="button" class="btn btn-default btn-lg" disabled="disabled">Button</button>
         </p>
 
         <h3>Anchor element</h3>
         <p>Add the <code>.disabled</code> class to <code>&lt;a&gt;</code> buttons.</p>
         <p class="bs-example">
-          <a href="http://getbootstrap.com/css/#" class="btn btn-primary btn-large disabled">Primary link</a>
-          <a href="http://getbootstrap.com/css/#" class="btn btn-default btn-large disabled">Link</a>
+          <a href="http://getbootstrap.com/css/#" class="btn btn-primary btn-lg disabled">Primary link</a>
+          <a href="http://getbootstrap.com/css/#" class="btn btn-default btn-lg disabled">Link</a>
         </p>
 
 
         <div class="bs-example">
           <div class="btn-toolbar" style="margin: 0;">
             <div class="btn-group">
-              <button class="btn btn-default btn-large dropdown-toggle" type="button" data-toggle="dropdown">
+              <button class="btn btn-default btn-lg dropdown-toggle" type="button" data-toggle="dropdown">
                 Large button <span class="caret"></span>
               </button>
               <ul class="dropdown-menu">
               </ul>
             </div><!-- /btn-group -->
             <div class="btn-group">
-              <button class="btn btn-default btn-small dropdown-toggle" type="button" data-toggle="dropdown">
+              <button class="btn btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
                 Small button <span class="caret"></span>
               </button>
               <ul class="dropdown-menu">
         <p>Add the relative form sizing classes to the <code>.input-group-addon</code>.</p>
         <form class="bs-example bs-example-form">
           <div class="input-group">
-            <span class="input-group-addon input-large">@</span>
-            <input type="text" class="form-control input-large" placeholder="Username">
+            <span class="input-group-addon input-lg">@</span>
+            <input type="text" class="form-control input-lg" placeholder="Username">
           </div>
           <br>
           <div class="input-group">
           </div>
           <br>
           <div class="input-group">
-            <span class="input-group-addon input-small">@</span>
-            <input type="text" class="form-control input-small" placeholder="Username">
+            <span class="input-group-addon input-sm">@</span>
+            <input type="text" class="form-control input-sm" placeholder="Username">
           </div>
         </form>
 
         <h2 id="navbar-basic">Basic navbar</h2>
         <p>To start, navbars are static (not fixed to the top) and include support for a project name and basic navigation. Place one anywhere within a <code>.container</code>, which sets the width of your site and content.</p>
         <div class="bs-example">
-          <div class="navbar">
-            <a class="navbar-brand" href="#">Title</a>
+          <div class="navbar navbar-default">
+              <div class="navbar-header">
+                <a class="navbar-brand" href="#">Title</a>
+              </div>
             <ul class="nav navbar-nav">
               <li class="active"><a href="#">Home</a></li>
               <li><a href="#">Link</a></li>
         <h3 id="navbar-brand">Brand</h3>
         <p>A simple link to show your brand or project name only requires an anchor tag.</p>
         <div class="bs-example">
-          <div class="navbar">
-            <a class="navbar-brand" href="#">Title</a>
+          <div class="navbar navbar-default">
+              <div class="navbar-header">
+                <a class="navbar-brand" href="#">Title</a>
+              </div>
           </div>
         </div><!-- /example -->
 
         <h3 id="navbar-nav">Nav links</h3>
         <p>Nav items are simple to add via unordered lists.</p>
         <div class="bs-example">
-          <div class="navbar">
+          <div class="navbar navbar-default">
             <ul class="nav navbar-nav">
               <li class="active"><a href="#">Home</a></li>
               <li><a href="#">Link</a></li>
         <p>To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.</p>
         <div class="bs-example">
 
-          <div class="navbar">
-            <form class="navbar-form pull-left">
+          <div class="navbar navbar-default">
+            <form class="navbar-form navbar-left">
               <input type="text" class="form-control" style="width: 200px;">
               <button type="submit" class="btn btn-default">Submit</button>
             </form>
           </div>
 
-          <div class="navbar">
-            <form class="navbar-form pull-left">
+          <div class="navbar navbar-default">
+            <form class="navbar-form navbar-left">
               <select name="" class="form-control" style="width: 200px;">
                 <option value="1">1</option>
                 <option value="2">2</option>
             </form>
           </div>
 
-          <div class="navbar">
-            <form class="navbar-form pull-left">
+          <div class="navbar navbar-default">
+            <form class="navbar-form navbar-left">
               <input type="text" class="form-control" style="width: 200px;">
               <input type="checkbox">
               <button type="submit" class="btn btn-default">Submit</button>
             </form>
           </div>
 
-          <div class="navbar">
-            <form class="navbar-form pull-left">
+          <div class="navbar navbar-default">
+            <form class="navbar-form navbar-left">
               <input type="text" class="form-control" style="width: 200px;">
               <label class="checkbox-inline">
                 <input type="checkbox"> Remember me
         <h3 id="navbar-buttons">Buttons</h3>
         <p>For buttons not residing in a <code>&lt;form&gt;</code>, add this class to vertically center buttons within a navbar.</p>
         <div class="bs-example">
-          <div class="navbar">
-            <a href="#" class="navbar-brand">Brand</a>
+          <div class="navbar navbar-default">
+              <div class="navbar-header">
+                <a class="navbar-brand" href="#">Brand</a>
+              </div>
             <button type="button" class="btn btn-default navbar-btn">Sign in</button>
           </div>
         </div>
         <h3 id="navbar-text">Text</h3>
         <p>Wrap strings of text in an element with <code>.navbar-text</code>, usually on a <code>&lt;p&gt;</code> tag for proper leading and color.</p>
         <div class="bs-example">
-          <div class="navbar">
-            <a href="#" class="navbar-brand">Brand</a>
+          <div class="navbar navbar-default">
+              <div class="navbar-header">
+                <a class="navbar-brand" href="#">Brand</a>
+              </div>
             <p class="navbar-text">Signed in as Mark Otto</p>
           </div>
         </div>
         <h3 id="navbar-links">Links</h3>
         <p>For folks using standard links that are not within the regular navbar navigation component, use the <code>.navbar-link</code> class to add the proper colors for the default and inverse navbar options.</p>
         <div class="bs-example">
-          <div class="navbar">
-            <a href="#" class="navbar-brand">Brand</a>
+          <div class="navbar navbar-default">
+              <div class="navbar-header">
+                <a class="navbar-brand" href="#">Brand</a>
+              </div>
             <p class="navbar-text pull-right">Signed in as <a href="#" class="navbar-link">Mark Otto</a></p>
           </div>
         </div>
         <h3 id="navbar-component-alignment">Component alignment</h3>
         <p>Align nav links, forms, buttons, or text, using the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction. To align nav links, put them in a separate <code>&lt;ul&gt;</code> with the respective utility class applied.</p>
 
-
-        <h2>Optional display variations</h2>
-        <p>Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, <code>.navbar</code>. These will also remove rounded corners.</p>
-
-        <h3 id="navbar-fixed-top">Fixed to top</h3>
-        <p>Add <code>.navbar-fixed-top</code>.</p>
-        <div class="bs-example bs-navbar-top-example">
-          <div class="navbar navbar-fixed-top">
-            <div class="container" style="width: auto;">
-              <a class="navbar-brand" href="#">Title</a>
-              <ul class="nav navbar-nav">
-                <li class="active"><a href="#">Home</a></li>
-                <li><a href="#">Link</a></li>
-                <li><a href="#">Link</a></li>
-              </ul>
-            </div>
-          </div>
-        </div><!-- /example -->
-
         <h3 id="navbar-static-top">Static top navbar</h3>
         <p>Create a full-width navbar that scrolls away with the page by adding <code>.navbar-static-top</code>. Unlike the <code>.navbar-fixed-*</code> classes, you do not need to change any padding on the <code>body</code>.</p>
         <div class="bs-example bs-navbar-top-example">
-          <div class="navbar navbar-static-top" style="margin: -1px -1px 0;">
+          <div class="navbar navbar-default navbar-static-top" style="margin: -1px -1px 0;">
             <div class="container" style="width: auto;">
-              <a class="navbar-brand" href="#">Title</a>
+              <div class="navbar-header">
+                <a class="navbar-brand" href="#">Title</a>
+              </div>
               <ul class="nav navbar-nav">
                 <li class="active"><a href="#">Home</a></li>
                 <li><a href="#">Link</a></li>
 
 
         <h2 id="navbar-responsive">Responsive navbar</h2>
-        <p>To implement a collapsing responsive navbar, wrap your navbar content in a containing div, <code>.nav-collapse.collapse</code>, and add the navbar toggle button, <code>.navbar-toggle</code>.</p>
+        <p>To implement a collapsing responsive navbar, wrap your navbar content in a containing div, <code>.navbar-collapse.collapse</code>, and add the navbar toggle button, <code>.navbar-toggle</code>.</p>
         <div class="bs-example">
-          <div class="navbar">
-            <div class="container">
+          <div class="navbar navbar-default">
+            <div class="navbar-header">
               <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
               </button>
               <a class="navbar-brand" href="#">Title</a>
-              <div class="nav-collapse collapse navbar-responsive-collapse">
-                <ul class="nav navbar-nav">
-                  <li class="active"><a href="#">Home</a></li>
-                  <li><a href="#">Link</a></li>
-                  <li><a href="#">Link</a></li>
-                  <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                      <li><a href="#">Action</a></li>
-                      <li><a href="#">Another action</a></li>
-                      <li><a href="#">Something else here</a></li>
-                      <li class="divider"></li>
-                      <li class="dropdown-header">Dropdown header</li>
-                      <li><a href="#">Separated link</a></li>
-                      <li><a href="#">One more separated link</a></li>
-                    </ul>
-                  </li>
-                </ul>
-                <form class="navbar-form pull-left">
-                  <input type="text" class="form-control col-lg-8" placeholder="Search">
-                </form>
-                <ul class="nav navbar-nav pull-right">
-                  <li><a href="#">Link</a></li>
-                  <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                      <li><a href="#">Action</a></li>
-                      <li><a href="#">Another action</a></li>
-                      <li><a href="#">Something else here</a></li>
-                      <li class="divider"></li>
-                      <li><a href="#">Separated link</a></li>
-                    </ul>
-                  </li>
-                </ul>
-              </div><!-- /.nav-collapse -->
-            </div><!-- /.container -->
+            </div>
+            <div class="navbar-collapse collapse navbar-responsive-collapse">
+              <ul class="nav navbar-nav">
+                <li class="active"><a href="#">Home</a></li>
+                <li><a href="#">Link</a></li>
+                <li><a href="#">Link</a></li>
+                <li class="dropdown">
+                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <li><a href="#">Action</a></li>
+                    <li><a href="#">Another action</a></li>
+                    <li><a href="#">Something else here</a></li>
+                    <li class="divider"></li>
+                    <li class="dropdown-header">Dropdown header</li>
+                    <li><a href="#">Separated link</a></li>
+                    <li><a href="#">One more separated link</a></li>
+                  </ul>
+                </li>
+              </ul>
+              <form class="navbar-form navbar-left">
+                <input type="text" class="form-control col-lg-8" placeholder="Search">
+              </form>
+              <ul class="nav navbar-nav navbar-right">
+                <li><a href="#">Link</a></li>
+                <li class="dropdown">
+                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <li><a href="#">Action</a></li>
+                    <li><a href="#">Another action</a></li>
+                    <li><a href="#">Something else here</a></li>
+                    <li class="divider"></li>
+                    <li><a href="#">Separated link</a></li>
+                  </ul>
+                </li>
+              </ul>
+            </div><!-- /.navbar-collapse -->
           </div><!-- /.navbar -->
         </div><!-- /example -->
 
         <p>Modify the look of the navbar by adding <code>.navbar-inverse</code>.</p>
         <div class="bs-example">
           <div class="navbar navbar-inverse">
-            <div class="container">
+            <div class="navbar-header">
               <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-inverse-collapse">
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
               </button>
               <a class="navbar-brand" href="#">Title</a>
-              <div class="nav-collapse collapse navbar-inverse-collapse">
-                <ul class="nav navbar-nav">
-                  <li class="active"><a href="#">Home</a></li>
-                  <li><a href="#">Link</a></li>
-                  <li><a href="#">Link</a></li>
-                  <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                      <li><a href="#">Action</a></li>
-                      <li><a href="#">Another action</a></li>
-                      <li><a href="#">Something else here</a></li>
-                      <li class="divider"></li>
-                      <li class="dropdown-header">Dropdown header</li>
-                      <li><a href="#">Separated link</a></li>
-                      <li><a href="#">One more separated link</a></li>
-                    </ul>
-                  </li>
-                </ul>
-                <form class="navbar-form pull-left">
-                  <input type="text" class="form-control col-lg-8" placeholder="Search">
-                </form>
-                <ul class="nav navbar-nav pull-right">
-                  <li><a href="#">Link</a></li>
-                  <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                      <li><a href="#">Action</a></li>
-                      <li><a href="#">Another action</a></li>
-                      <li><a href="#">Something else here</a></li>
-                      <li class="divider"></li>
-                      <li><a href="#">Separated link</a></li>
-                    </ul>
-                  </li>
-                </ul>
-              </div><!-- /.nav-collapse -->
-            </div><!-- /.container -->
+            </div>
+            <div class="navbar-collapse collapse navbar-inverse-collapse">
+              <ul class="nav navbar-nav">
+                <li class="active"><a href="#">Home</a></li>
+                <li><a href="#">Link</a></li>
+                <li><a href="#">Link</a></li>
+                <li class="dropdown">
+                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <li><a href="#">Action</a></li>
+                    <li><a href="#">Another action</a></li>
+                    <li><a href="#">Something else here</a></li>
+                    <li class="divider"></li>
+                    <li class="dropdown-header">Dropdown header</li>
+                    <li><a href="#">Separated link</a></li>
+                    <li><a href="#">One more separated link</a></li>
+                  </ul>
+                </li>
+              </ul>
+              <form class="navbar-form navbar-left">
+                <input type="text" class="form-control col-lg-8" placeholder="Search">
+              </form>
+              <ul class="nav navbar-nav navbar-right">
+                <li><a href="#">Link</a></li>
+                <li class="dropdown">
+                  <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <li><a href="#">Action</a></li>
+                    <li><a href="#">Another action</a></li>
+                    <li><a href="#">Something else here</a></li>
+                    <li class="divider"></li>
+                    <li><a href="#">Separated link</a></li>
+                  </ul>
+                </li>
+              </ul>
+            </div><!-- /.navbar-collapse -->
           </div><!-- /.navbar -->
         </div><!-- /example -->
 
 
 
         <h3>Sizes</h3>
-        <p>Fancy larger or smaller pagination? Add <code>.pagination-large</code> or <code>.pagination-small</code>  for additional sizes.</p>
+        <p>Fancy larger or smaller pagination? Add <code>.pagination-lg</code> or <code>.pagination-sm</code>  for additional sizes.</p>
         <div class="bs-example">
           <div>
-            <ul class="pagination pagination-large">
+            <ul class="pagination pagination-lg">
               <li><a href="#">«</a></li>
               <li><a href="#">1</a></li>
               <li><a href="#">2</a></li>
             </ul>
           </div>
           <div>
-            <ul class="pagination pagination-small">
+            <ul class="pagination pagination-sm">
               <li><a href="#">«</a></li>
               <li><a href="#">1</a></li>
               <li><a href="#">2</a></li>
         <h3>Available variations</h3>
         <p>Add any of the below mentioned modifier classes to change the appearance of a label.</p>
         <div class="bs-example">
-          <span class="label">Default</span>
+          <span class="label label-default">Default</span>
+          <span class="label label-primary">Primary</span>
           <span class="label label-success">Success</span>
           <span class="label label-warning">Warning</span>
           <span class="label label-danger">Danger</span>
           <div class="jumbotron">
             <h1>Hello, world!</h1>
             <p>This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.</p>
-            <p><a class="btn btn-primary btn-large">Learn more</a></p>
+            <p><a class="btn btn-primary btn-lg">Learn more</a></p>
           </div>
         </div>
 
         </div>
 
         <div class="bs-example">
-          <div class="alert">
+          <div class="alert alert-warning">
             <button type="button" class="close" data-dismiss="alert">×</button>
             <strong>Warning!</strong> Best check yo self, you're not looking too good.
           </div>
         </div>
 
-        <h3 id="alerts-block">Block alerts</h3>
-        <p>For longer messages, increase the padding on the top and bottom of the alert wrapper by adding <code>.alert-block</code>.</p>
-        <div class="bs-example">
-          <div class="alert alert-block">
-            <button type="button" class="close" data-dismiss="alert">×</button>
-            <h4>Warning!</h4>
-            <p>Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
-          </div>
-        </div>
-
         <h3 id="alerts-alternatives">Contextual alternatives</h3>
         <p>Add optional classes to change an alert's connotation.</p>
         <div class="bs-example">
-          <div class="alert alert-danger">
+          <div class="alert alert-dismissable alert-danger">
             <button type="button" class="close" data-dismiss="alert">×</button>
             <strong>Oh snap!</strong> Change a few things up and try submitting again.
           </div>
-          <div class="alert alert-success">
+          <div class="alert alert-dismissable alert-success">
             <button type="button" class="close" data-dismiss="alert">×</button>
             <strong>Well done!</strong> You successfully read this important alert message.
           </div>
-          <div class="alert alert-info">
+          <div class="alert alert-dismissable alert-info">
             <button type="button" class="close" data-dismiss="alert">×</button>
             <strong>Heads up!</strong> This alert needs your attention, but it's not super important.
           </div>
         <h3 id="alerts-links">Links in alerts</h3>
         <p>Use the <code>.alert-link</code> utility class to quickly provide matching colored links within any alert.</p>
         <div class="bs-example">
-          <div class="alert alert-danger">
+          <div class="alert alert-dismissable alert-danger">
             <button type="button" class="close" data-dismiss="alert">×</button>
             <strong>Oh snap!</strong> <a href="#" class="alert-link">Change a few things up</a> and try submitting again.
           </div>
-          <div class="alert alert-success">
+          <div class="alert alert-dismissable alert-success">
             <button type="button" class="close" data-dismiss="alert">×</button>
             <strong>Well done!</strong> You successfully read <a href="#" class="alert-link">this important alert message</a>.
           </div>
-          <div class="alert alert-info">
+          <div class="alert alert-dismissable alert-info">
             <button type="button" class="close" data-dismiss="alert">×</button>
             <strong>Heads up!</strong> This <a href="#" class="alert-link">alert needs your attention</a>, but it's not super important.
           </div>
         <h3 id="panels-basic">Basic panel</h3>
         <p>By default, all the <code>.panel</code> does is apply some basic border and padding to contain some content.</p>
         <div class="bs-example">
-          <div class="panel">
-            Basic panel example
+          <div class="panel panel-default">
+            <div class="panel-body">
+              Basic panel example
+            </div>
           </div>
         </div>
 
         <h3 id="panels-heading">Panel with heading</h3>
         <p>Easily add a heading container to your panel with <code>.panel-heading</code>. You may also include any <code>&lt;h1&gt;</code>-<code>&lt;h6&gt;</code> with a <code>.panel-title</code> class to add a pre-styled heading.</p>
         <div class="bs-example">
-          <div class="panel">
+          <div class="panel panel-default">
             <div class="panel-heading">Panel heading</div>
-            Panel content
+            <div class="panel-body">
+              Panel content
+            </div>
           </div>
-          <div class="panel">
+          <div class="panel panel-default">
             <div class="panel-heading">
               <h3 class="panel-title">Panel title</h3>
             </div>
-            Panel content
+            <div class="panel-body">
+              Panel content
+            </div>
           </div>
         </div>
 
         <h3 id="panels-footer">Panel with footer</h3>
         <p>Wrap buttons or secondary text in <code>.panel-footer</code>.</p>
         <div class="bs-example">
-          <div class="panel">
-            Panel content
+          <div class="panel panel-default">
+            <div class="panel-body">
+              Panel content
+            </div>
             <div class="panel-footer">Panel footer</div>
           </div>
         </div>
             <div class="panel-heading">
               <h3 class="panel-title">Panel title</h3>
             </div>
-            Panel content
+            <div class="panel-body">
+              Panel content
+            </div>
           </div>
           <div class="panel panel-success">
             <div class="panel-heading">
               <h3 class="panel-title">Panel title</h3>
             </div>
-            Panel content
+            <div class="panel-body">
+              Panel content
+            </div>
           </div>
           <div class="panel panel-warning">
             <div class="panel-heading">
               <h3 class="panel-title">Panel title</h3>
             </div>
-            Panel content
+            <div class="panel-body">
+              Panel content
+            </div>
           </div>
           <div class="panel panel-danger">
             <div class="panel-heading">
               <h3 class="panel-title">Panel title</h3>
             </div>
-            Panel content
+            <div class="panel-body">
+              Panel content
+            </div>
           </div>
           <div class="panel panel-info">
             <div class="panel-heading">
               <h3 class="panel-title">Panel title</h3>
             </div>
-            Panel content
+            <div class="panel-body">
+              Panel content
+            </div>
           </div>
         </div>
 
           <div class="panel">
             <!-- Default panel contents -->
             <div class="panel-heading">Panel heading</div>
-            <p>Some default panel content here. Nulla vitae elit libero, a pharetra augue. Aenean lacinia bibendum nulla sed consectetur. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+            <div class="panel-body">
+              <p>Some default panel content here. Nulla vitae elit libero, a pharetra augue. Aenean lacinia bibendum nulla sed consectetur. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
+            </div>
 
             <!-- List group -->
             <ul class="list-group list-group-flush">
         <h3>Optional classes</h3>
         <p>Control padding and rounded corners with two optional modifier classes.</p>
         <div class="bs-example">
-          <div class="well well-large">
+          <div class="well well-lg">
             Look, I'm in a well!
           </div>
         </div>
 
         <div class="bs-example">
-          <div class="well well-small">
+          <div class="well well-sm">
             Look, I'm in a well!
           </div>
         </div>
 
       </div>
+
+
+      <!-- Modal
+      ================================================== -->
+      <div class="bs-docs-section">
+        <div class="page-header">
+          <h1 id="modals">Modals</h1>
+        </div>
+
+        <h3>Live demo</h3>
+        <p>Toggle a modal via JavaScript by clicking the button below. It will slide down and fade in from the top of the page.</p>
+        <!-- sample modal content -->
+        <div id="myModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+          <div class="modal-dialog">
+            <div class="modal-content">
+
+              <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h4 class="modal-title" id="myModalLabel">Modal Heading</h4>
+              </div>
+              <div class="modal-body">
+                <h4>Text in a modal</h4>
+                <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula.</p>
+
+                <h4>Popover in a modal</h4>
+                <p>This <a href="#" role="button" class="btn btn-default popover-test" title="" data-content="And here's some amazing content. It's very engaging. right?" data-original-title="A Title">button</a> should trigger a popover on click.</p>
+
+                <h4>Tooltips in a modal</h4>
+                <p><a href="#" class="tooltip-test" title="" data-original-title="Tooltip">This link</a> and <a href="#" class="tooltip-test" title="" data-original-title="Tooltip">that link</a> should have tooltips on hover.</p>
+
+                <hr>
+
+                <h4>Overflowing text to show scroll behavior</h4>
+                <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
+                <p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
+                <p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p>
+                <p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
+              </div>
+              <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                <button type="button" class="btn btn-primary">Save changes</button>
+              </div>
+
+            </div><!-- /.modal-content -->
+          </div><!-- /.modal-dialog -->
+        </div><!-- /.modal -->
+
+        <div class="bs-example" style="padding-bottom: 24px;">
+          <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-lg">Launch demo modal</a>
+        </div><!-- /example -->
+
+      </div>
+
+
+      <!-- Popover
+      ================================================== -->
+      <div class="bs-docs-section">
+        <div class="page-header">
+          <h1 id="popovers">Popovers</h1>
+        </div>
+        <div class="bs-example" style="padding-bottom: 24px;">
+          <a class="btn btn-lg btn-danger" data-toggle="popover" title="" data-content="And here's some amazing content. It's very engaging. right?" data-original-title="A Title">Click to toggle popover</a>
+        </div>
+      </div>
+
+          
   
 
       <footer>
     <script src="../bower_components/jquery/jquery.min.js"></script>
     <script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
     <script src="../assets/js/bootswatch.js"></script>
+    <script>
+
+      $('[data-toggle=popover]').popover();
+
+    </script>
   </body>
 </html>
\ No newline at end of file