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

better layout yet, thanks Paolo

Browse Source
This commit is contained in:
mdipierro
2012-09-20 09:19:21 -05:00
parent a5ef1c8e3b
commit 887f02f859
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.9 (2012-09-20 09:15:59) stable Version 2.0.9 (2012-09-20 09:19:17) stable
applications/welcome/models/menu.py
+2 -2
View File
@@ -33,9 +33,9 @@ def _():
# shortcuts # shortcuts
app = request.application app = request.application
ctr = request.controller ctr = request.controller
# useful links to internal and external resources # useful links to internal and external resources
response.menu+=[ response.menu+=[
(SPAN('web2py',_style='color:yellow'),False, 'http://web2py.com', [ (SPAN('web2py',_class='highlighted'),False, 'http://web2py.com', [
(T('My Sites'),False,URL('admin','default','site')), (T('My Sites'),False,URL('admin','default','site')),
(T('This App'),False,URL('admin','default','design/%s' % app), [ (T('This App'),False,URL('admin','default','design/%s' % app), [
(T('Controller'),False, (T('Controller'),False,
applications/welcome/static/css/web2py_bootstrap.css
+11 -1
View File
@@ -70,7 +70,15 @@ div.controls .error{
//display:inline; /* uncommenting this, the animation effect is lost */ //display:inline; /* uncommenting this, the animation effect is lost */
} }
div.controls .inline-help{color:#3A87AD;} div.controls .inline-help{color:#3A87AD;}
div.controls .error_wrapper+.inline-help{margin-left:-99999px} div.controls .error_wrapper+.inline-help{margin-left:-99999px;}
/* beautify brand */
.navbar-inverse .brand{color:#c6cecc;}
.navbar-inverse .brand b{display:inline-block;margin-top:-1px;}
.navbar-inverse .brand b>span{font-size:22px;color:#425f5a;}
.navbar-inverse .brand:hover b>span{color:#638c86;}
/* beautify web2py link in navbar */
span.highlighted{color:#d8d800;}
.open span.highlighted{color:#ffff00;}
/*============================================================= /*=============================================================
OVERRIDING WEB2PY.CSS RULES OVERRIDING WEB2PY.CSS RULES
@@ -185,6 +193,8 @@ td.w2p_fw ul{margin-left:0px;}
margin:3px 0 0 2px; margin:3px 0 0 2px;
} }
.web2py_grid form table{width:auto;} .web2py_grid form table{width:auto;}
/* auth_user_remember checkbox extrapadding in IE fix */
.ie-lte9 input#auth_user_remember.checkbox {padding-left:0;}
/*============================================================= /*=============================================================
MEDIA QUERIES MEDIA QUERIES
applications/welcome/views/layout.html
+4 -4
View File
@@ -76,7 +76,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="http://www.web2py.com/">web2py&trade;&nbsp;</a> <a class="brand" href="http://www.web2py.com/"><b>web<span>2</span>py</b>&trade;&nbsp;</a>
<ul id="navbar" class="nav pull-right">{{='auth' in globals() and auth.navbar(mode="dropdown") or ''}}</ul> <ul id="navbar" class="nav pull-right">{{='auth' in globals() and auth.navbar(mode="dropdown") or ''}}</ul>
<div class="nav-collapse"> <div class="nav-collapse">
{{is_mobile=request.user_agent().is_mobile}} {{is_mobile=request.user_agent().is_mobile}}
@@ -159,10 +159,10 @@
}); });
if(jQuery(document).width()>=980) { if(jQuery(document).width()>=980) {
jQuery('ul.nav a.dropdown-toggle').parent().hover(function() { jQuery('ul.nav a.dropdown-toggle').parent().hover(function() {
mi = jQuery(this); mi = jQuery(this).addClass('open');
mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400,function(){mi.addClass('open')}); mi.children('.dropdown-menu').stop(true, true).delay(200).fadeIn(400);
}, function() { }, function() {
mi = jQuery(this); mi = jQuery(this);
mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')}); mi.children('.dropdown-menu').stop(true, true).delay(200).fadeOut(function(){mi.removeClass('open')});
}); });
} }