better menuish stuff

darcs-hash:20080520205152-84dde-4261d3d07e172a365e383f75c646d46cdbfaeecb.gz

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 2977c3cb1b1bb1d22dd92ca3c13834c572b33c84..615a5cbae0e86116cc21b1bc73da2c5c85d9f881 100644 (file)
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -50,7 +50,7 @@ class SettingsAction extends Action {
        }
 
        function settings_menu() {
-               common_element_start('ul', 'headmenu');
+               common_element_start('ul', 'settingsmenu menuish');
                common_menu_item(common_local_url('profilesettings'),
                                                 _t('Profile'));
                common_menu_item(common_local_url('avatar'),

diff --git a/lib/util.php b/lib/util.php
index 72c9652b9ab969c370ac79dac84f1cf93f415e27..4fef45ec147e6b60dde3e1a373d727a4bdeba3c1 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -175,7 +175,7 @@ function common_head_menu() {
 }
 
 function common_foot_menu() {
-       common_element_start('ul', 'footmenu');
+       common_element_start('ul', 'footmenu menuish');
        common_menu_item(common_local_url('doc', array('title' => 'about')),
                                         _t('About'));
        common_menu_item(common_local_url('doc', array('title' => 'help')),

diff --git a/theme/default/style/layout.css b/theme/default/style/layout.css
index 396ac750d086e6506f5bcdb01953b53e72027e9d..f35d4ae9727dc9230ecee5cc958926dd49806f35 100644 (file)
--- a/theme/default/style/layout.css
+++ b/theme/default/style/layout.css
@@ -1,12 +1,10 @@
 /**************************************************************\r
    AUTHOR:  Pat Heard (fullahead.org)\r
-   DATE:    2006.09.12 \r
+   DATE:    2006.09.12\r
    PURPOSE: Controls the layout of the site and styles\r
             the menus\r
  **************************************************************/\r
 \r
-\r
-\r
 /**************************************************************\r
    #wrapper & #content: wrapper positions and sets the width\r
    on the content.  The background is then applied to #content.\r
@@ -16,36 +14,31 @@
   width: 589px;\r
   height: 100%;\r
   margin: 0 auto;\r
-  \r
+\r
   text-align: left;\r
 }\r
 \r
-\r
-#content { \r
+#content {\r
   float: left;\r
   width: 589px;\r
   height: 100%;\r
-  min-height: 100%; \r
-  \r
+  min-height: 100%;\r
+\r
   background: url(../image/content.gif) repeat-y top center;\r
 }\r
 \r
-\r
 #content[id] {\r
-  height: auto;  \r
+  height: auto;\r
   background: url(../image/content.png) repeat-y top center;\r
 }\r
 \r
-\r
-\r
-\r
 /**************************************************************\r
    #header: Holds the site title and header images\r
  **************************************************************/\r
 \r
 #header {\r
-  padding: 60px 0 2em 49px;  \r
-  background: url(../image/header.jpg) no-repeat top center;  \r
+  padding: 60px 0 2em 49px;\r
+  background: url(../image/header.jpg) no-repeat top center;\r
 }\r
 \r
 /* Forces IE to set the hasLayout flag and show the header at the height of its contents \*/\r
@@ -54,11 +47,10 @@
 }\r
 /* End hide from IE-mac */\r
 \r
-\r
 #header h1,\r
 #header h2 {\r
   margin: 0;\r
-  padding: 0;  \r
+  padding: 0;\r
   background: none;\r
 }\r
 \r
@@ -69,18 +61,15 @@
   color: #6E310B;\r
 }\r
 \r
-\r
-\r
-\r
 /**************************************************************\r
    #menu: The top level site menu\r
  **************************************************************/\r
 \r
 ul#menu {\r
   width: 491px;\r
-  margin: 0 auto;  \r
+  margin: 0 auto;\r
   padding: 0 !important;\r
-  padding: 0 0 0 10px;  \r
+  padding: 0 0 0 10px;\r
 }\r
 \r
 ul#menu li {\r
