From d1660cf0c1caabbfe3b1b11e667a2ca4a4ef0307 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sun, 16 Jun 2013 03:19:08 -0500
Subject: [PATCH] better layout.html and web2py_bootstra.css, thanks Paolo

---
 VERSION                                           |  2 +-
 .../admin/static/css/web2py_bootstrap.css         | 15 +++++++++++++++
 .../examples/static/css/web2py_bootstrap.css      | 15 +++++++++++++++
 .../welcome/static/css/web2py_bootstrap.css       | 15 +++++++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index d0452171..96bb44ee 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.5.1-stable+timestamp.2013.06.14.16.08.49
+Version 2.5.1-stable+timestamp.2013.06.16.03.18.21
diff --git a/applications/admin/static/css/web2py_bootstrap.css b/applications/admin/static/css/web2py_bootstrap.css
index 9fe1a041..91dfbcde 100644
--- a/applications/admin/static/css/web2py_bootstrap.css
+++ b/applications/admin/static/css/web2py_bootstrap.css
@@ -3,6 +3,20 @@
 ==============================================================*/
 
 body{height:auto;} /* to avoid vertical scroll bar */
+
+a{}
+a:visited{}
+a:hover{}
+a:focus{}
+a:active{}
+
+h1{}
+h2{}
+h3{}
+h4{}
+h5{}
+h6{}
+
 div.flash.flash-center{left:25%;right:25%;}
 div.flash.flash-top,div.flash.flash-top:hover{
   position:relative;
@@ -38,6 +52,7 @@ div.flash.flash-top,div.flash.flash-top:hover{
 }
 /* auth navbar - primitive style */
 .auth_navbar,.auth_navbar a{color:inherit;}
+.navbar-inner {-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
 .ie-lte7 .auth_navbar,.auth_navbar a{color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */}
 .auth_navbar a{white-space:nowrap;} /* to avoid the nav split on more lines */
 .auth_navbar a:hover{color:white;text-decoration:none;}
diff --git a/applications/examples/static/css/web2py_bootstrap.css b/applications/examples/static/css/web2py_bootstrap.css
index 9fe1a041..91dfbcde 100644
--- a/applications/examples/static/css/web2py_bootstrap.css
+++ b/applications/examples/static/css/web2py_bootstrap.css
@@ -3,6 +3,20 @@
 ==============================================================*/
 
 body{height:auto;} /* to avoid vertical scroll bar */
+
+a{}
+a:visited{}
+a:hover{}
+a:focus{}
+a:active{}
+
+h1{}
+h2{}
+h3{}
+h4{}
+h5{}
+h6{}
+
 div.flash.flash-center{left:25%;right:25%;}
 div.flash.flash-top,div.flash.flash-top:hover{
   position:relative;
@@ -38,6 +52,7 @@ div.flash.flash-top,div.flash.flash-top:hover{
 }
 /* auth navbar - primitive style */
 .auth_navbar,.auth_navbar a{color:inherit;}
+.navbar-inner {-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
 .ie-lte7 .auth_navbar,.auth_navbar a{color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */}
 .auth_navbar a{white-space:nowrap;} /* to avoid the nav split on more lines */
 .auth_navbar a:hover{color:white;text-decoration:none;}
diff --git a/applications/welcome/static/css/web2py_bootstrap.css b/applications/welcome/static/css/web2py_bootstrap.css
index 9fe1a041..91dfbcde 100644
--- a/applications/welcome/static/css/web2py_bootstrap.css
+++ b/applications/welcome/static/css/web2py_bootstrap.css
@@ -3,6 +3,20 @@
 ==============================================================*/
 
 body{height:auto;} /* to avoid vertical scroll bar */
+
+a{}
+a:visited{}
+a:hover{}
+a:focus{}
+a:active{}
+
+h1{}
+h2{}
+h3{}
+h4{}
+h5{}
+h6{}
+
 div.flash.flash-center{left:25%;right:25%;}
 div.flash.flash-top,div.flash.flash-top:hover{
   position:relative;
@@ -38,6 +52,7 @@ div.flash.flash-top,div.flash.flash-top:hover{
 }
 /* auth navbar - primitive style */
 .auth_navbar,.auth_navbar a{color:inherit;}
+.navbar-inner {-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
 .ie-lte7 .auth_navbar,.auth_navbar a{color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */}
 .auth_navbar a{white-space:nowrap;} /* to avoid the nav split on more lines */
 .auth_navbar a:hover{color:white;text-decoration:none;}