diff --git a/django/contrib/admin/static/admin/css/rtl.css b/django/contrib/admin/static/admin/css/rtl.css index f484d5527597..713f9f4188f3 100644 --- a/django/contrib/admin/static/admin/css/rtl.css +++ b/django/contrib/admin/static/admin/css/rtl.css @@ -242,18 +242,10 @@ fieldset .fieldBox { background-position: 0 -168px; } -.selector-chooseall { - background: url(../img/selector-icons.svg) right -128px no-repeat; -} - :enabled.selector-chooseall:focus, :enabled.selector-chooseall:hover { background-position: 100% -144px; } -.selector-clearall { - background: url(../img/selector-icons.svg) 0 -160px no-repeat; -} - :enabled.selector-clearall:focus, :enabled.selector-clearall:hover { background-position: 0 -176px; } diff --git a/django/contrib/admin/static/admin/css/widgets.css b/django/contrib/admin/static/admin/css/widgets.css index 538af2eb069d..6a6182125405 100644 --- a/django/contrib/admin/static/admin/css/widgets.css +++ b/django/contrib/admin/static/admin/css/widgets.css @@ -162,21 +162,21 @@ .selector-chooseall, .selector-clearall { display: inline-block; - height: 16px; text-align: left; + padding: 4px 5px; margin: 0 auto; overflow: hidden; - font-weight: bold; - line-height: 16px; - color: var(--body-quiet-color); + color: var(--button-fg); + background-color: var(--button-bg); text-decoration: none; opacity: 0.55; border: none; + border-radius: 4px; } :enabled.selector-chooseall:focus, :enabled.selector-clearall:focus, :enabled.selector-chooseall:hover, :enabled.selector-clearall:hover { - color: var(--link-fg); + background-color: var(--button-hover-bg); } :enabled.selector-chooseall, :enabled.selector-clearall { @@ -187,22 +187,10 @@ cursor: pointer; } -.selector-chooseall { - padding: 0 18px 0 0; - background: url(../img/selector-icons.svg) right -160px no-repeat; - cursor: default; -} - :enabled.selector-chooseall:focus, :enabled.selector-chooseall:hover { background-position: 100% -176px; } -.selector-clearall { - padding: 0 0 0 18px; - background: url(../img/selector-icons.svg) 0 -128px no-repeat; - cursor: default; -} - :enabled.selector-clearall:focus, :enabled.selector-clearall:hover { background-position: 0 -144px; } diff --git a/django/contrib/admin/static/admin/img/selector-icons.svg b/django/contrib/admin/static/admin/img/selector-icons.svg index 6ed1d55864a6..a953b29b8c95 100644 --- a/django/contrib/admin/static/admin/img/selector-icons.svg +++ b/django/contrib/admin/static/admin/img/selector-icons.svg @@ -1,4 +1,4 @@ - + @@ -33,22 +33,6 @@ --> - - - - - - - - @@ -58,8 +42,4 @@ - - - - diff --git a/docs/ref/models/constraints.txt b/docs/ref/models/constraints.txt index f7549c025277..eefe7418056b 100644 --- a/docs/ref/models/constraints.txt +++ b/docs/ref/models/constraints.txt @@ -26,8 +26,9 @@ option. (including ``name``) each time. To work around name collisions, part of the name may contain ``'%(app_label)s'`` and ``'%(class)s'``, which are replaced, respectively, by the lowercased app label and class name of the - concrete model. For example ``CheckConstraint(condition=Q(age__gte=18), - name='%(app_label)s_%(class)s_is_adult')``. + concrete model. For example:: + + CheckConstraint(condition=Q(age__gte=18), name="%(app_label)s_%(class)s_is_adult") .. admonition:: Validation of Constraints @@ -99,7 +100,10 @@ This method must be implemented by a subclass. A :class:`Q` object or boolean :class:`~django.db.models.Expression` that specifies the conditional check you want the constraint to enforce. -For example, ``CheckConstraint(condition=Q(age__gte=18), name='age_gte_18')`` +For example:: + + CheckConstraint(condition=Q(age__gte=18), name="age_gte_18") + ensures the age field is never less than 18. .. admonition:: Expression order @@ -156,9 +160,11 @@ Functional unique constraints have the same database restrictions as A list of field names that specifies the unique set of columns you want the constraint to enforce. -For example, ``UniqueConstraint(fields=['room', 'date'], -name='unique_booking')`` ensures each room can only be booked once for each -date. +For example:: + + UniqueConstraint(fields=["room", "date"], name="unique_booking") + +ensures each room can only be booked once for each date. ``condition`` -------------