innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #11544 -- Removed !important rules in contrib.admin styles.

This commit is contained in:
elky 2015-09-07 00:28:14 +05:00 committed by Tim Graham
parent 19f98946f2
commit e23e7b2ffe
5 changed files with 57 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
django/contrib/admin/static/admin/css/base.css
View File

@ -91,14 +91,6 @@ ul li {
padding: 1px 0; padding: 1px 0;
} }
ul.plainlist {
margin-left: 0 !important;
}
ul.plainlist li {
list-style-type: none;
}
li ul { li ul {
margin-bottom: 0; margin-bottom: 0;
} }
@ -187,8 +179,8 @@ p.mini {
margin-top: -3px; margin-top: -3px;
} }
.help, p.help { .help, p.help, form p.help {
font-size: 10px !important; font-size: 11px;
color: #999; color: #999;
} }
@ -201,12 +193,8 @@ p img, h1 img, h2 img, h3 img, h4 img, td img {
} }
.quiet, a.quiet:link, a.quiet:visited { .quiet, a.quiet:link, a.quiet:visited {
color: #999 !important; color: #999;
font-weight: normal !important; font-weight: normal;
}
.quiet strong {
font-weight: bold !important;
} }
.float-right { .float-right {
@ -276,24 +264,6 @@ tfoot td {
border-top: 1px solid #eee; border-top: 1px solid #eee;
} }
thead th:first-child,
tfoot td:first-child {
border-left: none !important;
}
thead th.optional {
font-weight: normal !important;
}
tr.row-label td {
font-size: 9px;
padding-top: 2px;
padding-bottom: 0;
border-bottom: none;
color: #666;
margin-top: -1px;
}
tr.alt { tr.alt {
background: #f6f6f6; background: #f6f6f6;
} }
@ -426,7 +396,7 @@ input, textarea, select, .form-row p, form .button {
} }
textarea { textarea {
vertical-align: top !important; vertical-align: top;
} }
input[type=text], input[type=password], input[type=email], input[type=url], input[type=text], input[type=password], input[type=email], input[type=url],
@ -571,7 +541,7 @@ ul.messagelist li.error {
} }
.errornote { .errornote {
font-size: 14px !important; font-size: 14px;
font-weight: 700; font-weight: 700;
display: block; display: block;
padding: 10px 12px; padding: 10px 12px;
@ -584,14 +554,14 @@ ul.messagelist li.error {
} }
ul.errorlist { ul.errorlist {
margin: 0 0 4px !important; margin: 0 0 4px;
padding: 0 !important; padding: 0;
color: #ba2121; color: #ba2121;
background: #fff; background: #fff;
} }
ul.errorlist li { ul.errorlist li {
font-size: 13px !important; font-size: 13px;
display: block; display: block;
margin-bottom: 4px; margin-bottom: 4px;
} }
@ -606,12 +576,12 @@ ul.errorlist li a {
} }
td ul.errorlist { td ul.errorlist {
margin: 0 !important; margin: 0;
padding: 0 !important; padding: 0;
} }
td ul.errorlist li { td ul.errorlist li {
margin: 0 !important; margin: 0;
} }
.form-row.errors { .form-row.errors {
@ -769,7 +739,6 @@ table#change-history tbody th {
#content { #content {
padding: 20px 40px; padding: 20px 40px;
margin: 0;
} }
.dashboard #content { .dashboard #content {
@ -796,17 +765,17 @@ table#change-history tbody th {
/* COLUMN TYPES */ /* COLUMN TYPES */
.colMS { .colMS {
margin-right: 20em !important; margin-right: 300px;
} }
.colSM { .colSM {
margin-left: 20em !important; margin-left: 300px;
} }
.colSM #content-related { .colSM #content-related {
float: left; float: left;
margin-right: 0; margin-right: 0;
margin-left: -19em; margin-left: -300px;
} }
.colSM #content-main { .colSM #content-main {
@ -817,13 +786,6 @@ table#change-history tbody th {
width: auto; width: auto;
} }
.subcol {
float: left;
width: 46%;
margin-right: 15px;
}
/* HEADER */ /* HEADER */
#header { #header {

