dinislage/web2py
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

come web2py.css cleanup

Browse Source
This commit is contained in:
mdipierro committed 2012-07-31 15:06:26 -05:00
1 parent 721146c2f0
commit ece313efe1
6 files changed
+212 -233
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-07-31 13:46:15) dev Version 2.00.0 (2012-07-31 15:06:22) dev
applications/admin/static/css/web2py.css
+64 -69
View File
@@ -1,46 +1,44 @@
/** these MUST stay **/ /** these MUST stay **/
body { margin: 0; padding:0; border: 0; } a {text-decoration:none; white-space:nowrap}
a { text-decoration:none; white-space: nowrap;}
a:hover {text-decoration:underline} a:hover {text-decoration:underline}
a.button {text-decoration:none} 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;
h1 { font-size: 4.00em;} font-family:Helvetica}
h2 { font-size: 3.00em;} h1 {font-size:4.00em}
h3 { font-size: 2.00em;} h2 {font-size:3.00em}
h4 { font-size: 1.50em;} h3 {font-size:2.00em}
h5 { font-size: 1.25em;} h4 {font-size:1.50em}
h6 { font-size: 1.12em;} h5 {font-size:1.25em}
right { float:right; text-align: right; } h6 {font-size:1.12em}
left { float:left; text-align: left; } th,label {font-weight:bold; white-space:nowrap}
center { width:100; text-align: center; vertical-align:middle;} td,th {text-align:left; padding:2px 5px 2px 5px}
th, label { font-weight: bold; white-space: nowrap; } th {vertical-align:middle; border-right:1px solid white}
td, th { text-align: left; padding: 2px 5px 2px 5px; } td {vertical-align:top}
th { vertical-align: middle; border-right: 1px solid white;} form table tr td label {text-align:left}
td { vertical-align: top; } p,table,ol,ul {padding:0; margin: 0.5em 0}
form table tr td label { text-align: left; }
p, table, ol, ul { padding: 0.5em 0 0.5em 0 }
p {text-align:justify} p {text-align:justify}
ol, ul { padding-left: 30px } ol, ul {list-style-position:inside}
li { margin-bottom: 0.5em; } li {margin-bottom:0.5em}
span,input,select,textarea,button,label,a {display:inline} span,input,select,textarea,button,label,a {display:inline}
img { border: 0; } img {border:0}
blockquote, blockquote p, p blockquote { font-style: italic; margin: 0.5em 30px 0.5em 30px; font-size: 0.9em} blockquote,blockquote p,p blockquote {
i, em { font-style: italic; } font-style:italic; margin:0.5em 30px 0.5em 30px; font-size:0.9em}
strong { font-weight: bold; } i,em {font-style:italic}
small { font-size: 0.8em; } strong {font-weight:bold}
textarea { width: 100%; } small {font-size:0.8em}
code { font-family: Courier;} code {font-family:Courier}
video { width:400px; } textarea {width:100%}
audio { width:200px; } video {width:400px}
audio {width:200px}
input[type=text],input[type=password],select{width:300px; margin-right:5px} input[type=text],input[type=password],select{width:300px; margin-right:5px}
ul { list-style-type: none; margin: 0px; padding: 0px; }
.hidden {display:none;visibility:visible} .hidden {display:none;visibility:visible}
.right {float:right; text-align:right}
.left {float:left; text-align:left}
.center {width:100; text-align:center; vertical-align:middle}
/** end **/ /** end **/
/* Sticky footer begin */ /* Sticky footer begin */
html, body {
height: 100%;
}
.wrapper { .wrapper {
min-height:100%; min-height:100%;
height:auto !important; height:auto !important;
@@ -58,7 +56,7 @@ html, body {
clear:both; clear:both;
} }
.footer-content {position: relative; bottom: -4em; width: 100%;} .footer-content {position:relative; bottom:-4em; width:100%}
.auth_navbar { .auth_navbar {
white-space:nowrap; white-space:nowrap;
@@ -74,24 +72,24 @@ html, body {
} }
fieldset { padding: 16px; border-top: 1px #DEDEDE solid;} fieldset {padding:16px; border-top:1px #DEDEDE solid}
fieldset legend {text-transform:uppercase; font-weight: bold; padding: 4px 16px 4px 16px; background: #f1f1f1;} fieldset legend {text-transform:uppercase; font-weight:bold; padding:4px 16px 4px 16px; background:#f1f1f1}
/* fix ie problem with menu */ /* fix ie problem with menu */
.ie-lte7 .topbar .container {z-index: 2; } .ie-lte7 .topbar .container {z-index:2}
td.w2p_fw {padding-bottom: 1px;} td.w2p_fw {padding-bottom:1px}
td.w2p_fl, td.w2p_fw, td.w2p_fc { vertical-align:top; } td.w2p_fl,td.w2p_fw,td.w2p_fc {vertical-align:top}
td.w2p_fl { text-align:right; } td.w2p_fl {text-align:right}
td.w2p_fl, td.w2p_fw {padding-right: 7px;} td.w2p_fl, td.w2p_fw {padding-right:7px}
td.w2p_fl, td.w2p_fc { padding-top: 4px; } td.w2p_fl,td.w2p_fc {padding-top:4px}
/* tr#submit_record__row {border-top: 1px solid #E5E5E5;} */ /* tr#submit_record__row {border-top:1px solid #E5E5E5} */
#submit_record__row td {padding-top: .5em;} #submit_record__row td {padding-top:.5em}
/* Fix */ /* Fix */
#auth_user_remember__row label {display: inline;} #auth_user_remember__row label {display:inline}
#web2py_user_form td { vertical-align:top; } #web2py_user_form td {vertical-align:top}
/*********** web2py specific ***********/ /*********** web2py specific ***********/
div.flash { div.flash {
@@ -112,11 +110,10 @@ div.flash {
border-radius:5px; border-radius:5px;
-moz-border-radius:5px; -moz-border-radius:5px;
-webkit-border-radius:5px; -webkit-border-radius:5px;
z-index: 2; z-index:2000;
} }
div.flash {z-index:2000;}
div.error_wrapper { display: block; } div.error_wrapper {display:block}
div.error { div.error {
background-color:red; background-color:red;
color:white; color:white;
@@ -149,12 +146,6 @@ div.error {
#navbar {float:right; padding:5px; /* same as superfish */} #navbar {float:right; padding:5px; /* same as superfish */}
.right {
width:100%;
text-align: right;
float: right;
}
.statusbar { .statusbar {
background-color:#F5F5F5; background-color:#F5F5F5;
margin-top:1em; margin-top:1em;
@@ -166,23 +157,23 @@ div.error {
-webkit-border-radius:5px; -webkit-border-radius:5px;
} }
.breadcrumbs { float: left; } .breadcrumbs {float:left}
.copyright {float: left;} .copyright {float:left}
#poweredBy {float: right;} #poweredBy {float:right}
/* #MEDIA QUERIES SECTION */ /* #MEDIA QUERIES SECTION */
/* All Mobile Sizes (devices and browser) */ /* All Mobile Sizes (devices and browser) */
@media only screen and (max-width:767px) { @media only screen and (max-width:767px) {
/* removed because of bootswatch /* removed because of bootswatch
.topbar {text-align: center;} .topbar {text-align:center}
#navbar, #menu {float: none;} #navbar,#menu {float:none}
#navbar {font-size: 1.2em; padding: .6em 0 1.2em;} #navbar {font-size:1.2em; padding:.6em 0 1.2em}
#menu {padding: 0 0 1.5em;} #menu {padding:0 0 1.5em}
#menu select {font-size: 1.2em; margin: 0; padding: 0;} #menu select {font-size:1.2em; margin:0; padding:0}
div.flash {top: 110px; right: 10px;} div.flash {top:110px; right:10px}
*/ */
} }
@@ -193,7 +184,7 @@ div.error {
* will look better with the declarations below * will look better with the declarations below
* if needed to remove base.css consider keeping these following lines in some css file. * if needed to remove base.css consider keeping these following lines in some css file.
*/ */
// .web2py_table { border: 1px solid #ccc; } // .web2py_table {border:1px solid #ccc}
.web2py_paginator {} .web2py_paginator {}
.web2py_grid {width:100%} .web2py_grid {width:100%}
.web2py_grid table {width:100%} .web2py_grid table {width:100%}
@@ -207,8 +198,8 @@ div.error {
padding:10px 5px 10px 5px; padding:10px 5px 10px 5px;
} }
.web2py_grid tr.odd {background-color: #F9F9F9;} .web2py_grid tr.odd {background-color:#F9F9F9}
.web2py_grid tr:hover {background-color: #F5F5F5; } .web2py_grid tr:hover {background-color:#F5F5F5}
/* /*
.web2py_breadcrumbs a { .web2py_breadcrumbs a {
@@ -228,8 +219,12 @@ div.error {
.web2py_console form { .web2py_console form {
width:100%; width:100%;
display:inline;
} }
.web2py_console form select {
margin:0;
}
.web2py_search_actions{ .web2py_search_actions{
float:left; float:left;
@@ -268,7 +263,7 @@ div.error {
} }
/*Fix firefox problem*/ /*Fix firefox problem*/
.web2py_table {clear: both; display: block;} .web2py_table {clear:both; display:block}
.web2py_paginator { .web2py_paginator {
padding:5px; padding:5px;
@@ -301,4 +296,4 @@ div.error {
display:inline-block; display:inline-block;
} }
.ie9 #query_panel {padding-bottom:2px;} .ie9 #query_panel {padding-bottom:2px}
applications/examples/static/css/web2py.css
+64 -69
View File
@@ -1,46 +1,44 @@
/** these MUST stay **/ /** these MUST stay **/
body { margin: 0; padding:0; border: 0; } a {text-decoration:none; white-space:nowrap}
a { text-decoration:none; white-space: nowrap;}
a:hover {text-decoration:underline} a:hover {text-decoration:underline}
a.button {text-decoration:none} 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;
h1 { font-size: 4.00em;} font-family:Helvetica}
h2 { font-size: 3.00em;} h1 {font-size:4.00em}
h3 { font-size: 2.00em;} h2 {font-size:3.00em}
h4 { font-size: 1.50em;} h3 {font-size:2.00em}
h5 { font-size: 1.25em;} h4 {font-size:1.50em}
h6 { font-size: 1.12em;} h5 {font-size:1.25em}
right { float:right; text-align: right; } h6 {font-size:1.12em}
left { float:left; text-align: left; } th,label {font-weight:bold; white-space:nowrap}
center { width:100; text-align: center; vertical-align:middle;} td,th {text-align:left; padding:2px 5px 2px 5px}
th, label { font-weight: bold; white-space: nowrap; } th {vertical-align:middle; border-right:1px solid white}
td, th { text-align: left; padding: 2px 5px 2px 5px; } td {vertical-align:top}
th { vertical-align: middle; border-right: 1px solid white;} form table tr td label {text-align:left}
td { vertical-align: top; } p,table,ol,ul {padding:0; margin: 0.5em 0}
form table tr td label { text-align: left; }
p, table, ol, ul { padding: 0.5em 0 0.5em 0 }
p {text-align:justify} p {text-align:justify}
ol, ul { padding-left: 30px } ol, ul {list-style-position:inside}
li { margin-bottom: 0.5em; } li {margin-bottom:0.5em}
span,input,select,textarea,button,label,a {display:inline} span,input,select,textarea,button,label,a {display:inline}
img { border: 0; } img {border:0}
blockquote, blockquote p, p blockquote { font-style: italic; margin: 0.5em 30px 0.5em 30px; font-size: 0.9em} blockquote,blockquote p,p blockquote {
i, em { font-style: italic; } font-style:italic; margin:0.5em 30px 0.5em 30px; font-size:0.9em}
strong { font-weight: bold; } i,em {font-style:italic}
small { font-size: 0.8em; } strong {font-weight:bold}
textarea { width: 100%; } small {font-size:0.8em}
code { font-family: Courier;} code {font-family:Courier}
video { width:400px; } textarea {width:100%}
audio { width:200px; } video {width:400px}
audio {width:200px}
input[type=text],input[type=password],select{width:300px; margin-right:5px} input[type=text],input[type=password],select{width:300px; margin-right:5px}
ul { list-style-type: none; margin: 0px; padding: 0px; }
.hidden {display:none;visibility:visible} .hidden {display:none;visibility:visible}
.right {float:right; text-align:right}
.left {float:left; text-align:left}
.center {width:100; text-align:center; vertical-align:middle}
/** end **/ /** end **/
/* Sticky footer begin */ /* Sticky footer begin */
html, body {
height: 100%;
}
.wrapper { .wrapper {
min-height:100%; min-height:100%;
height:auto !important; height:auto !important;
@@ -58,7 +56,7 @@ html, body {
clear:both; clear:both;
} }
.footer-content {position: relative; bottom: -4em; width: 100%;} .footer-content {position:relative; bottom:-4em; width:100%}
.auth_navbar { .auth_navbar {
white-space:nowrap; white-space:nowrap;
@@ -74,24 +72,24 @@ html, body {
} }
fieldset { padding: 16px; border-top: 1px #DEDEDE solid;} fieldset {padding:16px; border-top:1px #DEDEDE solid}
fieldset legend {text-transform:uppercase; font-weight: bold; padding: 4px 16px 4px 16px; background: #f1f1f1;} fieldset legend {text-transform:uppercase; font-weight:bold; padding:4px 16px 4px 16px; background:#f1f1f1}
/* fix ie problem with menu */ /* fix ie problem with menu */
.ie-lte7 .topbar .container {z-index: 2; } .ie-lte7 .topbar .container {z-index:2}
td.w2p_fw {padding-bottom: 1px;} td.w2p_fw {padding-bottom:1px}
td.w2p_fl, td.w2p_fw, td.w2p_fc { vertical-align:top; } td.w2p_fl,td.w2p_fw,td.w2p_fc {vertical-align:top}
td.w2p_fl { text-align:right; } td.w2p_fl {text-align:right}
td.w2p_fl, td.w2p_fw {padding-right: 7px;} td.w2p_fl, td.w2p_fw {padding-right:7px}
td.w2p_fl, td.w2p_fc { padding-top: 4px; } td.w2p_fl,td.w2p_fc {padding-top:4px}
/* tr#submit_record__row {border-top: 1px solid #E5E5E5;} */ /* tr#submit_record__row {border-top:1px solid #E5E5E5} */
#submit_record__row td {padding-top: .5em;} #submit_record__row td {padding-top:.5em}
/* Fix */ /* Fix */
#auth_user_remember__row label {display: inline;} #auth_user_remember__row label {display:inline}
#web2py_user_form td { vertical-align:top; } #web2py_user_form td {vertical-align:top}
/*********** web2py specific ***********/ /*********** web2py specific ***********/
div.flash { div.flash {
@@ -112,11 +110,10 @@ div.flash {
border-radius:5px; border-radius:5px;
-moz-border-radius:5px; -moz-border-radius:5px;
-webkit-border-radius:5px; -webkit-border-radius:5px;
z-index: 2; z-index:2000;
} }
div.flash {z-index:2000;}
div.error_wrapper { display: block; } div.error_wrapper {display:block}
div.error { div.error {
background-color:red; background-color:red;
color:white; color:white;
@@ -149,12 +146,6 @@ div.error {
#navbar {float:right; padding:5px; /* same as superfish */} #navbar {float:right; padding:5px; /* same as superfish */}
.right {
width:100%;
text-align: right;
float: right;
}
.statusbar { .statusbar {
background-color:#F5F5F5; background-color:#F5F5F5;
margin-top:1em; margin-top:1em;
@@ -166,23 +157,23 @@ div.error {
-webkit-border-radius:5px; -webkit-border-radius:5px;
} }
.breadcrumbs { float: left; } .breadcrumbs {float:left}
.copyright {float: left;} .copyright {float:left}
#poweredBy {float: right;} #poweredBy {float:right}
/* #MEDIA QUERIES SECTION */ /* #MEDIA QUERIES SECTION */
/* All Mobile Sizes (devices and browser) */ /* All Mobile Sizes (devices and browser) */
@media only screen and (max-width:767px) { @media only screen and (max-width:767px) {
/* removed because of bootswatch /* removed because of bootswatch
.topbar {text-align: center;} .topbar {text-align:center}
#navbar, #menu {float: none;} #navbar,#menu {float:none}
#navbar {font-size: 1.2em; padding: .6em 0 1.2em;} #navbar {font-size:1.2em; padding:.6em 0 1.2em}
#menu {padding: 0 0 1.5em;} #menu {padding:0 0 1.5em}
#menu select {font-size: 1.2em; margin: 0; padding: 0;} #menu select {font-size:1.2em; margin:0; padding:0}
div.flash {top: 110px; right: 10px;} div.flash {top:110px; right:10px}
*/ */
} }
@@ -193,7 +184,7 @@ div.error {
* will look better with the declarations below * will look better with the declarations below
* if needed to remove base.css consider keeping these following lines in some css file. * if needed to remove base.css consider keeping these following lines in some css file.
*/ */
// .web2py_table { border: 1px solid #ccc; } // .web2py_table {border:1px solid #ccc}
.web2py_paginator {} .web2py_paginator {}
.web2py_grid {width:100%} .web2py_grid {width:100%}
.web2py_grid table {width:100%} .web2py_grid table {width:100%}
@@ -207,8 +198,8 @@ div.error {
padding:10px 5px 10px 5px; padding:10px 5px 10px 5px;
} }
.web2py_grid tr.odd {background-color: #F9F9F9;} .web2py_grid tr.odd {background-color:#F9F9F9}
.web2py_grid tr:hover {background-color: #F5F5F5; } .web2py_grid tr:hover {background-color:#F5F5F5}
/* /*
.web2py_breadcrumbs a { .web2py_breadcrumbs a {
@@ -228,8 +219,12 @@ div.error {
.web2py_console form { .web2py_console form {
width:100%; width:100%;
display:inline;
} }
.web2py_console form select {
margin:0;
}
.web2py_search_actions{ .web2py_search_actions{
float:left; float:left;
@@ -268,7 +263,7 @@ div.error {
} }
/*Fix firefox problem*/ /*Fix firefox problem*/
.web2py_table {clear: both; display: block;} .web2py_table {clear:both; display:block}
.web2py_paginator { .web2py_paginator {
padding:5px; padding:5px;
@@ -301,4 +296,4 @@ div.error {
display:inline-block; display:inline-block;
} }
.ie9 #query_panel {padding-bottom:2px;} .ie9 #query_panel {padding-bottom:2px}
applications/examples/views/layout.html
+1 -1
View File
@@ -122,7 +122,7 @@
<div class="sixteen columns"> <div class="sixteen columns">
{{block footer}} <!-- this is default footer --> {{block footer}} <!-- this is default footer -->
<div class="footer-content" > <div class="footer-content" >
{{=T('Copyright')}} &#169; 2011 {{=T('Copyright')}} &#169; 2012
- User communities in <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py" target="_blank">English<a>, <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py-fr" target="_blank">French</a>, <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py-japan" target="_blank">Japanese</a>, <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py-users-brazil" target="_blank">Portuguese</a>, and <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py-usuarios" target="_blank">Spanish</a>. - User communities in <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py" target="_blank">English<a>, <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py-fr" target="_blank">French</a>, <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py-japan" target="_blank">Japanese</a>, <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py-users-brazil" target="_blank">Portuguese</a>, and <a href="https://groups.google.com/forum/?fromgroups#!forum/web2py-usuarios" target="_blank">Spanish</a>.
<div style="float: right;"> <div style="float: right;">
<a href="http://www.web2py.com/" style="float: left; padding-right: 6px;"> <a href="http://www.web2py.com/" style="float: left; padding-right: 6px;">
applications/welcome/static/css/web2py.css
+59 -65
View File
@@ -1,39 +1,40 @@
/** these MUST stay **/ /** these MUST stay **/
a { text-decoration:none; white-space: nowrap;} a {text-decoration:none; white-space:nowrap}
a:hover {text-decoration:underline} a:hover {text-decoration:underline}
a.button {text-decoration:none} 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;
h1 { font-size: 4.00em;} font-family:Helvetica}
h2 { font-size: 3.00em;} h1 {font-size:4.00em}
h3 { font-size: 2.00em;} h2 {font-size:3.00em}
h4 { font-size: 1.50em;} h3 {font-size:2.00em}
h5 { font-size: 1.25em;} h4 {font-size:1.50em}
h6 { font-size: 1.12em;} h5 {font-size:1.25em}
right { float:right; text-align: right; } h6 {font-size:1.12em}
left { float:left; text-align: left; } th,label {font-weight:bold; white-space:nowrap}
center { width:100; text-align: center; vertical-align:middle;} td,th {text-align:left; padding:2px 5px 2px 5px}
th, label { font-weight: bold; white-space: nowrap; } th {vertical-align:middle; border-right:1px solid white}
td, th { text-align: left; padding: 2px 5px 2px 5px; } td {vertical-align:top}
th { vertical-align: middle; border-right: 1px solid white;} form table tr td label {text-align:left}
td { vertical-align: top; } p,table,ol,ul {padding:0; margin: 0.5em 0}
form table tr td label { text-align: left; }
p, table, ol, ul { padding: 0.5em 0 0.5em 0 }
p {text-align:justify} p {text-align:justify}
ol, ul { padding-left: 30px } ol, ul {list-style-position:inside}
li { margin-bottom: 0.5em; } li {margin-bottom:0.5em}
span,input,select,textarea,button,label,a {display:inline} span,input,select,textarea,button,label,a {display:inline}
img { border: 0; } img {border:0}
blockquote, blockquote p, p blockquote { font-style: italic; margin: 0.5em 30px 0.5em 30px; font-size: 0.9em} blockquote,blockquote p,p blockquote {
i, em { font-style: italic; } font-style:italic; margin:0.5em 30px 0.5em 30px; font-size:0.9em}
strong { font-weight: bold; } i,em {font-style:italic}
small { font-size: 0.8em; } strong {font-weight:bold}
textarea { width: 100%; } small {font-size:0.8em}
code { font-family: Courier;} code {font-family:Courier}
video { width:400px; } textarea {width:100%}
audio { width:200px; } video {width:400px}
audio {width:200px}
input[type=text],input[type=password],select{width:300px; margin-right:5px} input[type=text],input[type=password],select{width:300px; margin-right:5px}
ul { list-style-type: none; margin: 0px; padding: 0px; }
.hidden {display:none;visibility:visible} .hidden {display:none;visibility:visible}
.right {float:right; text-align:right}
.left {float:left; text-align:left}
.center {width:100; text-align:center; vertical-align:middle}
/** end **/ /** end **/
/* Sticky footer begin */ /* Sticky footer begin */
@@ -55,7 +56,7 @@ ul { list-style-type: none; margin: 0px; padding: 0px; }
clear:both; clear:both;
} }
.footer-content {position: relative; bottom: -4em; width: 100%;} .footer-content {position:relative; bottom:-4em; width:100%}
.auth_navbar { .auth_navbar {
white-space:nowrap; white-space:nowrap;
@@ -71,24 +72,24 @@ ul { list-style-type: none; margin: 0px; padding: 0px; }
} }
fieldset { padding: 16px; border-top: 1px #DEDEDE solid;} fieldset {padding:16px; border-top:1px #DEDEDE solid}
fieldset legend {text-transform:uppercase; font-weight: bold; padding: 4px 16px 4px 16px; background: #f1f1f1;} fieldset legend {text-transform:uppercase; font-weight:bold; padding:4px 16px 4px 16px; background:#f1f1f1}
/* fix ie problem with menu */ /* fix ie problem with menu */
.ie-lte7 .topbar .container {z-index: 2; } .ie-lte7 .topbar .container {z-index:2}
td.w2p_fw {padding-bottom: 1px;} td.w2p_fw {padding-bottom:1px}
td.w2p_fl, td.w2p_fw, td.w2p_fc { vertical-align:top; } td.w2p_fl,td.w2p_fw,td.w2p_fc {vertical-align:top}
td.w2p_fl { text-align:right; } td.w2p_fl {text-align:right}
td.w2p_fl, td.w2p_fw {padding-right: 7px;} td.w2p_fl, td.w2p_fw {padding-right:7px}
td.w2p_fl, td.w2p_fc { padding-top: 4px; } td.w2p_fl,td.w2p_fc {padding-top:4px}
/* tr#submit_record__row {border-top: 1px solid #E5E5E5;} */ /* tr#submit_record__row {border-top:1px solid #E5E5E5} */
#submit_record__row td {padding-top: .5em;} #submit_record__row td {padding-top:.5em}
/* Fix */ /* Fix */
#auth_user_remember__row label {display: inline;} #auth_user_remember__row label {display:inline}
#web2py_user_form td { vertical-align:top; } #web2py_user_form td {vertical-align:top}
/*********** web2py specific ***********/ /*********** web2py specific ***********/
div.flash { div.flash {
@@ -109,11 +110,10 @@ div.flash {
border-radius:5px; border-radius:5px;
-moz-border-radius:5px; -moz-border-radius:5px;
-webkit-border-radius:5px; -webkit-border-radius:5px;
z-index: 2; z-index:2000;
} }
div.flash {z-index:2000;}
div.error_wrapper { display: block; } div.error_wrapper {display:block}
div.error { div.error {
background-color:red; background-color:red;
color:white; color:white;
@@ -146,12 +146,6 @@ div.error {
#navbar {float:right; padding:5px; /* same as superfish */} #navbar {float:right; padding:5px; /* same as superfish */}
.right {
width:100%;
text-align: right;
float: right;
}
.statusbar { .statusbar {
background-color:#F5F5F5; background-color:#F5F5F5;
margin-top:1em; margin-top:1em;
@@ -163,23 +157,23 @@ div.error {
-webkit-border-radius:5px; -webkit-border-radius:5px;
} }
.breadcrumbs { float: left; } .breadcrumbs {float:left}
.copyright {float: left;} .copyright {float:left}
#poweredBy {float: right;} #poweredBy {float:right}
/* #MEDIA QUERIES SECTION */ /* #MEDIA QUERIES SECTION */
/* All Mobile Sizes (devices and browser) */ /* All Mobile Sizes (devices and browser) */
@media only screen and (max-width:767px) { @media only screen and (max-width:767px) {
/* removed because of bootswatch /* removed because of bootswatch
.topbar {text-align: center;} .topbar {text-align:center}
#navbar, #menu {float: none;} #navbar,#menu {float:none}
#navbar {font-size: 1.2em; padding: .6em 0 1.2em;} #navbar {font-size:1.2em; padding:.6em 0 1.2em}
#menu {padding: 0 0 1.5em;} #menu {padding:0 0 1.5em}
#menu select {font-size: 1.2em; margin: 0; padding: 0;} #menu select {font-size:1.2em; margin:0; padding:0}
div.flash {top: 110px; right: 10px;} div.flash {top:110px; right:10px}
*/ */
} }
@@ -190,7 +184,7 @@ div.error {
* will look better with the declarations below * will look better with the declarations below
* if needed to remove base.css consider keeping these following lines in some css file. * if needed to remove base.css consider keeping these following lines in some css file.
*/ */
// .web2py_table { border: 1px solid #ccc; } // .web2py_table {border:1px solid #ccc}
.web2py_paginator {} .web2py_paginator {}
.web2py_grid {width:100%} .web2py_grid {width:100%}
.web2py_grid table {width:100%} .web2py_grid table {width:100%}
@@ -204,8 +198,8 @@ div.error {
padding:10px 5px 10px 5px; padding:10px 5px 10px 5px;
} }
.web2py_grid tr.odd {background-color: #F9F9F9;} .web2py_grid tr.odd {background-color:#F9F9F9}
.web2py_grid tr:hover {background-color: #F5F5F5; } .web2py_grid tr:hover {background-color:#F5F5F5}
/* /*
.web2py_breadcrumbs a { .web2py_breadcrumbs a {
@@ -269,7 +263,7 @@ div.error {
} }
/*Fix firefox problem*/ /*Fix firefox problem*/
.web2py_table {clear: both; display: block;} .web2py_table {clear:both; display:block}
.web2py_paginator { .web2py_paginator {
padding:5px; padding:5px;
@@ -302,4 +296,4 @@ div.error {
display:inline-block; display:inline-block;
} }
.ie9 #query_panel {padding-bottom:2px;} .ie9 #query_panel {padding-bottom:2px}
applications/welcome/views/layout.html
+23 -28
View File
@@ -61,24 +61,6 @@
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css" type="text/css" media="all" /> <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css" type="text/css" media="all" />
<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"></script> <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
uncomment to load jquery-ui //--> uncomment to load jquery-ui //-->
<script>
jQuery(function(){
jQuery('.nav>li>a').each(function(){
if(jQuery(this).parent().find('ul').length)
jQuery(this).attr({'class':'dropdown-toggle','data-toggle':'dropdown'}).append('<b class="caret"></b>');
});
jQuery('.nav li li').each(function(){
if(jQuery(this).find('ul').length)
jQuery(this).children('a').contents().before('<i class="chevron-right"></i>');
});
jQuery('ul.nav li.dropdown').hover(function() {
jQuery(this).find('.dropdown-menu').stop(true, true).delay(200).fadeIn();
}, function() {
jQuery(this).find('.dropdown-menu').stop(true, true).delay(200).fadeOut();
});
jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
});
</script>
<noscript><link href="{{=URL('static', 'css/bootswatch_nojs.css')}}" rel="stylesheet" type="text/css" /></noscript> <noscript><link href="{{=URL('static', 'css/bootswatch_nojs.css')}}" rel="stylesheet" type="text/css" /></noscript>
{{block head}}{{end}} {{block head}}{{end}}
</head> </head>
@@ -88,11 +70,6 @@
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="#">web2py&trade;&nbsp;</a> <a class="brand" href="#">web2py&trade;&nbsp;</a>
<div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ','')) or ''}}</div> <div id="navbar">{{='auth' in globals() and auth.navbar(separators=(' ',' | ','')) or ''}}</div>
<div class="nav-collapse"> <div class="nav-collapse">
@@ -105,9 +82,9 @@
</div> </div>
</div><!--/top navbar --> </div><!--/top navbar -->
<div class="container">
<div class="flash">{{=response.flash or ''}}</div> <div class="flash">{{=response.flash or ''}}</div>
<div class="container">
<!-- Masthead ================================================== --> <!-- Masthead ================================================== -->
<header class="mastheader" id="header"> <header class="mastheader" id="header">
<div class="page-header"> <div class="page-header">
@@ -150,7 +127,7 @@
<footer class="footer"> <footer class="footer">
{{block footer}} <!-- this is default footer --> {{block footer}} <!-- this is default footer -->
<div class="footer-content"> <div class="footer-content">
<div class="copyright pull-left">{{=T('Copyright')}} &#169; 2011</div> <div class="copyright pull-left">{{=T('Copyright')}} &#169; 2012</div>
<div id="poweredBy" class="pull-right"> <div id="poweredBy" class="pull-right">
{{=T('Powered by')}} {{=T('Powered by')}}
<a href="http://www.web2py.com/">web2py</a> <a href="http://www.web2py.com/">web2py</a>
@@ -161,10 +138,28 @@
</div> <!-- /container --> </div> <!-- /container -->
<!-- Le javascript ================================================== --> <!-- The javascript =============================================
<!-- Placed at the end of the document so the pages load faster --> (Placed at the end of the document so the pages load faster) -->
<script>
// this code improves bootstrap menus and adds dropdown support
jQuery(function(){
jQuery('.nav>li>a').each(function(){
if(jQuery(this).parent().find('ul').length)
jQuery(this).attr({'class':'dropdown-toggle','data-toggle':'dropdown'}).append('<b class="caret"></b>');
});
jQuery('.nav li li').each(function(){
if(jQuery(this).find('ul').length)
jQuery(this).children('a').contents().before('<i class="chevron-right"></i>');
});
jQuery('ul.nav li.dropdown').hover(function() {
jQuery(this).find('.dropdown-menu').stop(true, true).delay(200).fadeIn();
}, function() {
jQuery(this).find('.dropdown-menu').stop(true, true).delay(200).fadeOut();
});
jQuery('ul.nav li.dropdown a').click(function(){window.location=jQuery(this).attr('href');});
});
</script>
<script src="{{=URL('static','js/bootstrap.min.js')}}"></script> <script src="{{=URL('static','js/bootstrap.min.js')}}"></script>
<!--[if lt IE 7 ]> <!--[if lt IE 7 ]>
<script src="{{=URL('static','js/dd_belatedpng.js')}}"></script> <script src="{{=URL('static','js/dd_belatedpng.js')}}"></script>
<script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script> <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>