[Xfce4-commits] <wiki:master> CSS changes for TOC and HEADER

[Mike Massonnet]

Updating branch refs/heads/master
         to d6bfb739142fc28c3afd07ce3601fbf177c7578f (commit)
       from 78d77b24ee628c34ed579d917f508f2350758ad8 (commit)

commit d6bfb739142fc28c3afd07ce3601fbf177c7578f
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Mon Dec 13 08:40:50 2010 +0100

    CSS changes for TOC and HEADER

 lib/tpl/xfce/design.css           |   10 ++++++----
 lib/tpl/xfce/images/bullit.gif    |  Bin 49 -> 821 bytes
 lib/tpl/xfce/images/logosmall.png |  Bin 0 -> 7035 bytes
 lib/tpl/xfce/style.ini            |    1 -
 lib/tpl/xfce/xfce-header.html     |   31 ++++++++++++++++++-------------
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/lib/tpl/xfce/design.css b/lib/tpl/xfce/design.css
index 989c6fd..274f408 100644
--- a/lib/tpl/xfce/design.css
+++ b/lib/tpl/xfce/design.css
@@ -11,7 +11,7 @@
 * { padding: 0; margin: 0; }
 
 body {
-  font: 90% Helvetica, Arial, sans-serif;
+  font: 68.75%/1.4545em Verdana, Helvetica, Arial, sans-serif;
   background-color: __background__;
   color: __text__;
 }
@@ -389,7 +389,7 @@ div.dokuwiki div.plugin_translation span {
 div.dokuwiki div.translation a.action {
   display: block;
   float: right;
-  padding: 0.2em;
+  padding: 0 0.2em;
   margin: 0 0.2em;
   font-weight: bold;
 }
@@ -663,10 +663,12 @@ div.dokuwiki ul.toc {
 
 div.dokuwiki ul.toc li.level1 > div.li span.li {
   font-weight: bold;
-  color: __meta2__;
+  color: __text_alt__;
 }
 div.dokuwiki ul.toc li.level1 > div.li span.li:before {
   content: "\25B6\2002";
+  font-size: 0.73em;
+  vertical-align: top;
 }
 
 div.dokuwiki ul.toc li.level1 > div.li {
@@ -680,7 +682,7 @@ div.dokuwiki ul.toc li.clear {
 
 div.dokuwiki a.toc:link,
 div.dokuwiki a.toc:visited {
-  color: __meta2__;
+  color: __text_alt__;
 }
 
 div.dokuwiki a.toc:hover,
diff --git a/lib/tpl/xfce/images/bullit.gif b/lib/tpl/xfce/images/bullit.gif
index 27c6a7f..accbafa 100644
Binary files a/lib/tpl/xfce/images/bullit.gif and b/lib/tpl/xfce/images/bullit.gif differ
diff --git a/lib/tpl/xfce/images/logosmall.png b/lib/tpl/xfce/images/logosmall.png
new file mode 100644
index 0000000..8b3a50c
Binary files /dev/null and b/lib/tpl/xfce/images/logosmall.png differ
diff --git a/lib/tpl/xfce/style.ini b/lib/tpl/xfce/style.ini
index 319e0b4..8f07366 100644
--- a/lib/tpl/xfce/style.ini
+++ b/lib/tpl/xfce/style.ini
@@ -46,7 +46,6 @@ __background_other__ = "#f7f9fa"
 
 ; these are used for links
 __meta__      = "#505050"
-__meta2__     = "#333"
 __extern__    = "#0C6AD4"
 __existing__  = "#0C6AD4"
 __missing__   = "#f30"
diff --git a/lib/tpl/xfce/xfce-header.html b/lib/tpl/xfce/xfce-header.html
index 8963b91..9b711eb 100644
--- a/lib/tpl/xfce/xfce-header.html
+++ b/lib/tpl/xfce/xfce-header.html
@@ -1,10 +1,12 @@
 <style type="text/css">
 /*<!-- */
 div#xfce-header {
- background-color: #333;
+ background: #333 url(lib/tpl/xfce/images/logosmall.png) no-repeat 6px 55%;
+ padding-left: 120px;
  color: #fff;
 }
 div#xfce-header div#xh-left-box {
+ display: none;
  float: left;
  line-height: 50px;
 }
@@ -16,9 +18,8 @@ div#xfce-header div#xh-left-box h1 {
 }
 div#xfce-header div#xh-right-box {
  float: right;
- line-height: 50px;
- margin-right: 80px;
- padding: 0 0.25em;
+ margin-right: 15px;
+ padding: 0;
 }
 div#xfce-header div#xh-right-box ul {
  list-style: none;
@@ -27,13 +28,16 @@ div#xfce-header div#xh-right-box ul {
  margin: 0; 
 }
 div#xfce-header div#xh-right-box li {
- display: inline;
- padding: 0 0.6em;
+ float: left;
 }
 div#xfce-header div#xh-right-box a {
+ display: block;
+ float: right;
  font-weight: bold;
  color: #fff;
  text-decoration: none;
+ padding: 0 15px;
+ line-height: 4em;
 }
 div#xfce-header div#xh-right-box a.active,
 div#xfce-header div#xh-right-box a:hover {
@@ -47,13 +51,14 @@ div#xfce-header div#xh-right-box a:hover {
   <div id="xh-left-box"><h1>Xfce</h1></div>
   <div id="xh-right-box">
     <ul>
-      <li><a href="http://www.xfce.org/">Home</a></li>
-      <li><a href="http://docs.xfce.org/">Docs</a></li>
-      <li><a href="http://wiki.xfce.org/" class="active">Wiki</a></li>
-      <li><a href="http://forum.xfce.org/">Forum</a></li>
-      <li><a href="http://bugzilla.xfce.org/">Bugs</a></li>
-      <li><a href="http://blog.xfce.org/">Blog</a></li>
-      <li><a href="http://translations.xfce.org/">Translate</a></li>
+      <li><a href="http://www.xfce.org/" title="Go to the homepage">Home</a></li>
+      <li><a href="http://docs.xfce.org/" title="Official documentation">Docs</a></li>
+      <li><a href="http://wiki.xfce.org/" title="Community documentation" class="active">Wiki</a></li>
+      <li><a href="http://forum.xfce.org/" title="Community forums">Forum</a></li>
+      <li><a href="http://bugzilla.xfce.org/" title="Report and track bugs">Bugs</a></li>
+      <li><a href="http://blog.xfce.org/" title="Visit the blog">Blog</a></li>
+      <li><a href="http://translations.xfce.org/" title="Help translating the Xfce project">Translate</a></li>
+      <li><a href="http://git.xfce.org/" title="Project repositories">GIT</a></li>
     </ul>
   </div>
   <div style="clear: both;"></div>