moved the mobile part of the rtl styles (including @media) into mobile.css

2 files changed, 46 insertions, 64 deletions

diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index b923c811c..6aacb4674 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -27,6 +27,11 @@
     margin-left: 0;
 }
 
+[dir=rtl] .hasSidebar #dokuwiki__content,
+[dir=rtl] .hasSidebar #dokuwiki__content > .pad {
+    margin-right: 0;
+}
+
 /* toc */
 .dokuwiki div.toc {
     float: none;
@@ -35,6 +40,11 @@
     border-left-width: 0;
     border-bottom: 1px solid __border__;
 }
+[dir=rtl] .dokuwiki div.toc {
+    float: none;
+    margin: 0 0 1em 0;
+    border-right-width: 0;
+}
 .dokuwiki div.tocheader {
     padding: 0 0 .5em;
 }
@@ -68,6 +78,9 @@
 .dokuwiki form.changes ul {
     padding-left: 0;
 }
+[dir=rtl] .dokuwiki form.changes ul {
+    padding-right: 0;
+}
 
 
 } /* /@media */
@@ -102,10 +115,19 @@
     padding-left: 0;
     margin: 0;
 }
+[dir=rtl] #dokuwiki__header ul.a11y.skip {
+    left: auto !important;
+    right: 0 !important;
+    float: left;
+    padding-right: 0;
+}
 #dokuwiki__header ul.a11y.skip li {
     margin-left: .35em;
     display: inline;
 }
+[dir=rtl] #dokuwiki__header ul.a11y.skip li {
+    margin: 0 .35em 0 0;
+}
 
 #dokuwiki__header .headings,
 #dokuwiki__header .tools {
@@ -114,9 +136,18 @@
     width: auto;
     margin-bottom: .5em;
 }
+[dir=rtl] #dokuwiki__header .headings,
+[dir=rtl] #dokuwiki__header .tools {
+    float: none;
+    text-align: right;
+    width: auto;
+}
 #dokuwiki__sitetools {
     text-align: left;
 }
+[dir=rtl] #dokuwiki__sitetools {
+    text-align: right;
+}
 #dokuwiki__usertools,
 #dokuwiki__sitetools ul,
 #dokuwiki__sitetools h3,
@@ -132,6 +163,11 @@
     margin: 0 .2em .2em 0;
     width: 49%;
 }
+[dir=rtl] #dokuwiki__sitetools form.search {
+    float: right;
+    margin: 0 0 .2em .2em;
+}
+
 #dokuwiki__sitetools form.search input.edit {
     width: 100% !important;
 }
@@ -147,6 +183,9 @@
     float: right;
     width: 49%;
 }
+[dir=rtl] #dokuwiki__header .mobileTools {
+    float: left;
+}
 #dokuwiki__header .mobileTools select {
     padding: .3em .1em;
     width: 100% !important;
@@ -177,6 +216,9 @@
 .dokuwiki label.block {
     text-align: left;
 }
+[dir=rtl] .dokuwiki label.block {
+    text-align: right;
+}
 .dokuwiki label.block span {
     display: block;
 }
diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css
index f36591548..2a8336b7f 100644
--- a/lib/tpl/dokuwiki/css/rtl.css
+++ b/lib/tpl/dokuwiki/css/rtl.css
@@ -255,6 +255,10 @@
     float: left;
     text-align: left;
 }
+[dir=rtl] #dokuwiki__header .tools li {
+    margin-right: 1em;
+    margin-left: 0;
+}
 
 [dir=rtl] #dokuwiki__aside {
     float: right;
@@ -525,67 +529,3 @@
 [dir=rtl] .JSpopup ol {
     padding-right: 0;
 }
-
-
-/*____________ mobile ____________*/
-
-@media only screen and (max-width: 768px), only screen and (max-device-width: 960px) {
-
-
-[dir=rtl] .hasSidebar #dokuwiki__content,
-[dir=rtl] .hasSidebar #dokuwiki__content > .pad {
-    margin-right: 0;
-}
-
-[dir=rtl] .dokuwiki div.toc {
-    float: none;
-    margin: 0 0 1em 0;
-    border-right-width: 0;
-}
-
-[dir=rtl] .dokuwiki form.changes ul {
-    padding-right: 0;
-}
-
-
-} /* /@media */
-
-@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) {
-
-
-[dir=rtl] #dokuwiki__header ul.a11y.skip {
-    left: auto !important;
-    right: 0 !important;
-    float: left;
-    padding-right: 0;
-}
-[dir=rtl] #dokuwiki__header ul.a11y.skip li {
-    margin: 0 .35em 0 0;
-}
-
-[dir=rtl] #dokuwiki__header .headings,
-[dir=rtl] #dokuwiki__header .tools {
-    float: none;
-    text-align: right;
-    width: auto;
-}
-[dir=rtl] #dokuwiki__sitetools {
-    text-align: right;
-}
-
-[dir=rtl] #dokuwiki__sitetools form.search {
-    float: right;
-    margin: 0 0 .2em .2em;
-}
-
-[dir=rtl] #dokuwiki__header .mobileTools {
-    float: left;
-}
-
-[dir=rtl] .dokuwiki label.block {
-    text-align: right;
-}
-
-
-
-} /* /@media */