diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css index 1439b5d675..9fef3a8bc1 100644 --- a/django/contrib/admin/static/admin/css/base.css +++ b/django/contrib/admin/static/admin/css/base.css @@ -661,45 +661,34 @@ a.deletelink:hover { .object-tools li { display: block; float: left; - background: url(../img/tool-left.gif) 0 0 no-repeat; - padding: 0 0 0 8px; - margin-left: 2px; + margin-left: 5px; height: 16px; } -.object-tools li:hover { - background: url(../img/tool-left_over.gif) 0 0 no-repeat; +.object-tools a { + border-radius: 15px; } .object-tools a:link, .object-tools a:visited { display: block; float: left; color: white; - padding: .1em 14px .1em 8px; - height: 14px; - background: #999 url(../img/tool-right.gif) 100% 0 no-repeat; + padding: .2em 10px; + background: #999; } .object-tools a:hover, .object-tools li:hover a { - background: #5b80b2 url(../img/tool-right_over.gif) 100% 0 no-repeat; + background-color: #5b80b2; } .object-tools a.viewsitelink, .object-tools a.golink { - background: #999 url(../img/tooltag-arrowright.gif) top right no-repeat; - padding-right: 28px; -} - -.object-tools a.viewsitelink:hover, .object-tools a.golink:hover { - background: #5b80b2 url(../img/tooltag-arrowright_over.gif) top right no-repeat; + background: #999 url(../img/tooltag-arrowright.png) 95% center no-repeat; + padding-right: 26px; } .object-tools a.addlink { - background: #999 url(../img/tooltag-add.gif) top right no-repeat; - padding-right: 28px; -} - -.object-tools a.addlink:hover { - background: #5b80b2 url(../img/tooltag-add_over.gif) top right no-repeat; + background: #999 url(../img/tooltag-add.png) 95% center no-repeat; + padding-right: 26px; } /* OBJECT HISTORY */ @@ -837,4 +826,3 @@ table#change-history tbody th { background: #eee url(../img/nav-bg.gif) bottom left repeat-x; color: #666; } - diff --git a/django/contrib/admin/static/admin/css/widgets.css b/django/contrib/admin/static/admin/css/widgets.css index d61cd3a218..56817228f3 100644 --- a/django/contrib/admin/static/admin/css/widgets.css +++ b/django/contrib/admin/static/admin/css/widgets.css @@ -54,8 +54,8 @@ .selector ul.selector-chooser { float: left; width: 22px; - height: 50px; - background: url(../img/chooser-bg.gif) top center no-repeat; + background-color: #eee; + border-radius: 10px; margin: 10em 5px 0 5px; padding: 0; } @@ -169,7 +169,8 @@ a.active.selector-clearall { height: 22px; width: 50px; margin: 0 0 3px 40%; - background: url(../img/chooser_stacked-bg.gif) top center no-repeat; + background-color: #eee; + border-radius: 10px; } .stacked .selector-chooser li { @@ -575,4 +576,3 @@ ul.orderer li.deleted:hover, ul.orderer li.deleted a.selector:hover { font-size: 11px; border-top: 1px solid #ddd; } - diff --git a/django/contrib/admin/static/admin/img/chooser-bg.gif b/django/contrib/admin/static/admin/img/chooser-bg.gif deleted file mode 100644 index 30e83c2518..0000000000 Binary files a/django/contrib/admin/static/admin/img/chooser-bg.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/chooser_stacked-bg.gif b/django/contrib/admin/static/admin/img/chooser_stacked-bg.gif deleted file mode 100644 index 5d104b6d98..0000000000 Binary files a/django/contrib/admin/static/admin/img/chooser_stacked-bg.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/tool-left.gif b/django/contrib/admin/static/admin/img/tool-left.gif deleted file mode 100644 index 011490ff3a..0000000000 Binary files a/django/contrib/admin/static/admin/img/tool-left.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/tool-left_over.gif b/django/contrib/admin/static/admin/img/tool-left_over.gif deleted file mode 100644 index 937e07bb1a..0000000000 Binary files a/django/contrib/admin/static/admin/img/tool-left_over.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/tool-right.gif b/django/contrib/admin/static/admin/img/tool-right.gif deleted file mode 100644 index cdc140cc59..0000000000 Binary files a/django/contrib/admin/static/admin/img/tool-right.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/tool-right_over.gif b/django/contrib/admin/static/admin/img/tool-right_over.gif deleted file mode 100644 index 4db977e838..0000000000 Binary files a/django/contrib/admin/static/admin/img/tool-right_over.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/tooltag-add.gif b/django/contrib/admin/static/admin/img/tooltag-add.gif deleted file mode 100644 index 8b53d49ae5..0000000000 Binary files a/django/contrib/admin/static/admin/img/tooltag-add.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/tooltag-add.png b/django/contrib/admin/static/admin/img/tooltag-add.png new file mode 100644 index 0000000000..f352cf590f Binary files /dev/null and b/django/contrib/admin/static/admin/img/tooltag-add.png differ diff --git a/django/contrib/admin/static/admin/img/tooltag-add_over.gif b/django/contrib/admin/static/admin/img/tooltag-add_over.gif deleted file mode 100644 index bfc52f10de..0000000000 Binary files a/django/contrib/admin/static/admin/img/tooltag-add_over.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/tooltag-arrowright.gif b/django/contrib/admin/static/admin/img/tooltag-arrowright.gif deleted file mode 100644 index cdaaae77ed..0000000000 Binary files a/django/contrib/admin/static/admin/img/tooltag-arrowright.gif and /dev/null differ diff --git a/django/contrib/admin/static/admin/img/tooltag-arrowright.png b/django/contrib/admin/static/admin/img/tooltag-arrowright.png new file mode 100644 index 0000000000..ac1ac5b89a Binary files /dev/null and b/django/contrib/admin/static/admin/img/tooltag-arrowright.png differ diff --git a/django/contrib/admin/static/admin/img/tooltag-arrowright_over.gif b/django/contrib/admin/static/admin/img/tooltag-arrowright_over.gif deleted file mode 100644 index 7163189604..0000000000 Binary files a/django/contrib/admin/static/admin/img/tooltag-arrowright_over.gif and /dev/null differ diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt index 8c5a0fb585..a7ab751dd4 100644 --- a/docs/releases/1.7.txt +++ b/docs/releases/1.7.txt @@ -72,6 +72,9 @@ Minor features allowing the ``published`` element to be included in the feed (which relies on ``pubdate``). +* Buttons in :mod:`django.contrib.admin` now use the ``border-radius`` CSS + property for rounded corners rather than GIF background images. + Backwards incompatible changes in 1.7 =====================================