[Rt-commit] rt branch, menu-redo, updated. fa2b9489f16aace6d4d6639749ec69d4d5fc0554
jesse
jesse at bestpractical.com
Wed Nov 11 12:14:00 EST 2009
The branch, menu-redo has been updated
via fa2b9489f16aace6d4d6639749ec69d4d5fc0554 (commit)
from cb1d7b3d79eabf839fc08f932d47870256a18105 (commit)
Summary of changes:
share/html/Elements/Header | 6 ++----
share/web/static/css/layout.css | 37 ++++++++++++++++++++++++-------------
2 files changed, 26 insertions(+), 17 deletions(-)
- Log -----------------------------------------------------------------
commit fa2b9489f16aace6d4d6639749ec69d4d5fc0554
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Nov 11 12:13:46 2009 -0500
styling tweaks to make the new nav usable. still not awesome
diff --git a/share/html/Elements/Header b/share/html/Elements/Header
index f363918..3790e62 100755
--- a/share/html/Elements/Header
+++ b/share/html/Elements/Header
@@ -105,18 +105,16 @@
</div>
% if ( Jifty->web->current_user->user_object) {
-
-<& /Elements/CreateTicket &>
-<& /Elements/SimpleSearch &>
+<div id="nav-widgets"><& /Elements/CreateTicket &><& /Elements/SimpleSearch &></div>
%}
<div class="nav">
<div class="main-nav">
% Jifty->web->navigation->render_as_yui_menubar();
</div>
<div class="page-nav">
-</div>
% Jifty->web->page_navigation->render_as_yui_menubar();
</div>
+</div>
%# template login already has div with id "body"
% unless ( Jifty->web->request->path =~ m{^/login} ) {
<div id="body">
diff --git a/share/web/static/css/layout.css b/share/web/static/css/layout.css
index 569dd2b..d526ec0 100644
--- a/share/web/static/css/layout.css
+++ b/share/web/static/css/layout.css
@@ -14,9 +14,11 @@ body {
div#body {
padding: 1em;
padding-top: 1.5em;
- -moz-border-radius: 0.5em;
- -webkit-border-radius: 0.5em;
- margin-left: 10.5em;
+ -moz-border-radius-topright: 0.5em;
+ -moz-border-radius-bottomright: 0.5em;
+ -webkit-border-top-right-radius: 0.5em;
+ -webkit-border-bottom-right-radius: 0.5em;
+ margin-left: em;
margin-top: 5.2em;
margin-right: 1em;
margin-bottom: 0em;
@@ -29,10 +31,10 @@ div#body {
}
-#topactions {
+#nav-widgets {
position: absolute;
background: transparent;
- top: 3.5em;
+ top: 6.5em;
right: 1em;
width: auto;
min-width: 42em;
@@ -40,38 +42,47 @@ div#body {
z-index: 99;
}
-#topactions form * {
+#nav-widgets form * {
vertical-align: top;
}
-#topactions button, #topactions select, #topactions input{
+#nav-widgets button, #nav-widgets select, #nav-widgets input{
padding-top: 0em;
padding-bottom: 0em;
width: 8em;
}
-#topactions form {
+#nav-widgets form {
display: block;
}
-#topactions #CreateTicketInQueue {
+#nav-widgets #CreateTicketInQueue {
text-align: right;
}
-#topactions #simple-search {
+#nav-widgets #simple-search {
float: right;
}
-#topactions #simple-search input.button {
+#nav-widgets #simple-search input.button {
width: 5em;
}
-#topactions #simple-search .field{
+#nav-widgets #simple-search .field{
margin-left: 1em;
}
-div#footer {
+
+.page-nav {
+ padding-top: 0.25em;
+}
+
+.page-nav ul {
+ background: #ddd;
+}
+
+ div#footer {
position: absolute;
right: 0;
text-align: right;
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list