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

reverted a mistake

Browse Source
This commit is contained in:
mdipierro
2015-03-13 12:00:22 -05:00
parent 6498d5ae7e
commit 044af68e5c
2 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/welcome3/static/css/web2py-bootstrap3.css
+3 -4
View File
@@ -284,10 +284,6 @@ select.autocomplete {
* application customization * application customization
* add custom rules * add custom rules
*/ */
body {
padding-top: 70px;
}
/* web2py logo */ /* web2py logo */
#web2py-logo { #web2py-logo {
color: #c6cecc; color: #c6cecc;
@@ -327,6 +323,9 @@ ul.w2p_list {
.background { .background {
background: url(../images/background.jpg) no-repeat center center; background: url(../images/background.jpg) no-repeat center center;
} }
html {
background-color: #333;
}
body { body {
padding-top: 50px padding-top: 50px
} }
applications/welcome3/views/layout.html
+34 -32
View File
@@ -74,43 +74,45 @@
{{block header}} {{block header}}
{{end}} {{end}}
<!-- Main ========================================= --> <!-- Main ========================================= -->
<main class="container" id="content" role="main"> <!-- Begin page content -->
<div class="row"> <div class="container-fluid">
{{if left_sidebar_enabled:}} {{if left_sidebar_enabled:}}
<!-- left sidebar =========== --> <div class="col-md-3 left-sidebar">
<div class="col-md-3"> {{block left_sidebar}}
{{block left_sidebar}} <h3>Left Sidebar</h3>
{{end left_sidebar}} <p></p>
{{end}}
</div> </div>
{{pass}} {{pass}}
<!-- central column ============ -->
<div class="{{=middle_column}}"> <div class="{{=middle_column}}">
{{block center_page}} {{block center}}
{{include}} {{include}}
{{end center_page}} {{end}}
</div>
{{if right_sidebar_enabled:}}
<!-- right sidebar ============- -->
<div class="col-md-3">
{{block right_sidebar}}
{{end right_sidebar}}
</div>
{{pass}}
</div> </div>
</main>
<!-- Footer ======================================= --> {{if right_sidebar_enabled:}}
{{block footer}} <div class="col-md-3">
<footer class="footer"> {{block right_sidebar}}
<div class="container"> <h3>Right Sidebar</h3>
<div class="col-xs-6"> <p></p>
<p>{{=T('Copyright')}} &#169; {{=request.now.year}}</p> {{end}}
</div> </div>
<div class="col-xs-6"> {{pass}}
<p class="pull-right">{{=T('Powered by')}} <a href="http://www.web2py.com/">web2py</a></p>
</div> </div>
{{block footer}} <!-- this is default footer -->
<footer class="footer">
<div class="container-fluid">
<div class="copyright pull-left">{{=T('Copyright')}} &#169; {{=request.now.year}}</div>
<div id="poweredBy" class="pull-right">
{{=T('Powered by')}}
<a href="http://www.web2py.com/">web2py</a>
</div>
</div> </div>
</footer> </footer>
{{end footer}} {{end}}
<!-- The javascript =============================== --> <!-- The javascript =============================== -->
<script src="{{=URL('static','js/bootstrap.min.js')}}"></script> <script src="{{=URL('static','js/bootstrap.min.js')}}"></script>
<script src="{{=URL('static','js/web2py-bootstrap3.js')}}"></script> <script src="{{=URL('static','js/web2py-bootstrap3.js')}}"></script>