From ad739841082515fdacb61ae6b7abcde1dcd9ce1f Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Sat, 8 Sep 2012 12:17:08 +0100
Subject: [PATCH] RTL improvements (mainly on media manager, FS#2569)
---
lib/tpl/default/_mediamanager.css | 51 ++++++++++++++++++++--
lib/tpl/default/_tabs.css | 13 ++++++
lib/tpl/default/media.css | 11 +++++
lib/tpl/dokuwiki/css/_edit.css | 3 ++
lib/tpl/dokuwiki/css/_media_fullscreen.css | 10 ++++-
5 files changed, 83 insertions(+), 5 deletions(-)
diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css
index 8c605f69a..2ce345e40 100644
--- a/lib/tpl/default/_mediamanager.css
+++ b/lib/tpl/default/_mediamanager.css
@@ -36,6 +36,10 @@
min-height: 20px;
overflow: hidden;
}
+[dir=rtl] #mediamanager__page .panelContent {
+ text-align: right;
+}
+
#mediamanager__page .panelContent {
overflow-y: auto;
@@ -62,6 +66,10 @@
/*____________ Namespaces tree ____________*/
+[dir=rtl] #mediamanager__page .namespaces {
+ text-align: right;
+}
+
#mediamanager__page .namespaces h2 {
font-size: 1em;
display: inline-block;
@@ -78,14 +86,32 @@
*+html #mediamanager__page .namespaces h2 {
display: inline;
}
+[dir=rtl] #mediamanager__page .namespaces h2 {
+ margin-right: 10px;
+}
#mediamanager__page .namespaces ul {
margin-left: .2em;
+ margin-bottom: 0;
+ padding: 0;
list-style: none;
}
+[dir=rtl] #mediamanager__page .namespaces ul {
+ margin-left: 0;
+ margin-right: .2em;
+}
+
#mediamanager__page .namespaces ul ul {
margin-left: 1em;
}
+[dir=rtl] #mediamanager__page .namespaces ul ul {
+ margin-left: 0;
+ margin-right: 1em;
+}
+#mediamanager__page .namespaces ul ul li {
+ margin: 0;
+}
+
#mediamanager__page .namespaces ul .selected {
background-color: __highlight__;
@@ -143,6 +169,9 @@
padding: 0;
margin: 0;
}
+[dir=rtl] #mediamanager__page .filelist ul.tabs {
+ margin-right: 10px;
+}
#mediamanager__page .filelist .panelContent ul li:hover {
background-color: __background_alt__;
@@ -179,6 +208,10 @@
position: relative;
line-height: 1.2;
}
+[dir=rtl] #mediamanager__page .filelist .thumbs li {
+ margin-right: 0;
+ margin-left: 6px;
+}
* html #mediamanager__page .filelist .thumbs li,
*+html #mediamanager__page .filelist .thumbs li {
display: inline;
@@ -201,6 +234,7 @@
#mediamanager__page .filelist .thumbs li .date {
display: block;
overflow: hidden;
+ text-overflow: ellipsis;
width: 90px;
white-space: nowrap;
}
@@ -253,6 +287,7 @@
#mediamanager__page .filelist .rows li .filesize,
#mediamanager__page .filelist .rows li .date {
overflow: hidden;
+ text-overflow: ellipsis;
float: left;
margin-left: 1%;
white-space: nowrap;
@@ -325,6 +360,9 @@
#mediamanager__page form.meta label span {
display: block;
}
+[dir=rtl] #mediamanager__page form.meta label span {
+ text-align: right;
+}
#mediamanager__page form.meta input {
width: 50%;
@@ -373,6 +411,10 @@
vertical-align: top;
text-align: left;
}
+[dir=rtl] #mediamanager__diff td,
+[dir=rtl] #mediamanager__diff th {
+ text-align: right;
+}
#mediamanager__diff th {
font-weight: normal;
@@ -405,10 +447,6 @@
#mediamanager__diff .imageDiff {
position: relative;
}
-#mediamanager__diff .imageDiff .image1,
-#mediamanager__diff .imageDiff .image2 {
- width: 97%;
-}
#mediamanager__diff .imageDiff .image2 {
position: absolute;
top: 0;
@@ -426,7 +464,12 @@
overflow: hidden;
}
+#mediamanager__diff .imageDiff.portions img {
+ float: left;
+}
+
#mediamanager__diff .imageDiff img {
width: 100%;
+ max-width: none;
}
diff --git a/lib/tpl/default/_tabs.css b/lib/tpl/default/_tabs.css
index 8bfb676a0..a39b43441 100644
--- a/lib/tpl/default/_tabs.css
+++ b/lib/tpl/default/_tabs.css
@@ -10,6 +10,9 @@
margin: 0;
list-style: none;
}
+[dir=rtl] .dokuwiki ul.tabs li {
+ float: right;
+}
.dokuwiki ul.tabs li strong,
.dokuwiki ul.tabs li a {
@@ -20,6 +23,16 @@
color: __text__;
border-radius: .5em .5em 0 0;
}
+[dir=rtl] .dokuwiki ul.tabs li strong,
+[dir=rtl] .dokuwiki ul.tabs li a {
+ float: right;
+ margin: 0 0 0 .3em;
+}
+*+html[dir=rtl] .dokuwiki ul.tabs li strong,
+*+html[dir=rtl] .dokuwiki ul.tabs li a {
+ float: none;
+ display: inline-block;
+}
.dokuwiki ul.tabs li strong {
font-weight: normal;
}
diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css
index 37369fe2f..640ad3162 100644
--- a/lib/tpl/default/media.css
+++ b/lib/tpl/default/media.css
@@ -42,18 +42,29 @@
float: left;
padding: 0.5em 0.3em 0 0;
}
+[dir=rtl] #media__tree img {
+ float: right;
+ padding: 0.5em 0 0 0.3em;
+}
#media__tree ul {
list-style-type: none;
list-style-image: none;
margin-left: 1.5em;
}
+[dir=rtl] #media__tree ul {
+ margin-left: 0;
+ margin-right: 1.5em;
+}
#media__tree li {
clear: left;
list-style-type: none;
list-style-image: none;
}
+[dir=rtl] #media__tree li {
+ clear: right;
+}
*+html #media__tree li,
* html #media__tree li {
border: 1px solid __background__;
diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css
index 374ddeb96..e4182774e 100644
--- a/lib/tpl/dokuwiki/css/_edit.css
+++ b/lib/tpl/dokuwiki/css/_edit.css
@@ -26,6 +26,9 @@
#tool__bar {
float: left;
}
+[dir=rtl] #tool__bar {
+ float: right;
+}
/* buttons inside of toolbar */
.dokuwiki div.toolbar button.toolbutton {
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 9f15d7bcb..f795c6d65 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -158,6 +158,10 @@
line-height: 1;
padding-left: 3px;
}
+[dir=rtl] #mediamanager__page .panelHeader ul li {
+ margin-right: 0;
+ margin-left: .5em;
+}
#mediamanager__page .panelHeader ul li.listType {
padding-left: 30px;
@@ -183,7 +187,7 @@
padding: 0;
margin: 0;
}
-[dir=rtl] #mediamanager__page .filelist ul {
+[dir=rtl] #mediamanager__page .filelist ul.tabs {
margin-right: 10px;
}
@@ -222,6 +226,10 @@
position: relative;
line-height: 1.2;
}
+[dir=rtl] #mediamanager__page .filelist .thumbs li {
+ margin-right: 0;
+ margin-left: 6px;
+}
* html #mediamanager__page .filelist .thumbs li,
*+html #mediamanager__page .filelist .thumbs li {
display: inline;
--
GitLab