diff options
| -rw-r--r-- | themes/xtemplate/xtemplate.css | 31 | ||||
| -rw-r--r-- | themes/xtemplate/xtemplate.xtmpl | 28 |
2 files changed, 28 insertions, 31 deletions
diff --git a/themes/xtemplate/xtemplate.css b/themes/xtemplate/xtemplate.css index 67ee4fe6e..b47057db2 100644 --- a/themes/xtemplate/xtemplate.css +++ b/themes/xtemplate/xtemplate.css @@ -48,33 +48,34 @@ img { .header .menu { background-color: #69c; padding: 5px 5px 0px 5px; + } -.menu logo { +.menu #logo { vertical-align: bottom; float: left; - width: 30%; } -.menu #links { - white-space: nowrap; +.menu #primary { + padding-top: 15px; + position: absolute; text-align: right; - float: right; - color: #9cf; - width: 60%; -} -.menu #links #primary { font-size: 1.1em; + color: #9cf; + left: 225px; } -.menu #links #primary a { - color: #fff; +.menu #primary a { font-weight: bold; + color: #fff; } -.menu #links #secondary { +.menu #secondary { + position: absolute; + text-align: right; font-size: 0.9em; - margin-bottom: 12px; -} -.menu #links #secondary a { color: #9cf; + left: 225px; +} +.menu #secondary a { font-weight: bold; + color: #9cf; } #secondary form { display: inline; diff --git a/themes/xtemplate/xtemplate.xtmpl b/themes/xtemplate/xtemplate.xtmpl index 1f309df28..a674804b1 100644 --- a/themes/xtemplate/xtemplate.xtmpl +++ b/themes/xtemplate/xtemplate.xtmpl @@ -1,10 +1,12 @@ <!-- BEGIN: header --> +<?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> <title>{title}</title> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <base href="{base}" /> <style type="text/css" media="all"> @import "themes/xtemplate/xtemplate.css"; @@ -18,26 +20,20 @@ <tr> <td colspan="2" class="menu"> - <span id="links"> - <div id="secondary"> - {secondary_links} - <!-- BEGIN: search_box --> - <form action="{search_url}" method="post"> - <input class="keys" type="text" size="50" value="" name="keys" /> - <input type="submit" value="{search_button_text}" /> - </form> - <!-- END: search_box --> - </div> - <div id="primary">{primary_links}</div> - </span> - <span id="logo"> - <a href="./"><img src="themes/xtemplate/images/druplicon.gif" alt="" /></a> - </span> + <span id="logo"><a href="./"><img src="themes/xtemplate/images/druplicon.gif" alt="" /></a></span> + <span id="secondary">{secondary_links}</span><br /> + <!-- BEGIN: search_box --> + <form action="{search_url}" method="post"> + <input class="keys" type="text" size="50" value="" name="keys" /> + <input type="submit" value="{search_button_text}" /> + </form> + <!-- END: search_box --> + <span id="primary">{primary_links}</span> </td> </tr> <tr> - <td valign="top" width="100%"> + <td valign="top"> <!-- BEGIN: message --> <div id="message">{header_message}</div> <!-- END: message --> |