Skip to content

Commit

Permalink
Refs #34095 -- Changed more properties to use rem units in admin CSS.
Browse files Browse the repository at this point in the history
  • Loading branch information
SwastikTripathi authored and felixxm committed Nov 30, 2022
1 parent e8dcef1 commit e20fd89
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
12 changes: 6 additions & 6 deletions django/contrib/admin/static/admin/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ li ul {

li, dt, dd {
font-size: 0.8125rem;
line-height: 20px;
line-height: 1.25rem;
}

dt {
Expand Down Expand Up @@ -308,7 +308,7 @@ table {

td, th {
font-size: 0.8125rem;
line-height: 16px;
line-height: 1rem;
border-bottom: 1px solid var(--hairline-color);
vertical-align: top;
padding: 8px;
Expand Down Expand Up @@ -501,7 +501,7 @@ textarea:focus, select:focus, .vTextField:focus {
}

select {
height: 30px;
height: 1.875rem;
}

select[multiple] {
Expand Down Expand Up @@ -761,7 +761,7 @@ a.deletelink:focus, a.deletelink:hover {
display: block;
float: left;
margin-left: 5px;
height: 16px;
height: 1rem;
}

.object-tools a {
Expand Down Expand Up @@ -1059,8 +1059,8 @@ a.deletelink:focus, a.deletelink:hover {
.delete-confirmation form .cancel-link {
display: inline-block;
vertical-align: middle;
height: 15px;
line-height: 15px;
height: 0.9375rem;
line-height: 0.9375rem;
border-radius: 4px;
padding: 10px 15px;
color: var(--button-fg);
Expand Down
20 changes: 10 additions & 10 deletions django/contrib/admin/static/admin/css/forms.css
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ form ul.inline li {
content: '';
display: inline-block;
vertical-align: middle;
height: 26px;
height: 1.625rem;
}

.aligned label + p, .aligned .checkbox-row + div.help, .aligned label + div.readonly {
Expand Down Expand Up @@ -277,8 +277,8 @@ body.popup .submit-row {
}

.submit-row input {
height: 35px;
line-height: 15px;
height: 2.1875rem;
line-height: 0.9375rem;
}

.submit-row input, .submit-row a {
Expand All @@ -297,9 +297,9 @@ body.popup .submit-row {
display: block;
background: var(--delete-button-bg);
border-radius: 4px;
padding: 10px 15px;
height: 15px;
line-height: 15px;
padding: 0.625rem 0.9375rem;
height: 0.9375rem;
line-height: 0.9375rem;
color: var(--button-fg);
}

Expand All @@ -308,8 +308,8 @@ body.popup .submit-row {
background: var(--close-button-bg);
border-radius: 4px;
padding: 10px 15px;
height: 15px;
line-height: 15px;
height: 0.9375rem;
line-height: 0.9375rem;
color: var(--button-fg);
}

Expand Down Expand Up @@ -524,8 +524,8 @@ body.popup .submit-row {
}

.related-lookup {
width: 16px;
height: 16px;
width: 1rem;
height: 1rem;
background-image: url(../img/search.svg);
}

Expand Down
10 changes: 5 additions & 5 deletions django/contrib/admin/static/admin/css/responsive.css
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ input[type="submit"], button {
}

#changelist-search label {
line-height: 22px;
line-height: 1.375rem;
}

#toolbar form #searchbar {
flex: 1 0 auto;
width: 0;
height: 22px;
height: 1.375rem;
margin: 0 10px 0 6px;
}

Expand Down Expand Up @@ -186,12 +186,12 @@ input[type="submit"], button {
box-sizing: border-box;
margin: 0;
padding: 6px 8px;
min-height: 36px;
min-height: 2.25rem;
font-size: 0.875rem;
}

.form-row select {
height: 36px;
height: 2.25rem;
}

.form-row select[multiple] {
Expand Down Expand Up @@ -957,7 +957,7 @@ input[type="submit"], button {
.calendar-shortcuts {
padding: 10px 0;
font-size: 0.75rem;
line-height: 12px;
line-height: 0.75rem;
}

.calendar-shortcuts a {
Expand Down
6 changes: 3 additions & 3 deletions django/contrib/admin/static/admin/css/widgets.css
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ a.active.selector-clearall:focus, a.active.selector-clearall:hover {
.selector .search-label-icon {
background: url(../img/search.svg) 0 0 no-repeat;
display: inline-block;
height: 18px;
width: 18px;
height: 1.125rem;
width: 1.125rem;
}

/* DATE AND TIME */
Expand Down Expand Up @@ -498,7 +498,7 @@ span.clearable-file-input label {
background: var(--body-bg);
color: var(--body-quiet-color);
font-size: 0.6875rem;
line-height: 11px;
line-height: 0.6875rem;
border-top: 1px solid var(--hairline-color);
padding: 8px 0;
}
Expand Down

0 comments on commit e20fd89

Please sign in to comment.