Skip to content

Fixed #24444 -- Updated contrib.admin visual theme to use django-flat-theme #4627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fixed #24444 -- Updated contrib.admin visual theme to use django-flat-theme #4627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
666d4b1
Django Admin Flat Theme
elky May 8, 2015
27137ae
Updated release notes for 1.9
elky Jul 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
390 changes: 258 additions & 132 deletions django/contrib/admin/static/admin/css/base.css
View file
Open in desktop

Large diffs are not rendered by default.

176 changes: 109 additions & 67 deletions django/contrib/admin/static/admin/css/changelists.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,20 @@
.change-list .hiddenfields { display:none; }

.change-list .filtered table {
border-right: 1px solid #ddd;
border-right: none;
}

.change-list .filtered {
min-height: 400px;
}

.change-list .filtered {
background: white url(../img/changelist-bg.gif) top right repeat-y !important;
background: #fff !important;
}

.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull {
margin-right: 160px !important;
.change-list .filtered .results, .change-list .filtered .paginator,
.filtered #toolbar, .filtered div.xfull {
margin-right: 280px !important;
width: auto !important;
}

Expand All @@ -42,16 +43,11 @@

#changelist .paginator {
color: #666;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
background: white url(../img/nav-bg.gif) 0 180% repeat-x;
background: #fff;
overflow: hidden;
}

.change-list .filtered .paginator {
border-right: 1px solid #ddd;
}

/* CHANGELIST TABLES */

#changelist table thead th {
Expand All @@ -65,21 +61,8 @@
text-align: center;
}

#changelist table tbody td, #changelist table tbody th {
border-left: 1px solid #ddd;
}

#changelist table tbody td:first-child, #changelist table tbody th:first-child {
border-left: 0;
border-right: 1px solid #ddd;
}

#changelist table tbody th:first-child:last-child {
border-right: 0;
}

#changelist table tbody td.action-checkbox {
text-align:center;
text-align: center;
}

#changelist table tfoot {
Expand All @@ -89,23 +72,52 @@
/* TOOLBAR */

#changelist #toolbar {
padding: 3px;
border-bottom: 1px solid #ddd;
background: #e1e1e1 url(../img/nav-bg.gif) top left repeat-x;
padding: 8px 10px;
margin-bottom: 15px;
border-top: 1px solid #eee;
border-bottom: 1px solid #eee;
background: #f8f8f8;
color: #666;
}

#changelist #toolbar form input {
font-size: 11px;
padding: 1px 2px;
border-radius: 4px;
font-size: 14px;
padding: 5px;
color: #333;
}

#changelist #toolbar form #searchbar {
padding: 2px;
height: 19px;
border: 1px solid #ccc;
padding: 2px 5px;
margin: 0;
vertical-align: top;
font-size: 13px;
}

#changelist #toolbar form #searchbar:focus {
outline: none;
border-color: #999;
}

#changelist #toolbar form input[type="submit"] {
border: 1px solid #ccc;
padding: 2px 10px;
margin: 0;
vertical-align: -1px;
background: #fff url(../img/nav-bg.gif) bottom repeat-x;
cursor: pointer;
color: #333;
}

#changelist #toolbar form input[type="submit"]:hover {
border-color: #999;
}

#changelist #changelist-search img {
vertical-align: middle;
margin-right: 4px;
}

/* FILTER COLUMN */
Expand All @@ -115,26 +127,37 @@
top: 0;
right: 0;
z-index: 1000;
width: 160px;
border-left: 1px solid #ddd;
background: #efefef;
width: 240px;
background: #f8f8f8;
border-left: none;
margin: 0;
}

#changelist-filter h2 {
font-size: 11px;
padding: 2px 5px;
border-bottom: 1px solid #ddd;
font-size: 14px;
text-transform: uppercase;
letter-spacing: 0.5px;
padding: 5px 15px;
margin-bottom: 12px;
border-bottom: none;
}

#changelist-filter h3 {
font-size: 12px;
margin-bottom: 0;
font-weight: 400;
font-size: 14px;
padding: 0 15px;
margin-bottom: 10px;
}