@@ -91,13 +80,13 @@ ul#menu li {
 }\r
 \r
 ul#menu li a {\r
-  float: left;  \r
+  float: left;\r
   padding: 15px 0 5px 0;\r
 \r
   font: 400 1.54em georgia, serif;\r
   text-align: center;\r
   text-decoration: none;\r
-  \r
+\r
   color: #61804E;\r
   border-bottom: 1px solid #D3F1B6;\r
 }\r
@@ -137,17 +126,14 @@ ul.five li a {
    #page: Holds the main page content.\r
  **************************************************************/\r
 \r
-#page {  \r
+#page {\r
   float: left;\r
-  clear: both;   \r
+  clear: both;\r
   width: 491px !important;\r
   width: 100%;\r
-  \r
-  padding: 2em 49px;  \r
-}\r
-\r
-\r
 \r
+  padding: 2em 49px;\r
+}\r
 \r
 /**************************************************************\r
    .footer: Site footer\r
@@ -159,9 +145,6 @@ ul.five li a {
   clear: both;\r
 }\r
 \r
-\r
-\r
-\r
 /**************************************************************\r
    .bigLinks: Large, clickable links\r
  **************************************************************/\r
@@ -170,7 +153,7 @@ ul.bigLinks {
   margin: 10px 0;\r
   padding: 0;\r
   list-style: none;\r
-  \r
+\r
 }\r
 \r
 ul.bigLinks li {\r
@@ -181,7 +164,7 @@ ul.bigLinks li {
 }\r
 \r
 ul.bigLinks li a,\r
-ul.bigLinks li a:visited {  \r
+ul.bigLinks li a:visited {\r
   display: block;\r
 \r
   margin: 10px 0;\r
@@ -189,7 +172,7 @@ ul.bigLinks li a:visited {
 \r
   text-decoration: none;\r
   background-color: #FFF;\r
-  border: 0;  \r
+  border: 0;\r
 }\r
 \r
 ul.bigLinks li a:hover {\r
@@ -199,7 +182,7 @@ ul.bigLinks li a:hover {
 }\r
 \r
 ul.bigLinks li a span.title {\r
-  color: #5E9040;  \r
+  color: #5E9040;\r
   border-bottom: 1px solid #B8E78B;\r
 }\r
 \r
@@ -217,8 +200,6 @@ ul.bigLinks li a:hover span.desc {
   color: #555;\r
 }\r
 \r
-\r
-\r
 /**************************************************************\r
    Width classes used by the site columns\r
  **************************************************************/\r
@@ -247,8 +228,6 @@ ul.bigLinks li a:hover span.desc {
   width: 23%;\r
 }\r
 \r
-\r
-\r
 /**************************************************************\r
    Alignment classes\r
  **************************************************************/\r
@@ -269,8 +248,6 @@ ul.bigLinks li a:hover span.desc {
   text-align: right;\r
 }\r
 \r
-\r
-\r
 /**************************************************************\r
    Generic display classes\r
  **************************************************************/\r
@@ -284,11 +261,11 @@ ul.bigLinks li a:hover span.desc {
 }\r
 \r
 .big {\r
-  font-size: 1.3em;  \r
+  font-size: 1.3em;\r
 }\r
 \r
 .small {\r
-  font-size: 0.85em;  \r
+  font-size: 0.85em;\r
 }\r
 \r
 .bold {\r
@@ -311,7 +288,6 @@ ul.bigLinks li a:hover span.desc {
   color: #512103;\r
 }\r
 \r
-\r
 .greenBg {\r
   padding: 0 10px;\r
   background-color: #F1FFE3;\r
@@ -324,7 +300,7 @@ ul.bigLinks li a:hover span.desc {
   border-top: 1px solid #BDEDDE;\r
 }\r
 \r
-\r
-\r
-\r
-\r
+ul.menuish {\r
+  display: inline;\r
+  list-style: none;\r
+}
\ No newline at end of file