diff --git a/VERSION b/VERSION index d2bcb633..0a8d3cae 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.00.0 (2012-05-25 10:38:13) dev +Version 2.00.0 (2012-05-25 14:51:51) dev diff --git a/applications/welcome/static/css/web2py.css b/applications/welcome/static/css/web2py.css index 359c86d8..a0554378 100644 --- a/applications/welcome/static/css/web2py.css +++ b/applications/welcome/static/css/web2py.css @@ -3,7 +3,7 @@ body { margin: 0; padding:0; border: 0; } a { text-decoration:none; white-space: nowrap;} a:hover {text-decoration: underline} a.button {text-decoration: none} -h1,h2,h3,h4,h5,h6 {margin: 0.5em 0 0.25em 0; display: block; font-family: Helvetica} +h1,h2,h3,h4,h5,h6 {margin: 0.5em 0 0.25em 0; display: block; font-family: Helvetica;} h1 { font-size: 4.00em;} h2 { font-size: 3.00em;} h3 { font-size: 2.00em;} @@ -41,7 +41,6 @@ ul { list-style-type: none; margin: 0px; padding: 0px; } html, body { height: 100%; } - .wrapper { min-height: 100%; height: auto !important; @@ -67,9 +66,6 @@ html, body { /* Sticky footer end */ -body { - background-color: #FFFFFF; -} .footer { border-top: 1px #DEDEDE solid; } @@ -97,8 +93,6 @@ td.w2p_fl, td.w2p_fc { padding-top: 4px; } #auth_user_remember__row label {display: inline;} #web2py_user_form td { vertical-align:top; } -a, a:visited, a:hover { color:#0069D6} - /*********** web2py specific ***********/ div.flash { font-weight: bold; @@ -120,6 +114,8 @@ div.flash { -webkit-border-radius: 5px; z-index: 2; } +div.flash {z-index:2000;} + div.error { background-color: red; color: white; @@ -150,6 +146,8 @@ div.error { } #navbar {float: right; padding: 5px; /* same as superfish */} +#navbar {padding: 9px;} +#navbar a {color: inherit;} .right { width:100%; @@ -177,7 +175,7 @@ div.error { /* All Mobile Sizes (devices and browser) */ @media only screen and (max-width: 767px) { - +/* removed because of bootswatch .topbar {text-align: center;} #navbar, #menu {float: none;} #navbar {font-size: 1.2em; padding: .6em 0 1.2em;} @@ -185,10 +183,9 @@ div.error { #menu select {font-size: 1.2em; margin: 0; padding: 0;} div.flash {top: 110px; right: 10px;} - +*/ } - /* *Grid * diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html index ea507d60..d64ee329 100644 --- a/applications/welcome/views/layout.html +++ b/applications/welcome/views/layout.html @@ -1,168 +1,176 @@ - - - - - - - - - - - - - - {{=response.title or request.application}} - - - - - - - - - - - - - - - - - - - - {{ - response.files.append(URL('static','css/bootstrap.min.css')) - response.files.append(URL('static','css/web2py.css')) - if response.menu: - response.files.append(URL('static','css/superfish.css')) - response.files.append(URL('static','js/superfish.js')) - pass - }} - - {{include 'web2py_ajax.html'}} - - {{if response.menu:}} - - {{pass}} - - {{ - # using sidebars need to know what sidebar you want to use - left_sidebar_enabled = globals().get('left_sidebar_enabled',False) - right_sidebar_enabled = globals().get('right_sidebar_enabled',False) - middle_columns = {0:'span12',1:'span9',2:'span6'}[ - (left_sidebar_enabled and 1 or 0)+(right_sidebar_enabled and 1 or 0)] - }} - - - {{block head}}{{end}} - - -
-
-
-
- - {{is_mobile=request.user_agent().is_mobile}} - {{if response.menu:}} - - {{pass}} -
-
-
-
- -
{{=response.flash or ''}}
- -
-
-
- -
- Share - -
-
-

- {{=response.title or request.application}} - {{=response.subtitle or ''}} -

-
-
-
-
- - -
-
-
- {{if left_sidebar_enabled:}} -
- {{block left_sidebar}} -

Left Sidebar

-

- {{end}} -
- {{pass}} - -
- {{block center}} - {{include}} - {{end}} -
- - {{if right_sidebar_enabled:}} -
- {{block right_sidebar}} -

Right Sidebar

-

- {{end}} -
- {{pass}} -
-
-
- -
-
-
-
- {{block footer}} -
-
{{=T('Copyright')}} © 2011
-
- Powered by - web2py -
-
- {{end}} -
-
-
-
- - - {{if response.google_analytics_id:}} {{pass}} - - + + + + + + + + + + + + + + {{=response.title or request.application}} + + + + + + + + + + + + + + + + + + + {{ + response.files.append(URL('static','css/bootstrap.min.css')) + response.files.append(URL('static','css/web2py.css')) + response.files.append(URL('static','css/bootswatch.css')) + }} + + {{include 'web2py_ajax.html'}} + + {{ + # using sidebars need to know what sidebar you want to use + left_sidebar_enabled = globals().get('left_sidebar_enabled',False) + right_sidebar_enabled = globals().get('right_sidebar_enabled',False) + middle_columns = {0:'span12',1:'span9',2:'span6'}[ + (left_sidebar_enabled and 1 or 0)+(right_sidebar_enabled and 1 or 0)] + }} + + + + {{block head}}{{end}} + + + + +
+
+
+ + + + + + web2py™  + +
+ {{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}} +
+
+
+
+ +
{{=response.flash or ''}}
+ +
+ +
+ +
+ Share + +
+
+

+ {{=response.title or request.application}} + {{=response.subtitle or ''}} +

+
+
+ +
+
+ {{if left_sidebar_enabled:}} +
+ {{block left_sidebar}} +

Left Sidebar

+

+ {{end}} +
+ {{pass}} + +
+ {{block center}} + {{include}} + {{end}} +
+ + {{if right_sidebar_enabled:}} +
+ {{block right_sidebar}} +

Right Sidebar

+

+ {{end}} +
+ {{pass}} +
+
+ + + + +
+ + + + + + + {{if response.google_analytics_id:}} {{pass}} + + +