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
@@ -1,309 +1,361 @@
/*!
* part of the package to convert web2py elements to bootstrap3 theme
* Developed by Paolo Caruccio ( paolo.caruccio66@gmail.com )
* Released under MIT license
* version 1 rev.201402261600
*
* Supported version of bootstrap framework: 3.0.2+
* The full package includes:
* - bootstrap3.py python module
* - this css file
* - web2py-bootstrap3.js
* - example of layout.html
*/
/*!
* rules overriding web2py.css
* remove if web2py.css is not used
*/
div.flash.alert{
background-image: none;
border-radius: 4px;
-o-border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-width: 1px;
color: rgb(51, 51, 51);
font-weight: normal;
margin: 0 0 20px 0;
min-width: 28px;
opacity: 1;
padding: 15px 35px 15px 15px;
vertical-align: baseline;
right: auto; }
div.flash.alert:hover {
opacity: 1; }
.ie-lte8 div.flash {
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); }
.ie-lte8 div.flash:hover {
filter:alpha(opacity=100); }
ul.navbar-nav li {
margin-bottom: 0; }
ul.list-group, .bs3-form ul , ul.nav-tabs, ul.nav-pills {
margin-left: 0; }
p.lead {
text-align: inherit; }
.bs3-form label {
white-space: normal; }
.bs3-form.form-inline [type="text"], [type="password"], select {
margin-right: 0; }
.bs3-form div.error {
display: none;
width: auto;
background: transparent;
border: none;
color: #a94442;
padding: 0;
background-image: none; }
/*!
* bootstrap3 adapters
* essential rules
*/
/* flash messages */
div.flash.alert {
display: none;
position: fixed;
top: 70px;
right: 75px;
cursor: pointer;
z-index: 1000;
background-color: #f9edbe;
border-color: #f0c36d; }
div.flash.alert.centered {
right: auto; }
div.flash.alert.leftside {
right: auto;
left: 75px; }
div.flash.alert #closeflash {
display: inline-block;
position: relative;
top: -2px;
right: -21px;
color: inherit;
cursor: pointer;
opacity: 0.5;
float: right;
font-size: 21px;
font-weight: bold;
line-height: 1;
text-shadow: 0 1px 0 #ffffff;
margin: 0;
padding: 0; }
/* buttons */
.bs3-form-btn {
margin-top: 3px;
margin-bottom: 3px; }
/*image preview in update forms*/
.w2p-uploaded-file .btn-group {
vertical-align: top;
margin-top: 0; }
#file-reset-btn {
vertical-align: top; }
.w2p-uploaded-file input[type="file"] {
display:inline-block;
padding-top: 7px; }
.w2p-file-preview img {
max-width: 150px; }
.w2p-file-preview:hover img {
background-color: #ebebeb;
border-color: #adadad; }
.w2p-file-preview span {
min-width: 150px;
max-width: 150px;
display: inline-block;
line-height: 40px;
min-height: 40px; }
#no-file {
display: inline-block;
background-color: #eee;
vertical-align: middle;
text-align: center;
border-radius: 4px;
min-width: 150px;
max-width: 150px;
line-height: 43px;
min-height: 43px; }
/* form-inline */
.form-inline .form-group {
margin-right: 4px; }
/* list widget */
.w2p_list li {
margin-bottom: 6px; }
.w2p_list li input {
display: inline-block;
width: 59%;
margin-right: 4px; }
/* autocomplete widget */
div[id^=_autocomplete_] {
margin-top: -10px;
z-index: 1; }
select.autocomplete {
display: block;
padding: 6px 12px;
font-size: 14px;
line-height: 1.428571429;
color: #555;
vertical-align: middle;
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border-color: #428bca;
-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);
-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; }
/* nav-tabs */
.nav-tabs {
margin-bottom: 15px; }
/* dropdown multilevels in menu*/
/* fix issue when screen height is shorter than bs3 default */
.navbar-collapse.short-screen {
max-height: 200px !important; }
.dropdown-submenu>a:after {
display: block;
content: " ";
float: right;
width: 0;
height: 0;
margin-top: 5px;
margin-right: -10px;
border-style: solid;
/* right-arrow */
border-color: transparent #cccccc;
border-width: 4px 0 4px 4px; }
@media (min-width: 768px) {
/* animation */
.navbar-nav .dropdown-menu {
top: -9999px;
display: block;
opacity: 0;
-webkit-transition: opacity .4s ease-in-out; }
.dropdown-submenu {
position: relative; }
.dropdown-submenu>.dropdown-menu {
position: absolute;
top: 0;
left: 100%;
margin-top: -6px;
margin-left: -1px;
border-radius: 0 4px 4px 4px;
/* animation */
left: -9999px;
opacity: 0;
display: block;
-webkit-transition: opacity .4s ease-in-out; }
.navbar ul.nav li[data-w2pmenulevel="l0"]:hover >ul.dropdown-menu {
display: block;
/* animation */
top: 100%;
opacity: 1; }
.dropdown-submenu:hover>.dropdown-menu {
display: block;
/* animation */
left: 100%;
opacity: 1; }
.dropdown-submenu:hover>a,
.dropdown-submenu:focus>a {
color: #fff;
text-decoration: none;
background-color: #357ebd; }
.navbar-inverse .navbar-nav>li>a:hover,
.navbar-inverse .navbar-nav>li>a:focus,
.navbar-inverse .navbar-nav>li:hover>a {
color: #fff;
background-color: black; }
.dropdown-submenu>a:hover:after,
.dropdown-submenu:hover>a:after {
/* left-arrow */
border-color: transparent #fff;
border-width: 4px 4px 4px 0; }
}
@media (max-width: 767px){
.dropdown-menu {
width: 100%;
display: none; }
.dropdown-submenu>.dropdown-menu {
position: static;
float: none;
display: none;
border: none;
margin: 0;
padding: 0;
box-shadow: none;
text-indent: 8px; }
.dropdown-submenu>.dropdown-menu.open {
display: block;
height: 100%; }
.dropdown-submenu>a:after {
/* down-arrow */
border-color: #cccccc transparent;
border-width: 4px 4px 0px 4px; }
.dropdown-submenu>a:hover:after {
border-color: #ffffff transparent; }
.dropdown-submenu>a.active {
font-weight: 700; }
.dropdown-submenu>a.active:after {
/* up-arrow */
border-color: #ffffff transparent;
border-width: 0px 4px 4px 4px; }
}
/*!
* application customization
* add custom rules
*/
body {
padding-top: 70px; }
/* web2py logo */
#web2py-logo {
color: #c6cecc; }
#web2py-logo b {
display: inline-block;
margin-top: -1px; }
#web2py-logo b>span {
font-size: 22px;
color: white; }
#web2py-logo:hover {
color: white; }
/*footer*/
#footer>div.row {
padding-top: 9px;
margin: 20px 0 40px 0;
border-top: 1px solid #eee; }
#footer p {
margin-left: -15px;
margin-right: -15px; }
.dropdown .highlighted {
color: #428bca;
}
ul.w2p_list { margin-left: 0px; }
input.date,input.time,input.datetime,input.double,input.integer { 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 {
-webkit-box-shadow: 0px 0px 8px 2px #000000;
-moz-box-shadow: 0px 0px 8px 2px #000000;
box-shadow: 0px 0px 8px 2px #000000;
}
main {padding-bottom: 50px;}
.nav a, .btn, .btn-default {text-shadow: none; font-weight: bold;}
footer {padding:50px; background: #333; color: #aaa;}
#w2padmin-btn {margin:30px 0 30px 0;}
.flash {opacity: 0.9 !important; right: 100px; }
.dropdown { z-index: 2000; }
/*!
* part of the package to convert web2py elements to bootstrap3 theme
* Developed by Paolo Caruccio ( paolo.caruccio66@gmail.com )
* Released under MIT license
* version 1 rev.201402261600
*
* Supported version of bootstrap framework: 3.0.2+
* The full package includes:
* - bootstrap3.py python module
* - this css file
* - web2py-bootstrap3.js
* - example of layout.html
* - rules overriding web2py.css
*/
div.flash.alert{
background-image: none;
border-radius: 4px;
-o-border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
border-width: 1px;
color: rgb(51, 51, 51);
font-weight: normal;
margin: 0 0 20px 0;
min-width: 28px;
opacity: 1;
padding: 15px 35px 15px 15px;
vertical-align: baseline;
right: auto;
}
div.flash.alert:hover {
opacity: 1;
}
.ie-lte8 div.flash {
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
}
.ie-lte8 div.flash:hover {
filter:alpha(opacity=100);
}
ul.navbar-nav li {
margin-bottom: 0;
}
ul.list-group, .bs3-form ul , ul.nav-tabs, ul.nav-pills {
margin-left: 0;
}
p.lead {
text-align: inherit;
}
.bs3-form label {
white-space: normal;
}
.bs3-form.form-inline [type="text"], [type="password"], select {
margin-right: 0;
}
.bs3-form div.error {
display: none;
width: auto;
background: transparent;
border: none;
color: #a94442;
padding: 0;
background-image: none;
}
/*
* bootstrap3 adapters
* essential rules
*/
/* flash messages */
div.flash.alert {
display: none;
position: fixed;
top: 70px;
right: 75px;
cursor: pointer;
z-index: 1000;
background-color: #f9edbe;
border-color: #f0c36d; }
div.flash.alert.centered {
right: auto; }
div.flash.alert.leftside {
right: auto;
left: 75px; }
div.flash.alert #closeflash {
display: inline-block;
position: relative;
top: -2px;
right: -21px;
color: inherit;
cursor: pointer;
opacity: 0.5;
float: right;
font-size: 21px;
font-weight: bold;
line-height: 1;
text-shadow: 0 1px 0 #ffffff;
margin: 0;
padding: 0;
}
/* buttons */
.bs3-form-btn {
margin-top: 3px;
margin-bottom: 3px;
}
/*image preview in update forms*/
.w2p-uploaded-file .btn-group {
vertical-align: top;
margin-top: 0;
}
#file-reset-btn {
vertical-align: top;
}
.w2p-uploaded-file input[type="file"] {
display:inline-block;
padding-top: 7px;
}
.w2p-file-preview img {
max-width: 150px;
}
.w2p-file-preview:hover img {
background-color: #ebebeb;
border-color: #adadad;
}
.w2p-file-preview span {
min-width: 150px;
max-width: 150px;
display: inline-block;
line-height: 40px;
min-height: 40px;
}
#no-file {
display: inline-block;
background-color: #eee;
vertical-align: middle;
text-align: center;
border-radius: 4px;
min-width: 150px;
max-width: 150px;
line-height: 43px;
min-height: 43px;
}
/* form-inline */
.form-inline .form-group {
margin-right: 4px;
}
/* list widget */
.w2p_list li {
margin-bottom: 6px;
}
.w2p_list li input {
display: inline-block;
width: 59%;
margin-right: 4px;
}
/* autocomplete widget */
div[id^=_autocomplete_] {
margin-top: -10px;
z-index: 1;
}
select.autocomplete {
display: block;
padding: 6px 12px;
font-size: 14px;
line-height: 1.428571429;
color: #555;
vertical-align: middle;
background-color: #fff;
background-image: none;
border: 1px solid #ccc;
border-color: #428bca;
-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);
-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;
}
/* nav-tabs */
.nav-tabs {
margin-bottom: 15px;
}
/* dropdown multilevels in menu*/
/* fix issue when screen height is shorter than bs3 default */
.navbar-collapse.short-screen {
max-height: 200px !important;
}
.dropdown-submenu>a:after {
display: block;
content: " ";
float: right;
width: 0;
height: 0;
margin-top: 5px;
margin-right: -10px;
border-style: solid;
/* right-arrow */
border-color: transparent #cccccc;
border-width: 4px 0 4px 4px;
}
@media (min-width: 768px) {
/* animation */
.navbar-nav .dropdown-menu {
top: -9999px;
display: block;
opacity: 0;
-webkit-transition: opacity .4s ease-in-out; }
.dropdown-submenu {
position: relative; }
.dropdown-submenu>.dropdown-menu {
position: absolute;
top: 0;
left: 100%;
margin-top: -6px;
margin-left: -1px;
border-radius: 0 4px 4px 4px;
/* animation */
left: -9999px;
opacity: 0;
display: block;
-webkit-transition: opacity .4s ease-in-out; }
.navbar ul.nav li[data-w2pmenulevel="l0"]:hover >ul.dropdown-menu {
display: block;
/* animation */
top: 100%;
opacity: 1; }
.dropdown-submenu:hover>.dropdown-menu {
display: block;
/* animation */
left: 100%;
opacity: 1; }
.dropdown-submenu:hover>a,
.dropdown-submenu:focus>a {
color: #fff;
text-decoration: none;
background-color: #357ebd; }
.navbar-inverse .navbar-nav>li>a:hover,
.navbar-inverse .navbar-nav>li>a:focus,
.navbar-inverse .navbar-nav>li:hover>a {
color: #fff;
background-color: black; }
.dropdown-submenu>a:hover:after,
.dropdown-submenu:hover>a:after {
/* left-arrow */
border-color: transparent #fff;
border-width: 4px 4px 4px 0; }
}
@media (max-width: 767px){
.dropdown-menu {
width: 100%;
display: none; }
.dropdown-submenu>.dropdown-menu {
position: static;
float: none;
display: none;
border: none;
margin: 0;
padding: 0;
box-shadow: none;
text-indent: 8px; }
.dropdown-submenu>.dropdown-menu.open {
display: block;
height: 100%; }
.dropdown-submenu>a:after {
/* down-arrow */
border-color: #cccccc transparent;
border-width: 4px 4px 0px 4px; }
.dropdown-submenu>a:hover:after {
border-color: #ffffff transparent; }
.dropdown-submenu>a.active {
font-weight: 700; }
.dropdown-submenu>a.active:after {
/* up-arrow */
border-color: #ffffff transparent;
border-width: 0px 4px 4px 4px; }
}
/*
* application customization
* add custom rules
*/
body {
padding-top: 70px;
}
/* web2py logo */
#web2py-logo {
color: #c6cecc;
}
#web2py-logo b {
display: inline-block;
margin-top: -1px;
}
#web2py-logo b>span {
font-size: 22px;
color: white;
}
#web2py-logo:hover {
color: white;
}
/*footer*/
#footer>div.row {
padding-top: 9px;
margin: 20px 0 40px 0;
border-top: 1px solid #eee;
}
#footer p {
margin-left: -15px;
margin-right: -15px;
}
.dropdown .highlighted {
color: #428bca;
}
ul.w2p_list {
margin-left: 0px;
}
input.date,input.time,input.datetime,input.double,input.integer {
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 {
-webkit-box-shadow: 0px 0px 8px 2px #000000;
-moz-box-shadow: 0px 0px 8px 2px #000000;
box-shadow: 0px 0px 8px 2px #000000;
}
main {
padding-bottom: 50px;
}
footer {
padding:50px; background: #333; color: #aaa;
}
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;
}
+1 -1
View File
@@ -63,7 +63,7 @@ audio {width:200px}
border-top:1px #DEDEDE solid;
}
.header {
/* background:<fill here for header image>; */
/* background:<fill here for header image>; */
}
@@ -3,7 +3,7 @@
* Developed by Paolo Caruccio ( paolo.caruccio66@gmail.com )
* Released under MIT license
* version 1 rev.201402261600
*
*
* Supported version of bootstrap framework: 3.0.2+
* The full package includes:
@@ -19,7 +19,7 @@ jQuery(function(){
var fh_label_class = 'col-md-4',
fh_offest_class = 'col-md-offset-4',
fh_control_class = 'col-md-8';
// functions
function menu_is_collapsed() {
return !jQuery('.navbar-toggle').is(':hidden');
@@ -41,7 +41,7 @@ jQuery(function(){
if (settings.parent)
parent = this.parent();
else
parent = window;
parent = window;
if (settings.mode != "horizontally") {
this.css("top", Math.max
(0, ((jQuery(parent).height() - jQuery(this).outerHeight()) / 2) + jQuery(parent).scrollTop()) + "px");
@@ -52,10 +52,10 @@ jQuery(function(){
}
return this;
};
// alert centering
jQuery('.flash.alert.centered').center({'mode': "horizontally"});
// navs
jQuery(".nav ul.dropdown-menu").not("#w2p-auth-bar").each(function() {
var toggle = jQuery(this).parent();
@@ -73,10 +73,10 @@ jQuery(function(){
jQuery('.navbar-nav a.dropdown-toggle').click(function(e) {
if (menu_is_collapsed())
e.preventDefault();
else
else
window.location=jQuery(this).attr('href');
});
jQuery(".dropdown-submenu>a").click(function(event) {
if (menu_is_collapsed()) {
event.preventDefault();
@@ -99,7 +99,7 @@ jQuery(function(){
window.location=jQuery(this).attr('href');
};
});
jQuery(".nav-tabs .web2py-menu-active").addClass('active');
jQuery(".nav-tabs a").not(".dropdown-toggle").attr("data-toggle", "tab");
// button fixes
@@ -118,9 +118,9 @@ jQuery(function(){
cn.removeClass('short-screen');
}
};
adjust_maxheight_of_collapsed_nav();
// resize and orientation change events
jQuery(window).on('orientationchange resize', function(event) {
adjust_maxheight_of_collapsed_nav();
+39 -40
View File
@@ -1,40 +1,39 @@
{{left_sidebar_enabled,right_sidebar_enabled=False,('message' in globals())}}
{{extend 'layout.html'}}
{{if 'message' in globals():}}
<h2>{{=message}}</h2>
<p class="lead">{{=T('How did you get here?')}}</p>
<ol>
<li>{{=T('You are successfully running web2py')}}</li>
<li>{{=XML(T('You visited the url %s', A(request.env.path_info,_href=request.env.path_info)))}}</li>
<li>{{=XML(T('Which called the function %s located in the file %s',
(A(request.function+'()',_href='#'),
A('web2py/applications/%(application)s/controllers/%(controller)s.py' % request,
_href=URL('admin','default','peek', args=(request.application,'controllers',request.controller+'.py'))))))}}</li>
<li>{{=XML(T('The output of the file is a dictionary that was rendered by the view %s',
A('web2py/applications/%(application)s/views/%(controller)s/index.html' % request,
_href=URL('admin','default','peek',args=(request.application,'views',request.controller,'index.html')))))}}</li>
<li>{{=T('You can modify this application and adapt it to your needs')}}</li>
</ol>
{{elif 'content' in globals():}}
{{=content}}
{{else:}}
{{=BEAUTIFY(response._vars)}}
{{pass}}
{{block right_sidebar}}
<a id="w2padmin-btn" class="btn btn-primary btn-lg btn-block"
href="{{=URL('admin','default','index')}}">
<i class="glyphicon glyphicon-cog"></i>
{{=T("admin")}}
</a>
<div class="panel panel-info">
<div class="panel-heading">{{=T("Don't know what to do?")}}</div>
<ul class="list-group">
<li class="list-group-item">{{=A(T("Online examples"), _href=URL('examples','default','index'))}}</li>
<li class="list-group-item"><a href="http://web2py.com">web2py.com</a></li>
<li class="list-group-item"><a href="http://web2py.com/book">{{=T('Documentation')}}</a></li>
</ul>
</div>
{{end}}
{{left_sidebar_enabled,right_sidebar_enabled=False,('message' in globals())}}
{{extend 'layout.html'}}
{{if 'message' in globals():}}
<h2>{{=message}}</h2>
<p class="lead">{{=T('How did you get here?')}}</p>
<ol>
<li>{{=T('You are successfully running web2py')}}</li>
<li>{{=XML(T('You visited the url %s', A(request.env.path_info,_href=request.env.path_info)))}}</li>
<li>{{=XML(T('Which called the function %s located in the file %s',
(A(request.function+'()',_href='#'),
A('web2py/applications/%(application)s/controllers/%(controller)s.py' % request,
_href=URL('admin','default','peek', args=(request.application,'controllers',request.controller+'.py'))))))}}</li>
<li>{{=XML(T('The output of the file is a dictionary that was rendered by the view %s',
A('web2py/applications/%(application)s/views/%(controller)s/index.html' % request,
_href=URL('admin','default','peek',args=(request.application,'views',request.controller,'index.html')))))}}</li>
<li>{{=T('You can modify this application and adapt it to your needs')}}</li>
</ol>
{{elif 'content' in globals():}}
{{=content}}
{{else:}}
{{=BEAUTIFY(response._vars)}}
{{pass}}
{{block right_sidebar}}
<a id="w2padmin-btn" class="btn btn-primary btn-lg btn-block"
href="{{=URL('admin','default','index')}}">
<i class="glyphicon glyphicon-cog"></i>
{{=T("admin")}}
</a>
<div class="panel panel-info">
<div class="panel-heading">{{=T("Don't know what to do?")}}</div>
<ul class="list-group">
<li class="list-group-item">{{=A(T("Online examples"), _href=URL('examples','default','index'))}}</li>
<li class="list-group-item"><a href="http://web2py.com">web2py.com</a></li>
<li class="list-group-item"><a href="http://web2py.com/book">{{=T('Documentation')}}</a></li>
</ul>
</div>
{{end}}
@@ -33,4 +33,3 @@
{{pass}}
</script>
{{end page_js}}
+1 -1
View File
@@ -115,7 +115,7 @@
</div>
</main>
<!-- Footer ======================================= -->
<footer class="container-full">
<div class="row">
{{block footer}}