From 4830a6fbf27b1a8222f849ad2d58fd68e58f9a44 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 18 Jun 2012 17:07:32 -0500
Subject: [PATCH] improved bootswatch, thanks Paolo

---
 VERSION                                        |  2 +-
 applications/welcome/static/css/bootswatch.css | 12 +++++++-----
 applications/welcome/views/layout.html         |  6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/VERSION b/VERSION
index bffc564b..5dfb75ad 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-06-17 23:36:32) dev
+Version 2.00.0 (2012-06-18 17:07:27) dev
diff --git a/applications/welcome/static/css/bootswatch.css b/applications/welcome/static/css/bootswatch.css
index 5a56a675..07326c5a 100644
--- a/applications/welcome/static/css/bootswatch.css
+++ b/applications/welcome/static/css/bootswatch.css
@@ -14,7 +14,7 @@ li {margin-bottom: 0;} /*bootswatch*/
   #navbar{float:none;position:absolute;bottom:-10px;left:4px;}
 }
 
-.jumbotron h1 {
+.mastheader h1 {
   margin-bottom: 9px;
   font-size: 81px;
   font-weight: bold;
@@ -22,11 +22,11 @@ li {margin-bottom: 0;} /*bootswatch*/
   line-height: 1;
 }
 
-.subhead h1 {
+.mastheader h1 {
   font-size: 54px;
 }
 
-.jumbotron small {
+.mastheader small {
   font-size: 20px;
   font-weight: 300;
 }
@@ -68,7 +68,7 @@ li {margin-bottom: 0;} /*bootswatch*/
   display:inline-block;
 }
 
-.icon-chevron-right {
+.chevron-right {
   border-left: 4px solid #000;
   border-right: 4px solid transparent;
   border-bottom: 4px solid transparent;
@@ -92,5 +92,7 @@ li {margin-bottom: 0;} /*bootswatch*/
 #navbar .auth_navbar, #navbar .auth_navbar a {color:inherit;}
 .ie-lte7 #navbar .auth_navbar, #navbar .auth_navbar a {color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */}
 
-#navbar .auth_navbar a:hover {color:white;text-decoration:none;} /* this overwrites bootswatch theme */
+#navbar .auth_navbar a:hover {color:white;text-decoration:none;} /* this overwrite bootswatch */
 
+[class^="icon-"],[class*=" icon-"]{background-image:url("../images/glyphicons-halflings.png")} /* right folder for bootstrap black images/icons */
+.icon-white{background-image:url("../images/glyphicons-halflings-white.png");} /* right folder for bootstrap white images/icons */
\ No newline at end of file
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index f4eff90f..afb7c64c 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -68,7 +68,7 @@
       });
       jQuery('.nav li li').each(function(){	        
         if(jQuery(this).find('ul').length)
-          jQuery(this).children('a').contents().before('<i class="icon-chevron-right"></i>'); 
+          jQuery(this).children('a').contents().before('<i class="chevron-right"></i>'); 
       });
     });
   </script>
@@ -87,12 +87,12 @@
 	  <span class="icon-bar"></span>
 	</a>
 	<a class="brand" href="#">web2py&trade;&nbsp;</a>
+	<div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ','')) or ''}}</div>
 	<div class="nav-collapse">
 	  {{is_mobile=request.user_agent().is_mobile}}
 	  {{if response.menu:}}
 	  {{=MENU(response.menu, _class='mobile-menu nav' if is_mobile else 'nav',mobile=is_mobile,li_class='dropdown',ul_class='dropdown-menu')}}
 	  {{pass}}
-	  <div class="nav pull-right" id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ','')) or ''}}</div>
 	</div><!--/.nav-collapse -->
       </div>
     </div>
@@ -102,7 +102,7 @@
 
   <div class="container">
     <!-- Masthead ================================================== -->
-    <header class="jumbotron subhead" id="overview">
+    <header class="mastheader" id="header">
       <div class="page-header">
 	<h1>
 	  {{=response.title or request.application}}