Skip to content

Commit 2117573

Browse files
committed
Update style for Django 6.0.
1 parent d45c09e commit 2117573

File tree

8 files changed

+107
-46
lines changed

8 files changed

+107
-46
lines changed

admin_interface/static/admin_interface/css/admin-interface.css

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,19 @@
260260
color: var(--admin-interface-generic-link-hover-color);
261261
}
262262

263+
.admin-interface .selector button.selector-chooseall,
264+
.admin-interface .selector button.selector-clearall {
265+
background-color: var(--admin-interface-generic-link-color);
266+
padding: 8px 12px;
267+
}
268+
269+
.admin-interface .selector button.selector-chooseall:focus,
270+
.admin-interface .selector button.selector-chooseall:hover,
271+
.admin-interface .selector button.selector-clearall:focus,
272+
.admin-interface .selector button.selector-clearall:hover {
273+
background-color: var(--admin-interface-generic-link-hover-color);
274+
}
275+
263276
/* fix #393 */
264277
.admin-interface .selector-chosen .list-footer-display {
265278
background: var(--admin-interface-module-background-color);
@@ -348,39 +361,41 @@
348361
color: var(--admin-interface-delete-button-text-color);
349362
}
350363

351-
.admin-interface .paginator a,
352-
.admin-interface .paginator a:link,
353-
.admin-interface .paginator a:visited,
354-
.admin-interface .paginator .this-page {
364+
.admin-interface #changelist .changelist-footer .paginator a,
365+
.admin-interface #changelist .changelist-footer .paginator a:link,
366+
.admin-interface #changelist .changelist-footer .paginator a:visited,
367+
.admin-interface #changelist .changelist-footer .paginator a[aria-current="page"],
368+
.admin-interface #changelist .changelist-footer .paginator .this-page {
355369
border-radius: var(--admin-interface-module-border-radius);
356370
}
357371

358-
.admin-interface .paginator a,
359-
.admin-interface .paginator a:link,
360-
.admin-interface .paginator a:visited {
372+
.admin-interface #changelist .changelist-footer .paginator a,
373+
.admin-interface #changelist .changelist-footer .paginator a:link,
374+
.admin-interface #changelist .changelist-footer .paginator a:visited {
361375
background-color: #FFFFFF;
362376
color: var(--admin-interface-generic-link-color);
363377
}
364378

365-
.admin-interface .paginator a:hover,
366-
.admin-interface .paginator a:active {
379+
.admin-interface #changelist .changelist-footer .paginator a:hover,
380+
.admin-interface #changelist .changelist-footer .paginator a:active {
367381
background-color: #F8F8F8;
368382
color: var(--admin-interface-generic-link-hover-color);
369383
}
370384

371-
.admin-interface .paginator .this-page {
385+
.admin-interface #changelist .changelist-footer .paginator a[aria-current="page"],
386+
.admin-interface #changelist .changelist-footer .paginator .this-page {
372387
background-color: var(--admin-interface-module-background-color);
373388
color: var(--admin-interface-module-link-color);
374389
}
375390

376-
.admin-interface .paginator a.showall,
377-
.admin-interface .paginator a.showall:link,
378-
.admin-interface .paginator a.showall:visited {
391+
.admin-interface #changelist .changelist-footer .paginator a.showall,
392+
.admin-interface #changelist .changelist-footer .paginator a.showall:link,
393+
.admin-interface #changelist .changelist-footer .paginator a.showall:visited {
379394
color: var(--admin-interface-generic-link-color);
380395
}
381396

382-
.admin-interface .paginator a.showall:hover,
383-
.admin-interface .paginator a.showall:active {
397+
.admin-interface #changelist .changelist-footer .paginator a.showall:hover,
398+
.admin-interface #changelist .changelist-footer .paginator a.showall:active {
384399
color: var(--admin-interface-generic-link-hover-color);
385400
}
386401

