summaryrefslogtreecommitdiff
path: root/django/contrib
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2023-03-24 20:47:34 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-03-24 20:49:05 +0100
commitded3334af6de74214ba3f985e68749e3c47ffd16 (patch)
treeab8a4a055de96949bd1db47e58ec3cf4e42c1505 /django/contrib
parent870067e5789889d9fa18617d871e24fc2b6c19ec (diff)
[4.2.x] Refs #34316 -- Fixed layout of admin password change forms and help texts for RTL languages.
Regression in 96a598356a9ea8c2c05b22cadc12e256a3b295fd. Follow up to e67804668115fd388e7554c6a809bd409f70adfe and 39d1e45227e060746ed461fddde80fa2b6cf0dcd. Backport of f5c5c571d3b87a78d005ea6f21959388d1747696 from main
Diffstat (limited to 'django/contrib')
-rw-r--r--django/contrib/admin/static/admin/css/responsive_rtl.css3
-rw-r--r--django/contrib/admin/static/admin/css/rtl.css16
2 files changed, 18 insertions, 1 deletions
diff --git a/django/contrib/admin/static/admin/css/responsive_rtl.css b/django/contrib/admin/static/admin/css/responsive_rtl.css
index 66d3c2f9b3..639e20b2d1 100644
--- a/django/contrib/admin/static/admin/css/responsive_rtl.css
+++ b/django/contrib/admin/static/admin/css/responsive_rtl.css
@@ -69,7 +69,8 @@
margin-right: 15px;
}
- [dir="rtl"] .aligned ul {
+ [dir="rtl"] .aligned ul,
+ [dir="rtl"] form .aligned ul.errorlist {
margin-right: 0;
}
diff --git a/django/contrib/admin/static/admin/css/rtl.css b/django/contrib/admin/static/admin/css/rtl.css
index 5877e71330..08989b54e2 100644
--- a/django/contrib/admin/static/admin/css/rtl.css
+++ b/django/contrib/admin/static/admin/css/rtl.css
@@ -128,7 +128,9 @@ thead th.sorted .text {
form .aligned ul {
margin-right: 163px;
+ padding-right: 10px;
margin-left: 0;
+ padding-left: 0;
}
form ul.inline li {
@@ -143,12 +145,26 @@ form .aligned div.help {
padding-right: 10px;
}
+form div.help ul,
form .aligned .checkbox-row + .help,
form .aligned p.datetime div.help.timezonewarning {
margin-right: 0;
padding-right: 0;
}
+form .wide p.help, form .wide div.help {
+ padding-left: 0;
+ padding-right: 50px;
+}
+
+form .wide p,
+form .wide ul.errorlist,
+form .wide input + p.help,
+form .wide input + div.help {
+ margin-right: 200px;
+ margin-left: 0px;
+}
+
.submit-row {
text-align: right;
}