From fb052b528ad5f0a92f7420ab8ade16462b6435fd Mon Sep 17 00:00:00 2001 From: Pedro Mourelle Date: Mon, 25 Feb 2013 03:18:27 -0300 Subject: [PATCH] Fixed #19900 -- Updated admin buttons to use CSS3 rounded corners. --- .../contrib/admin/static/admin/css/base.css | 32 ++++++------------ .../admin/static/admin/css/widgets.css | 8 ++--- .../admin/static/admin/img/chooser-bg.gif | Bin 199 -> 0 bytes .../static/admin/img/chooser_stacked-bg.gif | Bin 212 -> 0 bytes .../admin/static/admin/img/tool-left.gif | Bin 197 -> 0 bytes .../admin/static/admin/img/tool-left_over.gif | Bin 203 -> 0 bytes .../admin/static/admin/img/tool-right.gif | Bin 198 -> 0 bytes .../static/admin/img/tool-right_over.gif | Bin 200 -> 0 bytes .../admin/static/admin/img/tooltag-add.gif | Bin 932 -> 0 bytes .../admin/static/admin/img/tooltag-add.png | Bin 0 -> 967 bytes .../static/admin/img/tooltag-add_over.gif | Bin 336 -> 0 bytes .../static/admin/img/tooltag-arrowright.gif | Bin 351 -> 0 bytes .../static/admin/img/tooltag-arrowright.png | Bin 0 -> 1063 bytes .../admin/img/tooltag-arrowright_over.gif | Bin 354 -> 0 bytes docs/releases/1.7.txt | 3 ++ 15 files changed, 17 insertions(+), 26 deletions(-) delete mode 100644 django/contrib/admin/static/admin/img/chooser-bg.gif delete mode 100644 django/contrib/admin/static/admin/img/chooser_stacked-bg.gif delete mode 100644 django/contrib/admin/static/admin/img/tool-left.gif delete mode 100644 django/contrib/admin/static/admin/img/tool-left_over.gif delete mode 100644 django/contrib/admin/static/admin/img/tool-right.gif delete mode 100644 django/contrib/admin/static/admin/img/tool-right_over.gif delete mode 100644 django/contrib/admin/static/admin/img/tooltag-add.gif create mode 100644 django/contrib/admin/static/admin/img/tooltag-add.png delete mode 100644 django/contrib/admin/static/admin/img/tooltag-add_over.gif delete mode 100644 django/contrib/admin/static/admin/img/tooltag-arrowright.gif create mode 100644 django/contrib/admin/static/admin/img/tooltag-arrowright.png delete mode 100644 django/contrib/admin/static/admin/img/tooltag-arrowright_over.gif 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 30e83c2518b0e5ee5f4bda6ce790b47f6dbdbfbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmZ?wbhEHb6l2h5*v!E2@87@o@85s?`0?-Gzu&)q|NQy$j~_oiefsp_!-t2MMY9TZUv9~%Sp!>_)cW&ci3#* zUhC5m*S~nZz=*>R=VoO!-wlwA$Z`-01 q@~q#j3=%veq*@rvq^WHhU}-`1SSm{{H^+^Yi-p`uF$u@bK{c{r&s< z`||Sg^z`)c@$vTd_5c6?A^8LV00000EC2ui05AX-000DmFvuy15jgA3yCGB Oo}Zwd4gw#T5db^5xM#Bf 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 011490ff3a0100bea63eca7d8a3f821edecf6d3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmV;$06PCiNk%w1VF>^d0K@+9+1 z>Fn(6>gwvFqods1+`_`bsi~>N#Kh<4=efDLot>Sks;aTEvEJU^(b3W4lL@fC0syEMTS%hy>Zm!0PcpEpJwG;hh<#5^Y_P4;QTzJF~^?;ZNVo;-~tj z3GxIURaQ?9NK-h~-O_%Ehr|6W>p_W03|&Y3moVBW-4OX{v_eKqd6L;=PDTc60DL-S AivR!s 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 cdc140cc590a56bf45ceef6eaeebf47e4a699ac3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmV;%06G6hNk%w1VF>^d0K@+9+1 z>Fn(6>gwvFqods1+`_`bsi~>N#Kh<4=efDLot>Sks;aTEvEJU^(b3W4R 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 4db977e838dd97ae4f59524a764cf8298f19ccc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmZ?wbhEHblL@fC0syEMTS%hy>Zm!0M`SJhE@w+}Rz8zHMDu50@FVv!<=}o0a$2j_;|E wNJ^Lce8rW`28j}!f$kDtvUrX>)$-C{u;f$x#4um1{ZvBtsg!MMAsh_W0PS95AOHXW 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 8b53d49ae58dbc324ca7fb318198b187fc124c09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 932 zcmZ?wbhEHb6lM@)_|Cxa`}glZfBv+zw0!^m{n4XG%aU|5d-nPB=MNq{xOeZ~wr$(``}?0g zdp3Xm{Fg6Zwzjt3y?giHzkgr9e*ORde?vn9!zdUHfx#C7ia%Mvj?w{lD0p`BHNuZH8`gv5jGtilW#8Ul-s@(Rm3u`n_%YH1afFWM53xbWyi0reSoZU`=F zW>B;|HRonfOG771<|UO1;}pj!{KgMbG6N3=Of=;-YN#}Nd4NeFEUKo%!I@!YFuRjN h0z*m|qaatng9}?1vhrtKUbNTY0V7A3A`=sXH2_xRgyR4J 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 0000000000000000000000000000000000000000..f352cf590fa7cbf346fb51203b2c55025da93941 GIT binary patch literal 967 zcmaJ=&ui0A91k6iF&ykB6TwHOpkVWBO=d!4*EX%IETyysd-OGVZ9|*9`0{GA9YlAV z_)mD+P4FfNIs^}bAb9j9{sAI_r{R3*+HMDHNb=tM^7(weKi@&EdUs{{@-oM9E0t}l z&eqlBTUuoQtG`YlTh?f)MH{$7N01;c@8UKB6(4p{9YJ^Z;YXC^xP@z8vqf9>j^SWm zfC)y3{gAOaE}M%(==2c4KMIMYHv~TjKLAC4}C}M(uDr}@3NtS`8335i&H2D@# zBv}z9_G)Q4W2l;;Y=X(dGjGK07W@x@Li-=j1%L~%4438M`GlddT1x}In#N}3_k z(QZItoDQP(se*+fhj=0NZ~ziT*v3O@@+{KR6#Q@|8$^>bv4V*)3`JRxl9Z-E+x|b) z_h;yc*3ntK{}hgzyCD+mD8fVHu*P-P6IY>8BnVPWnivnJRjl#D9QnyTkZmXs+?xfXVY zJ__iR>z;9obGgYd_#yLbA>utkZkb>ojFUFJ`LXD8^(I_*ek}R9T#*GMCapc!>Zys% zPqLj2E<4Od9|dgQ2^;KhhuYKOAMJnm w{Q7-rP5Scb!t>jM&XxSDqb;zr_~H_my2!mfT;h+P-6P4>s+6kM%ff^GzbQ5?qyPW_ literal 0 HcmV?d00001 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 bfc52f10de75998687154585752513a27a02e5c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmZ?wbhEHb6lM@)xXQp_AKmol&!20zAN~IQ+b5;fJ+bBa>km(!zx7XVkIL_<>s=I* z-Fg4<%i9m06*kQ}fA#LqpFhjm=B8Ioc1vhpx_)m~&D4mz?loHv1!s0R#56sA{$|&q zv$L0NTfOzr<~=7olUmZNro(_t( z{<*|8FIl(u()IiQ|Npm*YGNP-DE?#tE7t*$AU`p%OuD z64&(xJYQ3LjTSFY75~+{EbMWTq?Tj+^`lM+ch;D9HZb0eJO28D|1uloD@pFe*-apJ^Hn>L+2d-m?#yFEQU|Ni~^ z`t|Go|Nk2r8W_k0ia%MvT6I7q$WIJxH4gmQ9x7=Hf&p1aV>r7mD6wA%agA(z(Y9-o zn{Z!7=F3()sh$@ap>8_^S=AZ45`|}1urBhDn)0zi%$1R$zCpXHxz#1VpeR78J1{*n zKx$GzLbz~Ucw``(R#|u;i#+q?x}l#o5$^*7-1rs_)vpOO{(vYlW{PgEasf C+m{mn 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 0000000000000000000000000000000000000000..ac1ac5b89a27be2ba972c588fec3c2b33c6a5de7 GIT binary patch literal 1063 zcmaJ=&rcIU6ka4jL{SqA20buYG?7TVKiV$r(h8;9N{Nf4G_eN{F1u5@p}Vv04z_T> zLX3tRHzhF<W z0iVWl91sLQ7Yqpk*9Ul(;~AE`f{zPIAwlB%!Qn%bXpWwhQgY%j7O^694r5zlm_ni8 zF9iI^nPxaq6g>@|_Ys88owKl7^jU6CO+kjP<`_0MkOe$NbqdYm2u(6QID%={Wi9ux zOr&5;QMDP)&w59y0Tt!{P}8iVU7Uh{^8KfyYpmSPT6F>=xf zeh|R1Yl~jdPJ3 z>K$_RhPedd4Y>?ShVfeaSF39-GC$t7KDflFk3O`>ygOvDQ!5*Jaw%4max`81GWBbJ zf2jFlX?byEIMCclahqtrG|=|y*c$tG>GNWxe7CjIR?ZG=eG5|eV5!o(weoJbPkG)1 z@+ZqfPw$s*mZQXYTkm(!zx7XVkIL_<>s=I* z-Fg4<%i9m06*kQ}fA#LqpFhjm=B8Ioc1vhpx_)m~&D4mz?loHv1!s0R#56sA{$|&q zv$L0NTfOzr<~=7olUmZNro(_t( z{<*|8FIl(u()IiQ|Npm*YGNP-DE?#tE7t*$AU`p%)jRO!c&Mb=iC%tqw1%_mf>OuD z64%5AjkaH#++@37WWH>5lj_LG3QgM?$)(Pyl_<=6_Sxb99hOrSl|Hhr49pEp`qi!N zF8KvT0m8k3>6rnFQvwpgW$MEt13C4|!UI|47?&<{5fc~Cj$Ol`%&8*1!G}pzckjNv NA{t6st9%_9tO2syk|zKF 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 =====================================