admin_interface/static/admin_interface/css/change-form.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
.admin-interface .submit-row {
2+
width: 100%;
3+
box-sizing: border-box;
4+
}
5+
16
/* fix form submit buttons alignemnt and ordering */
27
@media (min-width: 768px) {
38
.admin-interface .submit-row {

admin_interface/static/admin_interface/css/inlines.css

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010

1111
.admin-interface .inline-group .inlinechangelink {
1212
margin-left: 10px;
13-
}
14-
15-
.admin-interface .inline-group .inline-related.tabular .inlinechangelink {
16-
background-size: contain;
13+
font-size: 11px;
14+
padding-left: 18px;
1715
}
1816
/* end fix */
1917

@@ -61,6 +59,10 @@
6159
text-align: right;
6260
}
6361

62+
.admin-interface .inline-group .tabular tr td.original p {
63+
font-size: 11px;
64+
}
65+
6466
.admin-interface .inline-group .tabular tr td {
6567
vertical-align: top;
6668
}

admin_interface/static/admin_interface/css/modules.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
.admin-interface .module {
2+
width: 100%;
3+
box-sizing: border-box;
4+
}
5+
16
/* begin fix lateral padding to align text with field labels */
27
.admin-interface .module h2,
38
.admin-interface.dashboard .module caption,

admin_interface/static/admin_interface/css/object-tools.css

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,34 @@
11
/* top-right buttons color on hover -> just a lighten grey */
2+
@media (min-width:768px) {
3+
.admin-interface .object-tools {
4+
margin-top: -45px;
5+
width: 55%;
6+
float: right;
7+
display: flex;
8+
justify-content: flex-end;
9+
align-items: center;
10+
flex-wrap: wrap;
11+
}
12+
}
13+
@media (min-width:1024px) {
14+
.admin-interface .object-tools {
15+
width: 60%;
16+
}
17+
}
18+
@media (min-width:1280px) {
19+
.admin-interface .object-tools {
20+
width: 70%;
21+
}
22+
}
23+
.admin-interface .object-tools li {
24+
margin-bottom: 4px;
25+
}
26+
.admin-interface .object-tools li + li {
27+
margin-left: 6px;
28+
}
229
.admin-interface .object-tools a {
330
color: #FFFFFF;
31+
white-space: nowrap;
432
}
533
.admin-interface .object-tools a:focus,
634
.admin-interface .object-tools a:hover,
Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,24 @@
1-
.admin-interface #changelist .paginator {
1+
.admin-interface #changelist .changelist-footer .paginator {
22
margin-top: -1px; /* merge 2 borders into 1 */
33
line-height: 1.5em;
4-
padding-top: 12px;
5-
padding-bottom: 12px;
64
}
75

8-
.admin-interface .paginator a,
9-
.admin-interface .paginator a:link,
10-
.admin-interface .paginator a:visited,
11-
.admin-interface .paginator .this-page {
6+
.admin-interface #changelist .changelist-footer .paginator a,
7+
.admin-interface #changelist .changelist-footer .paginator a:link,
8+
.admin-interface #changelist .changelist-footer .paginator a:visited,
9+
.admin-interface #changelist .changelist-footer .paginator a[aria-current="page"],
10+
.admin-interface #changelist .changelist-footer .paginator .this-page {
1211
padding: 7px 12px;
1312
}
1413

15-
.admin-interface .paginator a,
16-
.admin-interface .paginator .this-page {
14+
.admin-interface #changelist .changelist-footer .paginator a,
15+
.admin-interface #changelist .changelist-footer .paginator a[aria-current="page"],
16+
.admin-interface #changelist .changelist-footer .paginator .this-page {
1717
margin-left: 0px;
1818
}
1919

