fixed whitespaces in welcome3

This commit is contained in:
mdipierro
2015-03-11 00:35:24 -05:00
parent ae48f471d0
commit 71aac68c20
6 changed files with 412 additions and 362 deletions
@@ -11,14 +11,7 @@
* - this css file * - this css file
* - web2py-bootstrap3.js * - web2py-bootstrap3.js
* - example of layout.html * - example of layout.html
* - rules overriding web2py.css
*/
/*!
* rules overriding web2py.css
* remove if web2py.css is not used
*/ */
div.flash.alert{ div.flash.alert{
@@ -35,23 +28,32 @@ div.flash.alert{
opacity: 1; opacity: 1;
padding: 15px 35px 15px 15px; padding: 15px 35px 15px 15px;
vertical-align: baseline; vertical-align: baseline;
right: auto; } right: auto;
}
div.flash.alert:hover { div.flash.alert:hover {
opacity: 1; } opacity: 1;
}
.ie-lte8 div.flash { .ie-lte8 div.flash {
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
.ie-lte8 div.flash:hover { .ie-lte8 div.flash:hover {
filter:alpha(opacity=100); } filter:alpha(opacity=100);
}
ul.navbar-nav li { ul.navbar-nav li {
margin-bottom: 0; } margin-bottom: 0;
}
ul.list-group, .bs3-form ul , ul.nav-tabs, ul.nav-pills { ul.list-group, .bs3-form ul , ul.nav-tabs, ul.nav-pills {
margin-left: 0; } margin-left: 0;
}
p.lead { p.lead {
text-align: inherit; } text-align: inherit;
}
.bs3-form label { .bs3-form label {
white-space: normal; } white-space: normal;
}
.bs3-form.form-inline [type="text"], [type="password"], select { .bs3-form.form-inline [type="text"], [type="password"], select {
margin-right: 0; } margin-right: 0;
}
.bs3-form div.error { .bs3-form div.error {
display: none; display: none;
width: auto; width: auto;
@@ -59,13 +61,12 @@ p.lead {
border: none; border: none;
color: #a94442; color: #a94442;
padding: 0; padding: 0;
background-image: none; } background-image: none;
}
/*
/*!
* bootstrap3 adapters * bootstrap3 adapters
* essential rules * essential rules
*/ */
/* flash messages */ /* flash messages */
@@ -97,31 +98,41 @@ div.flash.alert #closeflash {
line-height: 1; line-height: 1;
text-shadow: 0 1px 0 #ffffff; text-shadow: 0 1px 0 #ffffff;
margin: 0; margin: 0;
padding: 0; } padding: 0;
}
/* buttons */ /* buttons */
.bs3-form-btn { .bs3-form-btn {
margin-top: 3px; margin-top: 3px;
margin-bottom: 3px; } margin-bottom: 3px;
}
/*image preview in update forms*/ /*image preview in update forms*/
.w2p-uploaded-file .btn-group { .w2p-uploaded-file .btn-group {
vertical-align: top; vertical-align: top;
margin-top: 0; } margin-top: 0;
}
#file-reset-btn { #file-reset-btn {
vertical-align: top; } vertical-align: top;
}
.w2p-uploaded-file input[type="file"] { .w2p-uploaded-file input[type="file"] {
display:inline-block; display:inline-block;
padding-top: 7px; } padding-top: 7px;
}
.w2p-file-preview img { .w2p-file-preview img {
max-width: 150px; } max-width: 150px;
}
.w2p-file-preview:hover img { .w2p-file-preview:hover img {
background-color: #ebebeb; background-color: #ebebeb;
border-color: #adadad; } border-color: #adadad;
}
.w2p-file-preview span { .w2p-file-preview span {
min-width: 150px; min-width: 150px;
max-width: 150px; max-width: 150px;
display: inline-block; display: inline-block;
line-height: 40px; line-height: 40px;
min-height: 40px; } min-height: 40px;
}
#no-file { #no-file {
display: inline-block; display: inline-block;
background-color: #eee; background-color: #eee;
@@ -131,21 +142,26 @@ div.flash.alert #closeflash {
min-width: 150px; min-width: 150px;
max-width: 150px; max-width: 150px;
line-height: 43px; line-height: 43px;
min-height: 43px; } min-height: 43px;
}
/* form-inline */ /* form-inline */
.form-inline .form-group { .form-inline .form-group {
margin-right: 4px; } margin-right: 4px;
}
/* list widget */ /* list widget */
.w2p_list li { .w2p_list li {
margin-bottom: 6px; } margin-bottom: 6px;
}
.w2p_list li input { .w2p_list li input {
display: inline-block; display: inline-block;
width: 59%; width: 59%;
margin-right: 4px; } margin-right: 4px;
}
/* autocomplete widget */ /* autocomplete widget */
div[id^=_autocomplete_] { div[id^=_autocomplete_] {
margin-top: -10px; margin-top: -10px;
z-index: 1; } z-index: 1;
}
select.autocomplete { select.autocomplete {
display: block; display: block;
padding: 6px 12px; padding: 6px 12px;
@@ -160,14 +176,19 @@ select.autocomplete {
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
box-shadow: inset 0 1px 1px rgba(0,0,0,0.075); box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; -webkit-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; } transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
}
/* nav-tabs */ /* nav-tabs */
.nav-tabs { .nav-tabs {
margin-bottom: 15px; } margin-bottom: 15px;
}
/* dropdown multilevels in menu*/ /* dropdown multilevels in menu*/
/* fix issue when screen height is shorter than bs3 default */ /* fix issue when screen height is shorter than bs3 default */
.navbar-collapse.short-screen { .navbar-collapse.short-screen {
max-height: 200px !important; } max-height: 200px !important;
}
.dropdown-submenu>a:after { .dropdown-submenu>a:after {
display: block; display: block;
content: " "; content: " ";
@@ -179,7 +200,9 @@ select.autocomplete {
border-style: solid; border-style: solid;
/* right-arrow */ /* right-arrow */
border-color: transparent #cccccc; border-color: transparent #cccccc;
border-width: 4px 0 4px 4px; } border-width: 4px 0 4px 4px;
}
@media (min-width: 768px) { @media (min-width: 768px) {
/* animation */ /* animation */
.navbar-nav .dropdown-menu { .navbar-nav .dropdown-menu {
@@ -257,53 +280,82 @@ select.autocomplete {
border-width: 0px 4px 4px 4px; } border-width: 0px 4px 4px 4px; }
} }
/*
/*!
* application customization * application customization
* add custom rules * add custom rules
*/ */
body { body {
padding-top: 70px; } padding-top: 70px;
}
/* web2py logo */ /* web2py logo */
#web2py-logo { #web2py-logo {
color: #c6cecc; } color: #c6cecc;
}
#web2py-logo b { #web2py-logo b {
display: inline-block; display: inline-block;
margin-top: -1px; } margin-top: -1px;
}
#web2py-logo b>span { #web2py-logo b>span {
font-size: 22px; font-size: 22px;
color: white; } color: white;
}
#web2py-logo:hover { #web2py-logo:hover {
color: white; } color: white;
}
/*footer*/ /*footer*/
#footer>div.row { #footer>div.row {
padding-top: 9px; padding-top: 9px;
margin: 20px 0 40px 0; margin: 20px 0 40px 0;
border-top: 1px solid #eee; } border-top: 1px solid #eee;
}
#footer p { #footer p {
margin-left: -15px; margin-left: -15px;
margin-right: -15px; } margin-right: -15px;
}
.dropdown .highlighted { .dropdown .highlighted {
color: #428bca; color: #428bca;
} }
ul.w2p_list { margin-left: 0px; } ul.w2p_list {
input.date,input.time,input.datetime,input.double,input.integer { width: 33.333%; } margin-left: 0px;
.container-full {margin: 0 auto; width: 100%;} }
.background { background: url(../images/background.jpg) no-repeat center center; } input.date,input.time,input.datetime,input.double,input.integer {
body {padding-top: 50px} width: 33.333%;
}
.container-full {
margin: 0 auto; width: 100%;
}
.background {
background: url(../images/background.jpg) no-repeat center center;
}
body {
padding-top: 50px
}
header { header {
-webkit-box-shadow: 0px 0px 8px 2px #000000; -webkit-box-shadow: 0px 0px 8px 2px #000000;
-moz-box-shadow: 0px 0px 8px 2px #000000; -moz-box-shadow: 0px 0px 8px 2px #000000;
box-shadow: 0px 0px 8px 2px #000000; box-shadow: 0px 0px 8px 2px #000000;
} }
main {padding-bottom: 50px;} main {
.nav a, .btn, .btn-default {text-shadow: none; font-weight: bold;} padding-bottom: 50px;
footer {padding:50px; background: #333; color: #aaa;} }
#w2padmin-btn {margin:30px 0 30px 0;} footer {
.flash {opacity: 0.9 !important; right: 100px; } padding:50px; background: #333; color: #aaa;
.dropdown { z-index: 2000; } }
header h1 {
color: white !important; text-shadow: 0 0 7px black;
}
.nav a, .btn, .btn-default {
text-shadow: none; font-weight: bold;
}
.flash {
opacity: 0.9 !important; right: 100px;
}
.dropdown {
z-index: 2000;
}
#w2padmin-btn {
margin:30px 0 30px 0;
}
@@ -37,4 +37,3 @@
</ul> </ul>
</div> </div>
{{end}} {{end}}
@@ -33,4 +33,3 @@
{{pass}} {{pass}}
</script> </script>
{{end page_js}} {{end page_js}}