Jeremy Newman : fix postioning of logo and tabs

Mon Oct 18 10:36:11 CDT 2010

Module: website
Branch: master
Commit: be17aa3e2940be4ba6299f85c9dbcf1ed2084e0f
URL:    http://source.winehq.org/git/website.git/?a=commit;h=be17aa3e2940be4ba6299f85c9dbcf1ed2084e0f

Author: Jeremy Newman <jnewman at codeweavers.com>
Date:   Mon Oct 18 10:35:33 2010 -0500

fix postioning of logo and tabs

---

 styles-rtl.css                                     |   19 ++++++-------------
 templates/he/global/themes/winehq/content.template |    7 ++++---
 .../he/global/themes/winehq/content_nobox.template |    9 +++++----
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/styles-rtl.css b/styles-rtl.css
index 2ffef44..c7e158b 100644
--- a/styles-rtl.css
+++ b/styles-rtl.css
@@ -1,4 +1,3 @@
- at import ("styles.css"); 
 /* Body Document Defaults */
 BODY                {
                      direction: rtl;
@@ -7,15 +6,10 @@ BODY                {
                     }
 
 /* wine logo image */
-#logo_glass_big     {
-                     right: 0px;
-                    }
-#logo_glass         {
-                     right: 50px;
-                    }
-#logo_text          {
-                     right: 110px;
-                    }
+#logo_glass_big.pos_rtl { right: 0px; }
+#logo_glass.pos_rtl     { right: 50px; }
+#logo_text.pos_rtl      { right: 110px; }
+
 #logo_blurb         {
                      right: 130px;
                     }
@@ -23,12 +17,11 @@ BODY                {
 /* search box */
 #search_box         {
                      text-align: left;
+                     left: 20px;
                     }
 
 /* top tabs */
-#tabs               {
-                     left: 10px;
-                    }
+#tabs.pos_rtl      { left: 10px; }
 #tabs LI            {
                      float: right;
                     }
diff --git a/templates/he/global/themes/winehq/content.template b/templates/he/global/themes/winehq/content.template
index f9bc80d..9ff5591 100644
--- a/templates/he/global/themes/winehq/content.template
+++ b/templates/he/global/themes/winehq/content.template
@@ -11,6 +11,7 @@
     <meta name="copyright" content="זכויות יוצרים {$curtime_year}. WineHQ.org כל הזכויות שמורות.">
     <meta name="language" content="Hebrew">
     <meta name="revisit-after" content="1">
+    <link rel="stylesheet" href="{$root}/styles.css" type="text/css" media="screen">
     <link rel="stylesheet" href="{$root}/styles-rtl.css" type="text/css" media="screen">
     <script language="JavaScript" type="text/javascript">
         var web_root="{$root}";
@@ -24,8 +25,8 @@
 <body>
 
 
-<div id="logo_glass"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass_sm_rtl.png" alt=""></a></div>
-<div id="logo_text"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div>
+<div id="logo_glass" class="pos_rtl"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass_sm_rtl.png" alt=""></a></div>
+<div id="logo_text" class="pos_rtl"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div>
 
 
 <div id="logo_blurb">{$page_blurb}</div>
@@ -42,7 +43,7 @@
 </div>
 
 
-<div id="tabs">
+<div id="tabs" class="pos_rtl">
     <ul>
         <li class="s"><a href="{$base_url}">WineHQ</a></li>
         <li><a href="http://wiki.winehq.org/">ויקי</a></li>
diff --git a/templates/he/global/themes/winehq/content_nobox.template b/templates/he/global/themes/winehq/content_nobox.template
index 39dd549..e723bb9 100644
--- a/templates/he/global/themes/winehq/content_nobox.template
+++ b/templates/he/global/themes/winehq/content_nobox.template
@@ -11,6 +11,7 @@
     <meta name="copyright" content="זכויות יוצרים {$curtime_year}. WineHQ.org כל הזכויות שמורות.">
     <meta name="language" content="Hebrew">
     <meta name="revisit-after" content="1">
+    <link rel="stylesheet" href="{$root}/styles.css" type="text/css" media="screen">
     <link rel="stylesheet" href="{$root}/styles-rtl.css" type="text/css" media="screen">
     <script language="JavaScript" type="text/javascript">
         var web_root="{$root}";
@@ -24,8 +25,8 @@
 <body>
 
 
-<div id="logo_glass_big"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass_rtl.png" alt=""></a></div>
-<div id="logo_text"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div>
+<div id="logo_glass_big" class="pos_rtl"><a href="{$root}/"><img src="{$root}/images/winehq_logo_glass_rtl.png" alt=""></a></div>
+<div id="logo_text" class="pos_rtl"><a href="{$root}/"><img src="{$root}/images/winehq_logo_text.png" alt="WineHQ" title="WineHQ"></a></div>
 
 
 <div id="logo_blurb">{$page_blurb}</div>
@@ -42,10 +43,10 @@
 </div>
 
 
-<div id="tabs">
+<div id="tabs" class="pos_rtl">
     <ul>
         <li class="s"><a href="{$base_url}">WineHQ</a></li>
-        <li><a href="http://wiki.winehq.org">ויקי</a></li>
+        <li><a href="http://wiki.winehq.org/">ויקי</a></li>
         <li><a href="http://appdb.winehq.org/">AppDB</a></li>
         <li><a href="http://bugs.winehq.org/">באגזילה</a></li>
         <li><a href="http://forums.winehq.org/">פורומים</a></li>


