#903460 by Jeff Burnz, munzirtaha: Fixed Bartik tabs broken in IE6, 7 and RTL.

3 files changed, 34 insertions, 14 deletions

diff --git a/themes/bartik/css/ie-rtl.css b/themes/bartik/css/ie-rtl.css
index f88b40a88..997e75755 100644
--- a/themes/bartik/css/ie-rtl.css
+++ b/themes/bartik/css/ie-rtl.css
@@ -26,3 +26,13 @@ ul.action-links li a,
   padding-right: 20px;
   zoom: 1;
 }
+#main-menu ul.links li {
+  margin: 0;
+}
+#main-menu ul.links li,
+#main-menu ul.links li a {
+  display: inline;
+  float: none;
+  margin: 0;
+  zoom: 1;
+}
diff --git a/themes/bartik/css/style-rtl.css b/themes/bartik/css/style-rtl.css
index 1b5124573..15bed6b1a 100644
--- a/themes/bartik/css/style-rtl.css
+++ b/themes/bartik/css/style-rtl.css
@@ -64,6 +64,13 @@ ul.tips {
   padding-right: 20px;
 }
 
+/* --------------- Main Menu ------------ */
+
+#main-menu ul.links li,
+#main-menu ul.links li a {
+  float: right;
+}
+
 /* --------------- Secondary Menu ------------ */
 
 #secondary-menu-links {
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index 51f73d108..6dfb7a798 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -427,7 +427,6 @@ h1#site-name,
 /* --------------- Main Menu ------------ */
 
 #main-menu {
-  padding: 0 15px 3px;
   clear: both;
 }
 #main-menu-links a {
@@ -436,26 +435,35 @@ h1#site-name,
 }
 #main-menu-links {
   font-size: 0.929em;
-  padding: 2px 0;
-  padding: 0;
+  padding: 0 15px;
+}
+#main-menu-links li {
+  float: left; /* LTR */
+  padding: 0 1px;
+  margin: 0 1px;
 }
 #main-menu-links a {
   color: #333;
   background: #ccc;
   background: rgba(255, 255, 255, 0.7);
+  float: left; /* LTR */
+  height: 2.4em;
+  line-height: 2.4em;
+  padding: 0 0.8em;
+  text-decoration: none;
   text-shadow: 0 1px #eee;
   -khtml-border-radius-topleft: 8px;
-  -moz-border-radius-topleft: 8px;
-  -webkit-border-top-left-radius: 8px;
-  border-top-left-radius: 8px;
   -khtml-border-radius-topright: 8px;
+  -moz-border-radius-topleft: 8px;
   -moz-border-radius-topright: 8px;
+  -webkit-border-top-left-radius: 8px;
   -webkit-border-top-right-radius: 8px;
+  border-top-left-radius: 8px;
   border-top-right-radius: 8px;
 }
 #main-menu-links a:hover,
 #main-menu-links a:focus {
-  background: #fff;
+  background: #f6f6f2;
   background: rgba(255, 255, 255, 0.95);
 }
 #main-menu-links a:active {
@@ -465,16 +473,11 @@ h1#site-name,
 #main-menu-links li a.active {
   border-bottom: none;
 }
-.featured #main-menu-links li a.active,
-.featured #main-menu-links li.active-trail a {
+.featured #main-menu-links li a:active,
+.featured #main-menu-links li a.active {
   background: #f0f0f0;
   background: rgba(240, 240, 240, 1.0);
 }
-#main-menu-links li {
-  display: inline;
-  list-style-type: none;
-  padding: 0.6em 0 0.4em;
-}
 
 /* --------------- Secondary Menu ------------ */