From 3e87f2bc4554803258fcf71a099d14056e2e5718 Mon Sep 17 00:00:00 2001 From: vKham Date: Mon, 26 Dec 2011 09:47:01 +0000 Subject: [PATCH] //fix double background login css firefox3, button upload image edit product git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11753 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/themes/default/admin.css | 5 +- .../themes/default/bg-button-degrade.png | Bin 0 -> 941 bytes .../template/customer_threads/list_header.tpl | 14 ++-- .../template/products/customization.tpl | 6 +- css/admin.css | 68 +++++++++++++++--- css/login.css | 5 +- 6 files changed, 77 insertions(+), 21 deletions(-) create mode 100644 admin-dev/themes/default/bg-button-degrade.png diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index f1cf34dff..827943d9a 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -196,8 +196,11 @@ a.module_toggle_all{color: #268CCD;} div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;} /*button upload files*/ -.qq-upload-button {background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent; +.qq-upload-button { + background: #e4e4e4 url(bg-button-degrade.png) repeat-x scroll left top; + background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent; background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent; + color:#333; width:160px; font-weight:bold; text-shadow: 0 1px 0 #fff; border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;} .qq-upload-button:hover { border:1px solid #939393;} /*leadin*/ diff --git a/admin-dev/themes/default/bg-button-degrade.png b/admin-dev/themes/default/bg-button-degrade.png new file mode 100644 index 0000000000000000000000000000000000000000..c2498d2571fe8d278fd97f32c78aa03422f86924 GIT binary patch literal 941 zcmaJ=zi-n(7&T-7RjNQ@f`!9fiO*-(abv})5<8`qa1a0X{^*fV_%4qu^Zwq zU}Xa&1|%j11}0{hSSzt2Hnwn13sK{-h1EAd){e3+TFRgBM8E-b8L6{evPmD zH?Q;m>$kGTx4W!0U_ClwGn^2i;nN`jPKZxQmtcSX^b4s8LP-qz12%9U8y*cMoMWUc zj5%8nYKK{jy$NApNKS*u6n}pFB!a*<#V498yRk*a!SNy?y+yn4Ehb*o7Z2;8mKj_i zBn*QrJd08zGsTsz!O!_M6u}C@CZ>29)WGckizWnUl3e!WiVP}9Lh8P*>kok8{4A!5>y(Rw0=-NkXU)(aqF=Md-;cPaOW~xM!Q;4e7YObLuWsWGP^N8WB z9Ho1Of=yB{31Sw|2;_=*NT|A&U*2A#4l zxr+Cn!fAgV6WApwohBY{+-NU%6&qGUFr!JI(zBw9oiSxJ9n%a!;a%5o zqLkstBaUr~TtNx~->{mtg{r!$=$4L9D=$;?KvOlice2|+>9+ZHiJ(h zKJ5t~>-vX__xwpbaO_4u`#${r>*B_pQmOQHxm=<#tJKl(+pCwiZl4HmVB^P&^UwJ+ N6r5Jue%CxX{{xP0BQO8} literal 0 HcmV?d00001 diff --git a/admin-dev/themes/template/customer_threads/list_header.tpl b/admin-dev/themes/template/customer_threads/list_header.tpl index 7aeeaf56d..02841a9b2 100644 --- a/admin-dev/themes/template/customer_threads/list_header.tpl +++ b/admin-dev/themes/template/customer_threads/list_header.tpl @@ -46,16 +46,16 @@ {/if} {/foreach} -
+
-

 {$val.name}

+

{$val.name}

{if $nb_categories < 6}

{$val.description}

{/if} {if $total_thread == 0} -

{l s='No new message'}

+ {l s='No new message'} {else} {$total_thread} @@ -65,7 +65,7 @@
{/foreach} -
+

 {l s='Meaning of status'}

  • {l s='Open'}{l s='Open'}
    • @@ -76,10 +76,10 @@
- +
- + @@ -88,7 +88,7 @@ {assign var=count value=$count+1} - + {/foreach} diff --git a/admin-dev/themes/template/products/customization.tpl b/admin-dev/themes/template/products/customization.tpl index 80d6b9dba..dc9066571 100644 --- a/admin-dev/themes/template/products/customization.tpl +++ b/admin-dev/themes/template/products/customization.tpl @@ -56,7 +56,11 @@ - + + + + diff --git a/css/admin.css b/css/admin.css index 0571cb855..6c105cb0a 100644 --- a/css/admin.css +++ b/css/admin.css @@ -1313,6 +1313,8 @@ html[xmlns] .clearfix { .tr_odd { background-color:#eff4f9; } + + .table_info_details tr td.td_align_left{ font-weight:normal; text-align: left; @@ -1954,28 +1956,56 @@ ul.connectedSortable li.module_list { /* Customer Thread */ #CustomerThreadContacts{ - float:left; - border:0; + } -#CustomerThreadContacts div { - background-color:#EFEFEF; + +#CustomerThreadContacts div.blocSAV { float:left; margin:0 10px 10px 0; - border:1px solid #CFCFCF; + min-height:178px; + width:24%; + border:1px solid #ccc; + background-color:#f8f8f8; } + +#MeaningStatus { +float:left; +} + #CustomerThreadContacts p { + font-family: Georgia,Arial, Helvetica; + font-style:italic; overflow:hidden; - line-height:15px; + font-size:13px; + line-height:18px; height:45px; margin:0; - padding:0 5px; + padding:10px; + border-top:1px solid #fff; + border-bottom:1px solid #ccc; + text-align:center; + margin:0 auto; } + +#CustomerThreadContacts .message-mail { + display:block; + text-align:center; + padding:25px 10px; + border-top:1px solid #fff; + margin: 0 auto; +} + #CustomerThreadContacts h3 { + font-size:16px; + font-weight:normal; overflow:hidden; line-height:25px; - color:#812143; height:25px; margin:0; + padding:5px 10px; + background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC); + background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent; + border-bottom: 1px solid #ccc; } #CustomerThreadContacts a { padding:0 5px; @@ -1992,12 +2022,12 @@ ul.connectedSortable li.module_list { padding:0 5px; } #CustomerThreadContacts div#CustomerService { - width:300px; + float:left; background:none; border:none; } #CustomerThreadContacts div#CustomerService table.table { - width:300px; + } #CustomerThreadContacts div#CustomerService table.table thead{ margin:0; @@ -2008,14 +2038,30 @@ ul.connectedSortable li.module_list { font-weight:bold; text-align:center; } +#CustomerThreadContacts div#CustomerService table.table tr td span{ + font-weight:bold; + font-size:14px; +} + #CustomerThreadContacts div#MeaningStatus{ - width:300px + float:left; } #ChangeStatus{ position:absolute; margin:20px 20px 0 0; right:10px; } +#CustomerService table { +border-collapse: collapse; +} + +#CustomerService .table tr.alt_row { + background-color: #EFF4F9; +} + +#CustomerService .table tr td { + border:none; +} /* ScrollTop */ div#scrollTop a{ diff --git a/css/login.css b/css/login.css index fdb0bf3e6..f3f3640cd 100644 --- a/css/login.css +++ b/css/login.css @@ -7,10 +7,13 @@ body { font-size: 13px; color: #333; text-align: center; - background-image: url('../img/admin/bg-admin-gradient.png'),url('../img/admin/bg-admin.jpg'); + background-image: url('../img/admin/bg-admin.jpg'); background-position: center center; } +body #main { + } + h1 { color: #902F52; font-size: 20pt;
{l s='Customer service'} : {l s='Statistics'}{l s='Customer service'} : {l s='Statistics'}
{$key}{$val}{$val}
+