diff --git a/VERSION b/VERSION
index 5d141487..33accf2d 100644
--- a/VERSION
+++ b/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
diff --git a/applications/welcome/static/css/bootswatch.css b/applications/welcome/static/css/bootswatch.css
index 07326c5a..af8b7ff6 100644
--- a/applications/welcome/static/css/bootswatch.css
+++ b/applications/welcome/static/css/bootswatch.css
@@ -1,98 +1,112 @@
-body {
- padding-top: 90px; /* container go all the way to the bottom of the topbar */
- 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;}
-
-@media only screen and (max-width: 320px) {
- .navbar-inner{position:relative;}
- #navbar{float:none;position:absolute;bottom:-10px;left:4px;}
-}
-
-.mastheader h1 {
- margin-bottom: 9px;
- font-size: 81px;
- font-weight: bold;
- letter-spacing: -1px;
- line-height: 1;
-}
-
-.mastheader h1 {
- font-size: 54px;
-}
-
-.mastheader small {
- font-size: 20px;
- font-weight: 300;
-}
-
-/* bootstrap dropdown */
-
-.dropdown-menu ul {
- left: 100%;
- position: absolute;
- top: 0;
- visibility: hidden;
- margin-top: -1px;
-}
-
-.dropdown-menu li:hover ul {
- visibility: visible;
-}
-
-.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 {
- border-top: 6px solid transparent;
- border-left: none;
- border-right: 6px solid #fff;
- border-bottom: 6px solid transparent;
- left: 10px;
- top: 6px;
- left: -6px;
-}
-
-.dropdown-menu span{
- display:inline-block;
-}
-
-.chevron-right {
- border-left: 4px solid #000;
- border-right: 4px solid transparent;
- border-bottom: 4px solid transparent;
- border-top: 4px solid transparent;
- content: "";
- display: inline-block;
- height: 0;
- opacity: 0.7;
- vertical-align: top;
- width: 0;
- margin-right:-13px;
- margin-top: 7px;
- float:right;
-}
-
-.open > .dropdown-menu ul { /* fix menu issue when BS2.0.4 is applied */
- display: block;
-}
-
#navbar{padding-top:9px;}
#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 overwrite bootswatch */
+@media only screen and (max-width: 479px) {
+ div.flash {
+ right: 5px;
+ }
+}
-[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
+@media only screen and (max-width: 767px) {
+ .navbar-inner{position:relative;}
+ #navbar{bottom:-10px;left:4px;}
+}
+
+@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 {
+ font-size: 54px;
+ }
+
+ .mastheader small {
+ font-size: 20px;
+ font-weight: 300;
+ }
+
+ /* bootstrap dropdown */
+
+ .dropdown-menu ul {
+ left: 100%;
+ position: absolute;
+ top: 0;
+ visibility: hidden;
+ margin-top: -1px;
+ }
+
+ .dropdown-menu li:hover ul {
+ visibility: visible;
+ }
+
+ .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 {
+ border-top: 6px solid transparent;
+ border-left: none;
+ border-right: 6px solid #fff;
+ border-bottom: 6px solid transparent;
+ left: 10px;
+ top: 6px;
+ left: -6px;
+ }
+
+ .dropdown-menu span{
+ display:inline-block;
+ }
+
+ .chevron-right {
+ border-left: 4px solid #000;
+ border-right: 4px solid transparent;
+ border-bottom: 4px solid transparent;
+ border-top: 4px solid transparent;
+ content: "";
+ display: inline-block;
+ height: 0;
+ opacity: 0.7;
+ vertical-align: top;
+ width: 0;
+ margin-right:-13px;
+ margin-top: 7px;
+ float:right;
+ }
+
+ .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 */
+}
+
+@media only screen and (min-width: 980px) {
+ body {
+ padding-top: 60px;
+ }
+}
diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css
index cab92321..9e6dbf30 100644
--- a/applications/welcome/static/css/web2py.css
+++ b/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;
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index 2e03c3ea..008c9815 100644
--- a/applications/welcome/views/layout.html
+++ b/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 -->
-
+