29
django/contrib/admin/static/admin/css/changelists.css
View File

@ -19,14 +19,10 @@
min-height: 400px; min-height: 400px;
} }
.change-list .filtered {
background: #fff !important;
}
.change-list .filtered .results, .change-list .filtered .paginator, .change-list .filtered .results, .change-list .filtered .paginator,
.filtered #toolbar, .filtered div.xfull { .filtered #toolbar, .filtered div.xfull {
margin-right: 280px !important; margin-right: 280px;
width: auto !important; width: auto;
} }
.change-list .filtered table tbody th { .change-list .filtered table tbody th {
@ -38,7 +34,7 @@
} }
#changelist .toplinks { #changelist .toplinks {
border-bottom: 1px solid #ccc !important; border-bottom: 1px solid #ddd;
} }
#changelist .paginator { #changelist .paginator {
@ -191,8 +187,8 @@
.change-list ul.toplinks { .change-list ul.toplinks {
display: block; display: block;
float: left; float: left;
padding: 0 !important; padding: 0;
margin: 0 !important; margin: 0;
width: 100%; width: 100%;
} }
@ -230,19 +226,18 @@
} }
.paginator a.showall { .paginator a.showall {
padding: 0 !important; padding: 0;
border: none !important; border: none;
background: none !important; background: none;
color: #5b80b2 !important; color: #5b80b2;
} }
.paginator a.showall:hover { .paginator a.showall:hover {
color: #036 !important; background: none;
background: none !important; color: #036;
} }
.paginator .end { .paginator .end {
border-width: 2px !important;
margin-right: 6px; margin-right: 6px;
} }
@ -261,7 +256,7 @@
/* ACTIONS */ /* ACTIONS */
.filtered .actions { .filtered .actions {
margin-right: 280px !important; margin-right: 280px;
border-right: none; border-right: none;
} }

34
django/contrib/admin/static/admin/css/forms.css
View File

