projects / bootswatch / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
move download menu to last position
[bootswatch] / journal / index.html
diff --git a/journal/index.html b/journal/index.html
index f2ee4dc..8f3b3bb 100644 (file)
--- a/journal/index.html
+++ b/journal/index.html
@@ -4,7 +4,7 @@
     <title>Bootswatch: Journal</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta charset="utf-8">
-    <link rel="stylesheet" href="./bootstrap.min.css" media="screen">
+    <link rel="stylesheet" href="./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">
     <script type="text/javascript">
@@ -26,7 +26,7 @@
   <body>
     <script src="../assets/js/bsa.js"></script>
 
-    <div class="navbar navbar-fixed-top">
+    <div class="navbar navbar-default navbar-fixed-top">
       <div class="container">
         <div class="navbar-header">
           <a href="../" class="navbar-brand">Bootswatch</a>
@@ -53,10 +53,15 @@
                 <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>
+            <li>
+              <a href="../help/">Help</a>
+            </li>
+            <li>
+              <a href="http://news.bootswatch.com">Blog</a>
+            </li>
             <li class="dropdown">
               <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="download">Download <span class="caret"></span></a>
               <ul class="dropdown-menu" aria-labelledby="download">
@@ -67,12 +72,6 @@
                 <li><a tabindex="-1" href="./bootswatch.less">bootswatch.less</a></li>
               </ul>
             </li>
-            <li>
-              <a href="../help/">Help</a>
-            </li>
-            <li>
-              <a href="http://news.bootswatch.com">Blog</a>
-            </li>
           </ul>
 
           <ul class="nav navbar-nav navbar-right">
@@ -111,7 +110,7 @@
             </div>
 
             <div class="bs-example">
-              <div class="navbar">
+              <div class="navbar navbar-default">
                 <div class="container">
                   <div class="navbar-header">
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
@@ -325,7 +324,7 @@
 
             <div class="bs-example">
               <p>
-                <button type="button" class="btn btn-default btn-large btn-block">Block level button</button>
+                <button type="button" class="btn btn-default btn-lg btn-block">Block level button</button>
               </p>
             </div>
 
@@ -790,14 +789,14 @@
                 <li><a href="#">5</a></li>
                 <li><a href="#">&raquo;</a></li>
               </ul>
-              <ul class="pagination pagination-large">
+              <ul class="pagination pagination-lg">
                 <li class="disabled"><a href="#">&laquo;</a></li>
                 <li class="active"><a href="#">1</a></li>
                 <li><a href="#">2</a></li>
                 <li><a href="#">3</a></li>
                 <li><a href="#">&raquo;</a></li>
               </ul>
-              <ul class="pagination pagination-small">
+              <ul class="pagination pagination-sm">
                 <li class="disabled"><a href="#">&laquo;</a></li>
                 <li class="active"><a href="#">1</a></li>
                 <li><a href="#">2</a></li>
@@ -846,7 +845,7 @@
           <div class="col-lg-12">
             <h2>Alerts</h2>
             <div class="bs-example">
-              <div class="alert alert-dismissable">
+              <div class="alert alert-dismissable alert-warning">
                 <button type="button" class="close" data-dismiss="alert">&times;</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, <a href="#" class="alert-link">vel scelerisque nisl consectetur et</a>.</p>
@@ -879,6 +878,7 @@
             <h2>Labels</h2>
             <div class="bs-example" style="margin-bottom: 40px;">
               <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>
@@ -980,7 +980,7 @@
               <div class="jumbotron">
                 <h1>Jumbotron</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>
@@ -1048,18 +1048,18 @@
         </div>
         <div class="row">
           <div class="col-lg-4">        
-            <div class="panel">
+            <div class="panel panel-default">
               <div class="panel-body">
                 Basic panel
               </div>
             </div>
-            <div class="panel">
+            <div class="panel panel-default">
               <div class="panel-heading">Panel heading</div>
               <div class="panel-body">
                 Panel content
               </div>
             </div>
-            <div class="panel">
+            <div class="panel panel-default">
               <div class="panel-body">
                 Panel content
               </div>
@@ -1087,7 +1087,9 @@
               <div class="panel-heading">
                 <h3 class="panel-title">Panel warning</h3>
               </div>
-              Panel content
+              <div class="panel-body">
+                Panel content
+              </div>
             </div>
           </div>
           <div class="col-lg-4">
@@ -1122,12 +1124,12 @@
             </div>
           </div>
           <div class="col-lg-4">
-            <div class="well well-small">
+            <div class="well well-sm">
               Look, I'm in a small well!
             </div>
           </div>
           <div class="col-lg-4">
-            <div class="well well-large">
+            <div class="well well-lg">
               Look, I'm in a large well!
             </div>
           </div>
Bootstrap watch themes