welcome css pathc, issue 896, thanks Angelo

VERSION

@@ -1 +1 @@
-Version 2.00.0 (2012-07-16 13:13:40) dev
+Version 2.00.0 (2012-07-16 13:15:59) dev

applications/welcome/static/css/bootswatch.css

@@ -1,60 +1,69 @@
-body {
+#navbar{padding-top:9px;}
-  padding-top: 90px; /* container go all the way to the bottom of the topbar */
+#navbar .auth_navbar, #navbar .auth_navbar a {color:inherit;}
-  height:auto; /*to avoid vertical scroll bar*/
+
+@media only screen and (max-width: 479px) {
+  div.flash {
+  	right: 5px;
+  }
 }
 
-h1,h2,h3,h4,h5,h6 {font-family: inherit;}
+@media only screen and (max-width: 767px) {
-
-li {margin-bottom: 0;} /*bootswatch*/
-
-.auth_navbar, .navbar .btn-group{padding:0;}
-
-@media only screen and (max-width: 320px) {
   .navbar-inner{position:relative;}
-  #navbar{float:none;position:absolute;bottom:-10px;left:4px;}
+  #navbar{bottom:-10px;left:4px;}
 }
 
-.mastheader h1 {
+@media only screen and (min-width: 768px) {
+	body {
+	  height:auto; /*to avoid vertical scroll bar*/
+	}
+	
+	h1,h2,h3,h4,h5,h6 {font-family: inherit;}
+	
+	li {margin-bottom: 0;} /*bootswatch*/
+	
+	.auth_navbar, .navbar .btn-group{padding:0;}
+	
+	.mastheader h1 {
 	  margin-bottom: 9px;
 	  font-size: 81px;
 	  font-weight: bold;
 	  letter-spacing: -1px;
 	  line-height: 1;
-}
+	}
 	
-.mastheader h1 {
+	.mastheader h1 {
 	  font-size: 54px;
-}
+	}
 	
-.mastheader small {
+	.mastheader small {
 	  font-size: 20px;
 	  font-weight: 300;
-}
+	}
 	
-/* bootstrap dropdown */
+	/* bootstrap dropdown */
 	
-.dropdown-menu ul {
+	.dropdown-menu ul {
 	    left: 100%;
 	    position: absolute;
 	    top: 0;
 	    visibility: hidden;
 	    margin-top: -1px;
-}
+	}
 	
-.dropdown-menu li:hover ul {
+	.dropdown-menu li:hover ul {
 	    visibility: visible;
-}
+	}
 	
-.navbar .dropdown-menu ul:before {
+	.navbar .dropdown-menu ul:before {
 	    border-bottom: 7px solid transparent;
 	    border-left: none;
 	    border-right: 7px solid rgba(0, 0, 0, 0.2);
 	    border-top: 7px solid transparent;
 	    left: -7px;
 	    top: 5px;
-}
+	}
 	
-.navbar .dropdown-menu ul:after {
+	.navbar .dropdown-menu ul:after {
 	    border-top: 6px solid transparent;
 	    border-left: none;
 	    border-right: 6px solid #fff;
@@ -62,13 +71,13 @@ li {margin-bottom: 0;} /*bootswatch*/
 	    left: 10px;
 	    top: 6px;
 	    left: -6px;
-}
+	}
 	
-.dropdown-menu span{
+	.dropdown-menu span{
 	  display:inline-block;
-}
+	}
 	
-.chevron-right {
+	.chevron-right {
 	  border-left: 4px solid #000;
 	  border-right: 4px solid transparent;
 	  border-bottom: 4px solid transparent;
@@ -82,17 +91,22 @@ li {margin-bottom: 0;} /*bootswatch*/
 	  margin-right:-13px;
 	  margin-top: 7px;
 	  float:right;
-}
+	}
 	
-.open > .dropdown-menu  ul { /* fix menu issue when BS2.0.4 is applied */ 
+	.open > .dropdown-menu  ul { /* fix menu issue when BS2.0.4 is applied */ 
 		display: block; 
+	}
+
+	.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 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 */
 }
 
-#navbar{padding-top:9px;}
+@media only screen and (min-width: 980px) {
-#navbar .auth_navbar, #navbar .auth_navbar a {color:inherit;}
+	body {
-.ie-lte7 #navbar .auth_navbar, #navbar .auth_navbar a {color:expression(this.parentNode.currentStyle['color']); /* ie7 doesn't support inherit */}
+		padding-top: 60px;
-
+	}
-#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 */

applications/welcome/static/css/web2py.css

@@ -1,5 +1,4 @@
 /** these MUST stay **/
-body { margin: 0; padding:0; border: 0; }
 a { text-decoration:none; white-space: nowrap;}
 a:hover {text-decoration: underline}
 a.button {text-decoration: none}
@@ -38,9 +37,7 @@ ul { list-style-type: none; margin: 0px; padding: 0px; }
 /** end **/
 
 /* Sticky footer begin */
-html, body {
+
-  height: 100%;
-}
 .wrapper {
   min-height: 100%;
   height: auto !important;

applications/welcome/views/layout.html

@@ -29,7 +29,7 @@
 	device-width: Occupy full width of the screen in its current orientation
 	initial-scale = 1.0 retains dimensions instead of zooming out if page height > device height
 	user-scalable = yes allows the user to zoom in -->
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
   
   <!-- Place favicon.ico and apple-touch-icon.png in the root of your domain and delete these references -->
   <link rel="shortcut icon" href="{{=URL('static','favicon.ico')}}" type="image/x-icon">