#changelist-filter ul {
padding-left: 0;
margin-left: 10px;
margin: 5px 0;
padding: 0 15px 15px;
border-bottom: 1px solid #eaeaea;
}

#changelist-filter ul:last-child {
border-bottom: none;
padding-bottom: none;
}

#changelist-filter li {
Expand All @@ -144,6 +167,7 @@
}

#changelist-filter a {
display: block;
color: #999;
}

Expand All @@ -152,13 +176,13 @@
}

#changelist-filter li.selected {
border-left: 5px solid #ccc;
padding-left: 5px;
margin-left: -10px;
border-left: 5px solid #eaeaea;
padding-left: 10px;
margin-left: -15px;
}

#changelist-filter li.selected a {
color: #5b80b2 !important;
color: #5b80b2;
}

/* DATE DRILLDOWN */
Expand Down Expand Up @@ -191,7 +215,7 @@
/* PAGINATOR */

.paginator {
font-size: 11px;
font-size: 13px;
padding-top: 10px;
padding-bottom: 10px;
line-height: 22px;
Expand All @@ -201,19 +225,21 @@

.paginator a:link, .paginator a:visited {
padding: 2px 6px;
border: solid 1px #ccc;
background: white;
background: #79aec8;
text-decoration: none;
color: #fff;
}

.paginator a.showall {
padding: 0 !important;
border: none !important;
background: none !important;
color: #5b80b2 !important;
}

.paginator a.showall:hover {
color: #036 !important;
background: transparent !important;
background: none !important;
}

.paginator .end {
Expand All @@ -230,31 +256,32 @@

.paginator a:hover {
color: white;
background: #5b80b2;
border-color: #036;
background: #036;
}

/* ACTIONS */

.filtered .actions {
margin-right: 160px !important;
border-right: 1px solid #ddd;
margin-right: 280px !important;
border-right: none;
}

#changelist table input {
margin: 0;
vertical-align: baseline;
}

#changelist table tbody tr.selected {
background-color: #FFFFCC;
}

#changelist .actions {
padding: 10px;
background: #fff;
border-top: none;
border-bottom: none;
line-height: 24px;
color: #999;
padding: 3px;
border-top: 1px solid #fff;
border-bottom: 1px solid #ddd;
background: white url(../img/nav-bg-reverse.gif) 0 -10px repeat-x;
}

#changelist .actions.selected {
Expand All @@ -267,7 +294,7 @@
#changelist .actions span.action-counter,
#changelist .actions span.clear,
#changelist .actions span.question {
font-size: 11px;
font-size: 13px;
margin: 0 0.5em;
display: none;
}
Expand All @@ -277,21 +304,36 @@
}

#changelist .actions select {
border: 1px solid #aaa;
margin-left: 0.5em;
padding: 1px 2px;
vertical-align: top;
height: 24px;
background: none;
border: 1px solid #ccc;
border-radius: 4px;
font-size: 14px;
padding: 0 0 0 4px;
margin: 0;
margin-left: 10px;
}

#changelist .actions label {
font-size: 11px;
margin-left: 0.5em;
display: inline-block;
vertical-align: middle;
font-size: 13px;
}

#changelist #action-toggle {
display: none;
#changelist .actions .button {
font-size: 13px;
border: 1px solid #ccc;
border-radius: 4px;
background: #fff url(../img/nav-bg.gif) bottom repeat-x;
cursor: pointer;
height: 24px;
line-height: 1;
padding: 4px 8px;
margin: 0;
color: #333;
}

#changelist .actions .button {
font-size: 11px;
padding: 1px 2px;
#changelist .actions .button:hover {
border-color: #999;
}
20 changes: 20 additions & 0 deletions django/contrib/admin/static/admin/css/fonts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
@font-face {
font-family: 'Roboto';
src: url('../fonts/Roboto-Bold-webfont.woff');
font-weight: 700;
font-style: normal;
}

@font-face {
font-family: 'Roboto';
src: url('../fonts/Roboto-Regular-webfont.woff');
font-weight: 400;
font-style: normal;
}

@font-face {
font-family: 'Roboto';
src: url('../fonts/Roboto-Light-webfont.woff');
font-weight: 300;
font-style: normal;
}
Loading