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
2012-07-31 15:06:26 -05:00
parent 721146c2f0
commit ece313efe1
6 changed files with 513 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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
+163 -168
View File
@@ -1,190 +1,181 @@
/** 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;
h1,h2,h3,h4,h5,h6 {margin: 0.5em 0 0.25em 0; display: block; font-family: Helvetica;} font-family:Helvetica}
h1 { font-size: 4.00em;} h1 {font-size:4.00em}
h2 { font-size: 3.00em;} h2 {font-size:3.00em}
h3 { font-size: 2.00em;} h3 {font-size:2.00em}
h4 { font-size: 1.50em;} h4 {font-size:1.50em}
h5 { font-size: 1.25em;} h5 {font-size:1.25em}
h6 { font-size: 1.12em;} h6 {font-size:1.12em}
right { float:right; text-align: right; } th,label {font-weight:bold; white-space:nowrap}
left { float:left; text-align: left; } td,th {text-align:left; padding:2px 5px 2px 5px}
center { width:100; text-align: center; vertical-align:middle;} th {vertical-align:middle; border-right:1px solid white}
th, label { font-weight: bold; white-space: nowrap; } td {vertical-align:top}
td, th { text-align: left; padding: 2px 5px 2px 5px; } form table tr td label {text-align:left}
th { vertical-align: middle; border-right: 1px solid white;} p,table,ol,ul {padding:0; margin: 0.5em 0}
td { vertical-align: top; } p {text-align:justify}
form table tr td label { text-align: left; } ol, ul {list-style-position:inside}
p, table, ol, ul { padding: 0.5em 0 0.5em 0 } li {margin-bottom:0.5em}
p {text-align: justify } span,input,select,textarea,button,label,a {display:inline}
ol, ul { padding-left: 30px } img {border:0}
li { margin-bottom: 0.5em; } blockquote,blockquote p,p blockquote {
span, input, select, textarea, button, label, a { display: inline } font-style:italic; margin:0.5em 30px 0.5em 30px; font-size:0.9em}
img { border: 0; } i,em {font-style:italic}
blockquote, blockquote p, p blockquote { 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; } code {font-family:Courier}
small { font-size: 0.8em; } textarea {width:100%}
textarea { width: 100%; } video {width:400px}
code { font-family: Courier;} audio {width:200px}
video { width:400px; } input[type=text],input[type=password],select{width:300px; margin-right:5px}
audio { width:200px; }
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;
height: 100%; height:100%;
margin: 0 auto -8em; /* set last value to footer height plus footer vertical padding */ margin:0 auto -8em; /* set last value to footer height plus footer vertical padding */
} }
.main { .main {
padding: 20px 0 50px 0; padding:20px 0 50px 0;
} }
.footer, .push { .footer,.push {
height: 6em; height:6em;
padding: 1em 0; padding:1em 0;
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;
} }
/* Sticky footer end */ /* Sticky footer end */
.footer { .footer {
border-top: 1px #DEDEDE solid; border-top:1px #DEDEDE solid;
} }
.header { .header {
// background: <fill here for header image>; // background:<fill here for header image>;
} }
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 {
font-weight: bold; font-weight:bold;
display: none; display:none;
position: fixed; position:fixed;
padding: 10px; padding:10px;
top: 48px; top:48px;
right: 50px; right:50px;
min-width: 280px; min-width:280px;
opacity: 0.85; opacity:0.85;
margin: 0px 0px 10px 10px; margin:0px 0px 10px 10px;
color: #fff; color:#fff;
vertical-align: middle; vertical-align:middle;
cursor: pointer; cursor:pointer;
background: #000; background:#000;
border: 2px solid #fff; border:2px solid #fff;
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;
padding: 3px; padding:3px;
display: inline-block; display:inline-block;
} }
.topbar { .topbar {
padding: 10px 0; padding:10px 0;
width:100%; width:100%;
color: #959595; color:#959595;
vertical-align: middle; vertical-align:middle;
padding: auto; padding:auto;
background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); background-image:-khtml-gradient(linear,left top,left bottom,from(#333333),to(#222222));
background-image: -moz-linear-gradient(top, #333333, #222222); background-image:-moz-linear-gradient(top,#333333,#222222);
background-image: -ms-linear-gradient(top, #333333, #222222); background-image:-ms-linear-gradient(top,#333333,#222222);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#333333),color-stop(100%,#222222));
background-image: -webkit-linear-gradient(top, #333333, #222222); background-image:-webkit-linear-gradient(top,#333333,#222222);
background-image: -o-linear-gradient(top, #333333, #222222); background-image:-o-linear-gradient(top,#333333,#222222);
background-image: linear-gradient(top, #333333, #222222); background-image:linear-gradient(top,#333333,#222222);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333',endColorstr='#222222',GradientType=0);
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -webkit-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);
} }
.topbar a { .topbar a {
color: #e1e1e1; color:#e1e1e1;
} }
#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;
margin-bottom: 1em; margin-bottom:1em;
padding: .5em 1em; padding:.5em 1em;
border: 1px solid #ddd; border:1px solid #ddd;
border-radius: 5px; border-radius:5px;
-moz-border-radius: 5px; -moz-border-radius:5px;
-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}
*/ */
} }
/* /*
*Grid *Grid
@@ -193,43 +184,47 @@ 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%}
.web2py_grid tbody td { .web2py_grid tbody td {
padding: 2px 5px 2px 5px; padding:2px 5px 2px 5px;
vertical-align: middle; vertical-align:middle;
} }
.web2py_grid thead th, .web2py_grid tfoot td { .web2py_grid thead th,.web2py_grid tfoot td {
background-color:#EAEAEA; background-color:#EAEAEA;
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 {
line-height: 20px; margin-right: 5px; display: inline-block; line-height:20px; margin-right:5px; display:inline-block;
padding: 3px 5px 3px 5px; padding:3px 5px 3px 5px;
font-family: 'lucida grande', tahoma, verdana, arial, sans-serif; font-family:'lucida grande',tahoma,verdana,arial,sans-serif;
color: #3C3C3D; color:#3C3C3D;
text-shadow: 1px 1px 0 #FFFFFF; text-shadow:1px 1px 0 #FFFFFF;
white-space: nowrap; overflow: visible; cursor: pointer; white-space:nowrap; overflow:visible; cursor:pointer;
background:#ECECEC; background:#ECECEC;
border: 1px solid #CACACA; border:1px solid #CACACA;
-webkit-border-radius: 2px; -moz-border-radius: 2px; -webkit-border-radius:2px; -moz-border-radius:2px;
-webkit-background-clip: padding-box; border-radius: 2px; -webkit-background-clip:padding-box; border-radius:2px;
outline: none; position: relative; zoom: 1; *display: inline; outline:none; position:relative; zoom:1; *display:inline;
} }
*/ */
.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;
@@ -238,14 +233,14 @@ div.error {
.web2py_grid .row_buttons { .web2py_grid .row_buttons {
min-height:25px; min-height:25px;
vertical-align: middle; vertical-align:middle;
} }
.web2py_grid .row_buttons a { .web2py_grid .row_buttons a {
margin: 3px; margin:3px;
} }
.web2py_search_actions { .web2py_search_actions {
width: 100%; width:100%;
} }
.web2py_grid .row_buttons a, .web2py_grid .row_buttons a,
@@ -254,13 +249,13 @@ div.error {
.web2py_console input[type=submit], .web2py_console input[type=submit],
.web2py_console input[type=button], .web2py_console input[type=button],
.web2py_console button { .web2py_console button {
line-height: 20px; line-height:20px;
margin-right: 5px; display: inline-block; margin-right:5px; display:inline-block;
padding: 3px 5px 3px 5px; padding:3px 5px 3px 5px;
} }
.web2py_counter { .web2py_counter {
margin-top: 5px; margin-top:5px;
margin-right:5px; margin-right:5px;
width:35%; width:35%;
float:right; float:right;
@@ -268,37 +263,37 @@ 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;
text-align:right; text-align:right;
background-color: #f2f2f2; background-color:#f2f2f2;
} }
.web2py_paginator ul { .web2py_paginator ul {
list-style-type: none; list-style-type:none;
margin: 0px; margin:0px;
padding: 0px; padding:0px;
} }
.web2py_paginator ul li { .web2py_paginator ul li {
display: inline; display:inline;
} }
.web2py_paginator .current { .web2py_paginator .current {
font-weight: bold; font-weight:bold;
} }
#w2p_query_panel {} #w2p_query_panel {}
.web2py_breadcrumbs ul { .web2py_breadcrumbs ul {
list-style: none; list-style:none;
margin-bottom: 18px; margin-bottom:18px;
} }
.web2py_breadcrumbs ul li { .web2py_breadcrumbs ul li {
display: inline-block; display:inline-block;
} }
.ie9 #query_panel {padding-bottom:2px;} .ie9 #query_panel {padding-bottom:2px}
applications/examples/static/css/web2py.css
+163 -168
View File
@@ -1,190 +1,181 @@
/** 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;
h1,h2,h3,h4,h5,h6 {margin: 0.5em 0 0.25em 0; display: block; font-family: Helvetica;} font-family:Helvetica}
h1 { font-size: 4.00em;} h1 {font-size:4.00em}
h2 { font-size: 3.00em;} h2 {font-size:3.00em}
h3 { font-size: 2.00em;} h3 {font-size:2.00em}
h4 { font-size: 1.50em;} h4 {font-size:1.50em}
h5 { font-size: 1.25em;} h5 {font-size:1.25em}
h6 { font-size: 1.12em;} h6 {font-size:1.12em}
right { float:right; text-align: right; } th,label {font-weight:bold; white-space:nowrap}
left { float:left; text-align: left; } td,th {text-align:left; padding:2px 5px 2px 5px}
center { width:100; text-align: center; vertical-align:middle;} th {vertical-align:middle; border-right:1px solid white}
th, label { font-weight: bold; white-space: nowrap; } td {vertical-align:top}
td, th { text-align: left; padding: 2px 5px 2px 5px; } form table tr td label {text-align:left}
th { vertical-align: middle; border-right: 1px solid white;} p,table,ol,ul {padding:0; margin: 0.5em 0}
td { vertical-align: top; } p {text-align:justify}
form table tr td label { text-align: left; } ol, ul {list-style-position:inside}
p, table, ol, ul { padding: 0.5em 0 0.5em 0 } li {margin-bottom:0.5em}
p {text-align: justify } span,input,select,textarea,button,label,a {display:inline}
ol, ul { padding-left: 30px } img {border:0}
li { margin-bottom: 0.5em; } blockquote,blockquote p,p blockquote {
span, input, select, textarea, button, label, a { display: inline } font-style:italic; margin:0.5em 30px 0.5em 30px; font-size:0.9em}
img { border: 0; } i,em {font-style:italic}
blockquote, blockquote p, p blockquote { 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; } code {font-family:Courier}
small { font-size: 0.8em; } textarea {width:100%}
textarea { width: 100%; } video {width:400px}
code { font-family: Courier;} audio {width:200px}
video { width:400px; } input[type=text],input[type=password],select{width:300px; margin-right:5px}
audio { width:200px; }
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;
height: 100%; height:100%;
margin: 0 auto -8em; /* set last value to footer height plus footer vertical padding */ margin:0 auto -8em; /* set last value to footer height plus footer vertical padding */
} }
.main { .main {
padding: 20px 0 50px 0; padding:20px 0 50px 0;
} }
.footer, .push { .footer,.push {
height: 6em; height:6em;
padding: 1em 0; padding:1em 0;
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;
} }
/* Sticky footer end */ /* Sticky footer end */
.footer { .footer {
border-top: 1px #DEDEDE solid; border-top:1px #DEDEDE solid;
} }
.header { .header {
// background: <fill here for header image>; // background:<fill here for header image>;
} }
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 {
font-weight: bold; font-weight:bold;
display: none; display:none;
position: fixed; position:fixed;
padding: 10px; padding:10px;
top: 48px; top:48px;
right: 50px; right:50px;
min-width: 280px; min-width:280px;
opacity: 0.85; opacity:0.85;
margin: 0px 0px 10px 10px; margin:0px 0px 10px 10px;
color: #fff; color:#fff;
vertical-align: middle; vertical-align:middle;
cursor: pointer; cursor:pointer;
background: #000; background:#000;
border: 2px solid #fff; border:2px solid #fff;
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;
padding: 3px; padding:3px;
display: inline-block; display:inline-block;
} }
.topbar { .topbar {
padding: 10px 0; padding:10px 0;
width:100%; width:100%;
color: #959595; color:#959595;
vertical-align: middle; vertical-align:middle;
padding: auto; padding:auto;
background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); background-image:-khtml-gradient(linear,left top,left bottom,from(#333333),to(#222222));
background-image: -moz-linear-gradient(top, #333333, #222222); background-image:-moz-linear-gradient(top,#333333,#222222);
background-image: -ms-linear-gradient(top, #333333, #222222); background-image:-ms-linear-gradient(top,#333333,#222222);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#333333),color-stop(100%,#222222));
background-image: -webkit-linear-gradient(top, #333333, #222222); background-image:-webkit-linear-gradient(top,#333333,#222222);
background-image: -o-linear-gradient(top, #333333, #222222); background-image:-o-linear-gradient(top,#333333,#222222);
background-image: linear-gradient(top, #333333, #222222); background-image:linear-gradient(top,#333333,#222222);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333',endColorstr='#222222',GradientType=0);
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -webkit-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);
} }
.topbar a { .topbar a {
color: #e1e1e1; color:#e1e1e1;
} }
#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;
margin-bottom: 1em; margin-bottom:1em;
padding: .5em 1em; padding:.5em 1em;
border: 1px solid #ddd; border:1px solid #ddd;
border-radius: 5px; border-radius:5px;
-moz-border-radius: 5px; -moz-border-radius:5px;
-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}
*/ */
} }
/* /*
*Grid *Grid
@@ -193,43 +184,47 @@ 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%}
.web2py_grid tbody td { .web2py_grid tbody td {
padding: 2px 5px 2px 5px; padding:2px 5px 2px 5px;
vertical-align: middle; vertical-align:middle;
} }
.web2py_grid thead th, .web2py_grid tfoot td { .web2py_grid thead th,.web2py_grid tfoot td {
background-color:#EAEAEA; background-color:#EAEAEA;
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 {
line-height: 20px; margin-right: 5px; display: inline-block; line-height:20px; margin-right:5px; display:inline-block;
padding: 3px 5px 3px 5px; padding:3px 5px 3px 5px;
font-family: 'lucida grande', tahoma, verdana, arial, sans-serif; font-family:'lucida grande',tahoma,verdana,arial,sans-serif;
color: #3C3C3D; color:#3C3C3D;
text-shadow: 1px 1px 0 #FFFFFF; text-shadow:1px 1px 0 #FFFFFF;
white-space: nowrap; overflow: visible; cursor: pointer; white-space:nowrap; overflow:visible; cursor:pointer;
background:#ECECEC; background:#ECECEC;
border: 1px solid #CACACA; border:1px solid #CACACA;
-webkit-border-radius: 2px; -moz-border-radius: 2px; -webkit-border-radius:2px; -moz-border-radius:2px;
-webkit-background-clip: padding-box; border-radius: 2px; -webkit-background-clip:padding-box; border-radius:2px;
outline: none; position: relative; zoom: 1; *display: inline; outline:none; position:relative; zoom:1; *display:inline;
} }
*/ */
.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;
@@ -238,14 +233,14 @@ div.error {
.web2py_grid .row_buttons { .web2py_grid .row_buttons {
min-height:25px; min-height:25px;
vertical-align: middle; vertical-align:middle;
} }
.web2py_grid .row_buttons a { .web2py_grid .row_buttons a {
margin: 3px; margin:3px;
} }
.web2py_search_actions { .web2py_search_actions {
width: 100%; width:100%;
} }
.web2py_grid .row_buttons a, .web2py_grid .row_buttons a,
@@ -254,13 +249,13 @@ div.error {
.web2py_console input[type=submit], .web2py_console input[type=submit],
.web2py_console input[type=button], .web2py_console input[type=button],
.web2py_console button { .web2py_console button {
line-height: 20px; line-height:20px;
margin-right: 5px; display: inline-block; margin-right:5px; display:inline-block;
padding: 3px 5px 3px 5px; padding:3px 5px 3px 5px;
} }
.web2py_counter { .web2py_counter {
margin-top: 5px; margin-top:5px;
margin-right:5px; margin-right:5px;
width:35%; width:35%;
float:right; float:right;
@@ -268,37 +263,37 @@ 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;
text-align:right; text-align:right;
background-color: #f2f2f2; background-color:#f2f2f2;
} }
.web2py_paginator ul { .web2py_paginator ul {
list-style-type: none; list-style-type:none;
margin: 0px; margin:0px;
padding: 0px; padding:0px;
} }
.web2py_paginator ul li { .web2py_paginator ul li {
display: inline; display:inline;
} }
.web2py_paginator .current { .web2py_paginator .current {
font-weight: bold; font-weight:bold;
} }
#w2p_query_panel {} #w2p_query_panel {}
.web2py_breadcrumbs ul { .web2py_breadcrumbs ul {
list-style: none; list-style:none;
margin-bottom: 18px; margin-bottom:18px;
} }
.web2py_breadcrumbs ul li { .web2py_breadcrumbs ul li {
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
+160 -166
View File
@@ -1,187 +1,181 @@
/** 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 {text-align:justify}
p, table, ol, ul { padding: 0.5em 0 0.5em 0 } ol, ul {list-style-position:inside}
p {text-align: justify } li {margin-bottom:0.5em}
ol, ul { padding-left: 30px } span,input,select,textarea,button,label,a {display:inline}
li { margin-bottom: 0.5em; } img {border:0}
span, input, select, textarea, button, label, a { display: inline } blockquote,blockquote p,p blockquote {
img { border: 0; } font-style:italic; margin:0.5em 30px 0.5em 30px; font-size:0.9em}
blockquote, blockquote p, p blockquote { font-style: italic; margin: 0.5em 30px 0.5em 30px; font-size: 0.9em} i,em {font-style:italic}
i, em { font-style: italic; } strong {font-weight:bold}
strong { font-weight: bold; } small {font-size:0.8em}
small { font-size: 0.8em; } code {font-family:Courier}
textarea { width: 100%; } textarea {width:100%}
code { font-family: Courier;} video {width:400px}
video { width:400px; } audio {width:200px}
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 */
.wrapper { .wrapper {
min-height: 100%; min-height:100%;
height: auto !important; height:auto !important;
height: 100%; height:100%;
margin: 0 auto -8em; /* set last value to footer height plus footer vertical padding */ margin:0 auto -8em; /* set last value to footer height plus footer vertical padding */
} }
.main { .main {
padding: 20px 0 50px 0; padding:20px 0 50px 0;
} }
.footer, .push { .footer,.push {
height: 6em; height:6em;
padding: 1em 0; padding:1em 0;
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;
} }
/* Sticky footer end */ /* Sticky footer end */
.footer { .footer {
border-top: 1px #DEDEDE solid; border-top:1px #DEDEDE solid;
} }
.header { .header {
// background: <fill here for header image>; // background:<fill here for header image>;
} }
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 {
font-weight: bold; font-weight:bold;
display: none; display:none;
position: fixed; position:fixed;
padding: 10px; padding:10px;
top: 48px; top:48px;
right: 50px; right:50px;
min-width: 280px; min-width:280px;
opacity: 0.85; opacity:0.85;
margin: 0px 0px 10px 10px; margin:0px 0px 10px 10px;
color: #fff; color:#fff;
vertical-align: middle; vertical-align:middle;
cursor: pointer; cursor:pointer;
background: #000; background:#000;
border: 2px solid #fff; border:2px solid #fff;
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;
padding: 3px; padding:3px;
display: inline-block; display:inline-block;
} }
.topbar { .topbar {
padding: 10px 0; padding:10px 0;
width:100%; width:100%;
color: #959595; color:#959595;
vertical-align: middle; vertical-align:middle;
padding: auto; padding:auto;
background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222)); background-image:-khtml-gradient(linear,left top,left bottom,from(#333333),to(#222222));
background-image: -moz-linear-gradient(top, #333333, #222222); background-image:-moz-linear-gradient(top,#333333,#222222);
background-image: -ms-linear-gradient(top, #333333, #222222); background-image:-ms-linear-gradient(top,#333333,#222222);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222)); background-image:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#333333),color-stop(100%,#222222));
background-image: -webkit-linear-gradient(top, #333333, #222222); background-image:-webkit-linear-gradient(top,#333333,#222222);
background-image: -o-linear-gradient(top, #333333, #222222); background-image:-o-linear-gradient(top,#333333,#222222);
background-image: linear-gradient(top, #333333, #222222); background-image:linear-gradient(top,#333333,#222222);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333',endColorstr='#222222',GradientType=0);
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -webkit-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -moz-box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); box-shadow:0 1px 3px rgba(0,0,0,0.25),inset 0 -1px 0 rgba(0,0,0,0.1);
} }
.topbar a { .topbar a {
color: #e1e1e1; color:#e1e1e1;
} }
#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;
margin-bottom: 1em; margin-bottom:1em;
padding: .5em 1em; padding:.5em 1em;
border: 1px solid #ddd; border:1px solid #ddd;
border-radius: 5px; border-radius:5px;
-moz-border-radius: 5px; -moz-border-radius:5px;
-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}
*/ */
} }
/* /*
*Grid *Grid
@@ -190,46 +184,46 @@ 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%}
.web2py_grid tbody td { .web2py_grid tbody td {
padding: 2px 5px 2px 5px; padding:2px 5px 2px 5px;
vertical-align: middle; vertical-align:middle;
} }
.web2py_grid thead th, .web2py_grid tfoot td { .web2py_grid thead th,.web2py_grid tfoot td {
background-color:#EAEAEA; background-color:#EAEAEA;
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 {
line-height: 20px; margin-right: 5px; display: inline-block; line-height:20px; margin-right:5px; display:inline-block;
padding: 3px 5px 3px 5px; padding:3px 5px 3px 5px;
font-family: 'lucida grande', tahoma, verdana, arial, sans-serif; font-family:'lucida grande',tahoma,verdana,arial,sans-serif;
color: #3C3C3D; color:#3C3C3D;
text-shadow: 1px 1px 0 #FFFFFF; text-shadow:1px 1px 0 #FFFFFF;
white-space: nowrap; overflow: visible; cursor: pointer; white-space:nowrap; overflow:visible; cursor:pointer;
background:#ECECEC; background:#ECECEC;
border: 1px solid #CACACA; border:1px solid #CACACA;
-webkit-border-radius: 2px; -moz-border-radius: 2px; -webkit-border-radius:2px; -moz-border-radius:2px;
-webkit-background-clip: padding-box; border-radius: 2px; -webkit-background-clip:padding-box; border-radius:2px;
outline: none; position: relative; zoom: 1; *display: inline; outline:none; position:relative; zoom:1; *display:inline;
} }
*/ */
.web2py_console form { .web2py_console form {
width:100%; width:100%;
display: inline; display:inline;
} }
.web2py_console form select { .web2py_console form select {
margin: 0; margin:0;
} }
.web2py_search_actions{ .web2py_search_actions{
@@ -239,14 +233,14 @@ div.error {
.web2py_grid .row_buttons { .web2py_grid .row_buttons {
min-height:25px; min-height:25px;
vertical-align: middle; vertical-align:middle;
} }
.web2py_grid .row_buttons a { .web2py_grid .row_buttons a {
margin: 3px; margin:3px;
} }
.web2py_search_actions { .web2py_search_actions {
width: 100%; width:100%;
} }
.web2py_grid .row_buttons a, .web2py_grid .row_buttons a,
@@ -255,13 +249,13 @@ div.error {
.web2py_console input[type=submit], .web2py_console input[type=submit],
.web2py_console input[type=button], .web2py_console input[type=button],
.web2py_console button { .web2py_console button {
line-height: 20px; line-height:20px;
margin-right: 5px; display: inline-block; margin-right:5px; display:inline-block;
padding: 3px 5px 3px 5px; padding:3px 5px 3px 5px;
} }
.web2py_counter { .web2py_counter {
margin-top: 5px; margin-top:5px;
margin-right:5px; margin-right:5px;
width:35%; width:35%;
float:right; float:right;
@@ -269,37 +263,37 @@ 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;
text-align:right; text-align:right;
background-color: #f2f2f2; background-color:#f2f2f2;
} }
.web2py_paginator ul { .web2py_paginator ul {
list-style-type: none; list-style-type:none;
margin: 0px; margin:0px;
padding: 0px; padding:0px;
} }
.web2py_paginator ul li { .web2py_paginator ul li {
display: inline; display:inline;
} }
.web2py_paginator .current { .web2py_paginator .current {
font-weight: bold; font-weight:bold;
} }
#w2p_query_panel {} #w2p_query_panel {}
.web2py_breadcrumbs ul { .web2py_breadcrumbs ul {
list-style: none; list-style:none;
margin-bottom: 18px; margin-bottom:18px;
} }
.web2py_breadcrumbs ul li { .web2py_breadcrumbs ul li {
display: inline-block; display:inline-block;
} }
.ie9 #query_panel {padding-bottom:2px;} .ie9 #query_panel {padding-bottom:2px}
applications/welcome/views/layout.html
+24 -29
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="flash">{{=response.flash or ''}}</div>
<div class="container"> <div class="container">
<div class="flash">{{=response.flash or ''}}</div>
<!-- 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>