20-
.admin-interface .paginator .this-page,
21-
.admin-interface .paginator a.end {
22-
margin-right: 25px;
23-
}
24-
25-
.admin-interface .paginator .this-page + a:not(.showall) {
26-
margin-left: -25px;
27-
}
28-
29-
body.admin-interface .paginator a.showall,
30-
body.admin-interface .paginator a.showall:link,
31-
body.admin-interface .paginator a.showall:visited {
20+
body.admin-interface #changelist .changelist-footer .paginator a.showall,
21+
body.admin-interface #changelist .changelist-footer .paginator a.showall:link,
22+
body.admin-interface #changelist .changelist-footer .paginator a.showall:visited {
3223
margin-left: 20px;
3324
}

admin_interface/static/admin_interface/css/sticky-form-controls.css

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
/* sticky actions */
22

33
.admin-interface.sticky-actions #changelist .actions {
4-
width: 100%;
4+
display: flex;
5+
align-items: center;
6+
width: auto;
57
background: var(--body-bg);
68
border-top: none;
79
border-bottom: 1px solid #EEEEEE;
@@ -20,7 +22,7 @@
2022
padding-bottom: 4.375rem;
2123
}
2224

23-
.admin-interface.sticky-pagination.change-list .paginator {
25+
.admin-interface.sticky-pagination.change-list #changelist .changelist-footer {
2426
width: 100%;
2527
position: fixed;
2628
bottom: 0;
@@ -31,33 +33,34 @@
3133
padding-right: 15px;
3234
white-space: nowrap;
3335
text-overflow: ellipsis;
36+
background: var(--body-bg);
3437
border-radius: 0;
3538
border-top: 1px solid #EEEEEE !important;
3639
border-bottom: none;
3740
margin: 0;
3841
}
3942

40-
.admin-interface.sticky-pagination.change-list.popup .paginator {
43+
.admin-interface.sticky-pagination.change-list.popup #changelist .changelist-footer {
4144
padding-left: 20px;
4245
padding-right: 20px;
4346
}
4447

4548
@media (min-width:768px) {
46-
.admin-interface.sticky-pagination.change-list:not(.popup) .paginator {
49+
.admin-interface.sticky-pagination.change-list:not(.popup) #changelist .changelist-footer {
4750
padding-left: 30px;
4851
padding-right: 30px;
4952
}
5053
}
5154

5255
@media (min-width:1024px) {
53-
.admin-interface.sticky-pagination.change-list:not(.popup) .paginator {
56+
.admin-interface.sticky-pagination.change-list:not(.popup) #changelist .changelist-footer {
5457
padding-left: 40px;
5558
padding-right: 40px;
5659
}
5760
}
5861

5962
@media (min-width:1280px) {
60-
.admin-interface.sticky-pagination.change-list:not(.popup) #main.shifted > #nav-sidebar + .content .paginator {
63+
.admin-interface.sticky-pagination.change-list:not(.popup) #main.shifted > #nav-sidebar + .content #changelist .changelist-footer {
6164
width: calc(100% - 360px);
6265
}
6366
}

admin_interface/static/admin_interface/css/widgets.css

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
.admin-interface a:not([role="button"], #header a, #nav-sidebar a, #content-main.app-list a, .object-tools a) {
2+
text-decoration: inherit;
3+
}
4+
.admin-interface a:not([role="button"], #header a, #nav-sidebar a, #content-main.app-list a, .object-tools a):hover,
5+
.admin-interface a:not([role="button"], #header a, #nav-sidebar a, #content-main.app-list a, .object-tools a):focus {
6+
text-decoration: underline;
7+
}
8+
19
/* fix generic flex container */
210
.admin-interface .flex-container {
311
width: 100%;
@@ -100,6 +108,10 @@
100108
}
101109
/* end fix */
102110

111+
.admin-interface .related-widget-wrapper .selector-chooser {
112+
border-radius: 15px;
113+
}
114+
103115
/* fix selector chooser slide transition */
104116
.admin-interface .related-widget-wrapper .selector-chooser .selector-add,
105117
.admin-interface .related-widget-wrapper .selector-chooser .selector-remove {

0 commit comments

Comments
 (0)