@ -20,7 +20,6 @@
form .form-row p { form .form-row p {
padding-left: 0; padding-left: 0;
font-size: 11px !important;
} }
.hidden { .hidden {
@ -29,21 +28,15 @@ form .form-row p {
/* FORM LABELS */ /* FORM LABELS */
form h4 {
margin: 0 !important;
padding: 0 !important;
border: none !important;
}
label { label {
font-weight: normal !important; font-weight: normal;
color: #666; color: #666;
font-size: 13px; font-size: 13px;
} }
.required label, label.required { .required label, label.required {
font-weight: bold !important; font-weight: bold;
color: #333 !important; color: #333;
} }
/* RADIO BUTTONS */ /* RADIO BUTTONS */
@ -91,8 +84,7 @@ form ul.inline li {
height: 26px; height: 26px;
} }
.aligned label + p:not(.help) { .aligned label + p {
font-size: 13px !important;
padding: 6px 0; padding: 6px 0;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
@ -158,7 +150,8 @@ form .aligned table p {
} }
.aligned .vCheckboxLabel { .aligned .vCheckboxLabel {
float: none !important; float: none;
width: auto;
display: inline-block; display: inline-block;
vertical-align: -3px; vertical-align: -3px;
padding: 0 0 5px 5px; padding: 0 0 5px 5px;
@ -174,7 +167,7 @@ form .aligned table p {
.checkbox-row p.help { .checkbox-row p.help {
margin-left: 0; margin-left: 0;
padding-left: 0 !important; padding-left: 0;
} }
fieldset .field-box { fieldset .field-box {
@ -185,11 +178,11 @@ fieldset .field-box {
/* WIDE FIELDSETS */ /* WIDE FIELDSETS */
.wide label { .wide label {
width: 200px !important; width: 200px;
} }
form .wide p { form .wide p, form .wide input + p.help {
margin-left: 200px !important; margin-left: 200px;
} }
form .wide p.help { form .wide p.help {
@ -207,7 +200,7 @@ fieldset.collapsed * {
} }
fieldset.collapsed h2, fieldset.collapsed { fieldset.collapsed h2, fieldset.collapsed {
display: block !important; display: block;
} }
fieldset.collapsed { fieldset.collapsed {
@ -227,7 +220,7 @@ fieldset .collapse-toggle {
fieldset.collapsed .collapse-toggle { fieldset.collapsed .collapse-toggle {
background: transparent; background: transparent;
display: inline !important; display: inline;
color: #447e9b; color: #447e9b;
} }
@ -291,7 +284,7 @@ body.popup .submit-row {
/* CUSTOM FORM FIELDS */ /* CUSTOM FORM FIELDS */
.vSelectMultipleField { .vSelectMultipleField {
vertical-align: top !important; vertical-align: top;
} }
.vCheckboxField { .vCheckboxField {
@ -300,6 +293,7 @@ body.popup .submit-row {
.vDateField, .vTimeField { .vDateField, .vTimeField {
margin-right: 2px; margin-right: 2px;
margin-bottom: 4px;
} }
.vDateField { .vDateField {

23
django/contrib/admin/static/admin/css/rtl.css
View File

@ -30,6 +30,11 @@ th {
text-align: right; text-align: right;
} }
.module ul, .module ol {
margin-left: 0;
margin-right: 1.5em;
}
.addlink, .changelink { .addlink, .changelink {
padding-left: 0; padding-left: 0;
padding-right: 16px; padding-right: 16px;
@ -74,8 +79,8 @@ div.breadcrumbs {
} }
.colMS { .colMS {
margin-left: 20em !important; margin-left: 300px;
margin-right: 10px !important; margin-right: 0;
} }
/* SORTABLE TABLES */ /* SORTABLE TABLES */
@ -98,10 +103,6 @@ thead th.sorted .text {
/* changelists styles */ /* changelists styles */
.change-list .filtered {
background: #fff !important;
}
.change-list .filtered table { .change-list .filtered table {
border-left: none; border-left: none;
border-right: 0px none; border-right: 0px none;
@ -115,8 +116,8 @@ thead th.sorted .text {
} }
.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { .change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
margin-right: 0px !important; margin-right: 0;
margin-left: 280px !important; margin-left: 280px;
} }
#changelist-filter li.selected { #changelist-filter li.selected {
@ -129,10 +130,8 @@ thead th.sorted .text {
} }
.filtered .actions { .filtered .actions {
border-left:1px solid #DDDDDD; margin-left: 280px;
margin-left:160px !important; margin-right: 0;
border-right: 0 none;
margin-right:0 !important;
} }
#changelist table tbody td:first-child, #changelist table tbody th:first-child { #changelist table tbody td:first-child, #changelist table tbody th:first-child {

12
django/contrib/admin/static/admin/css/widgets.css
View File

@ -243,14 +243,12 @@ p.datetime {
margin: 0; margin: 0;
padding: 0; padding: 0;
color: #666; color: #666;
font-size: 13px !important;
font-weight: bold; font-weight: bold;
} }
form .form-row p.datetime { form .form-row p.datetime {
font-size: 13px !important;
margin-left: 160px; margin-left: 160px;
padding-left: 10px !important; padding-left: 10px;
} }
.datetime span { .datetime span {
@ -260,10 +258,10 @@ form .form-row p.datetime {
color: #ccc; color: #ccc;
} }
.datetime input { .datetime input, .form-row .datetime input.vDateField, .form-row .datetime input.vTimeField {
min-width: 0; min-width: 0;
margin-left: 5px; margin-left: 5px;
margin-bottom: 4px !important; margin-bottom: 4px;
} }
table p.datetime { table p.datetime {
@ -490,8 +488,8 @@ span.clearable-file-input label {
} }
.calendar-cancel { .calendar-cancel {
margin: 0 !important; margin: 0;
padding: 4px 0 !important; padding: 4px 0;
font-size: 12px; font-size: 12px;
background: #eee; background: #eee;
border-top: 1px solid #ddd; border-top: 1px solid #ddd;