diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index 04dddd7ccf04a..24c5a5aba098e 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -75,7 +75,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3} .number_wrapper {color: white;display: none;font-size: 13px;font-weight: bold;position: absolute; right: -8px;top: -10px;z-index: 101;padding: 2px 5px;} -.number_wrapper span {background-color: #F03D25;display: block;padding: 0 2px;border-color: -moz-use-text-color #DD3822 #DD3822;border-radius: 2px 2px 2px 2px;border-right: 1px solid #DD3822;border-style: none solid solid;border-width: 0 0px;} +.number_wrapper span {background-color: #F03D25; font-size:11px; display: block; padding: 1px 3px;border-color: -moz-use-text-color #DD3822 #DD3822;border-radius: 2px 2px 2px 2px;border-right: 1px solid #DD3822;border-style: none solid solid;border-width: 0 0px;} .notifs_wrapper {background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #000; border-top:none;display: none; cursor:auto; position: absolute; top: 25px; left: -1px; width:300px; padding: 10px;color: black; z-index:9999;} .notifs_wrapper h3 {font-size: 14px;padding-bottom:8px;margin:0;border-bottom: 1px solid #E5E5E5;} .notifs_wrapper ul {padding:6px 0;margin:0;} @@ -222,8 +222,7 @@ form#product_form, form#access_form, form#cart_rule_form { background-color:#e #addons_login_div p {float:left; font-size:16px; color:#585A69; line-height:24px; text-shadow: 0 1px 0 #fff; margin:0; padding-left:25px;} #addons_login_div label {} #addons_login_div input { float:left; margin-right:10px;} -#addons_login_div input# -#addons_login_div input#username_addons { } +#addons_login_div input#addons_login_button { margin-right: 0px; } /*SIDEBAR*/ @@ -260,8 +259,12 @@ form#product_form, form#access_form, form#cart_rule_form { background-color:#e #moduleContainer .button.uninstalled, #moduleContainer .button.installed { float:right; clear:both; margin-top:15px; font-size:12px;} #moduleContainer ul.listing-grid-module { position:relative; margin:0; padding:0;} -#moduleContainer ul.listing-grid-module li { float:left; border:1px solid #ccc; width:400px; min-height:50px; margin:10px; padding:5px; border-radius:4px;} -#moduleContainer ul.listing-grid-module li select { float:right;} +#moduleContainer ul.listing-grid-module li { float:left; border:1px solid #ccc; width:400px; min-height:30px; margin:10px; padding:5px; border-radius:4px;} +#moduleContainer .moduleGridDesc { position:relative; display:block; height:30px;} +#moduleContainer .moduleGridDesc h3 { color:#3A6EA7; margin:0;} +#moduleContainer ul.listing-grid-module li select { position:absolute; top:0; right:0px; } + + /*FOOTER*/ #footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666} #footer .footer_link, #footer .footer_link:hover {color:#D41958;} diff --git a/css/admin.css b/css/admin.css index 151d2663e3ee2..6858603b904ed 100644 --- a/css/admin.css +++ b/css/admin.css @@ -1197,6 +1197,7 @@ html[xmlns] .clearfix { font-weight:bold; margin-top: 35px; margin-bottom: 0; + line-height: 14px; } .F_list a{ @@ -1445,7 +1446,6 @@ html[xmlns] .clearfix { width: 590px; cellpadding: 0; cellspacing: 0; - border-collapse:collapse; border-radius:3px; } @@ -1508,8 +1508,7 @@ html[xmlns] .clearfix { } #table_customer tbody tr td{ - border: 1px solid #E0E0E0; - border-top: none; + border: none; padding-left: 10px; height: 35px; } diff --git a/css/login.css b/css/login.css index 2148a74beb7e7..3e086c658025f 100644 --- a/css/login.css +++ b/css/login.css @@ -7,7 +7,8 @@ body { font-size: 13px; color: #333; text-align: center; - background-image: url('../img/admin/bg_2.png'); + background-image: url('../img/admin/bg-admin-gradient.png'),url('../img/admin/bg-admin.jpg'); + background-position: center center; } h1 { @@ -19,15 +20,15 @@ h1 { } h2 a { - color: #dedede; - font-size: 7pt; - text-decoration: underline; + color: #eee; + font-size: 11px; margin: 0; + text-shadow: 0 -1px 0 #000; + text-decoration:none; } h2 a:hover { - color: #dedede; - font-size: 7pt; + color: #eee; text-decoration: underline; margin: 0; } @@ -59,7 +60,7 @@ input:focus, textarea:focus { #container { width: 464px; - margin: 5em auto 1em auto; + margin: 12% auto 1em; padding: 0; } @@ -70,7 +71,7 @@ input:focus, textarea:focus { font-weight: bold; background-color:#F5F5F5; border-radius:9px; - box-shadow: 0 1px 20px #333333; + box-shadow: 0 1px 30px #333333; } #login h1 { @@ -118,6 +119,7 @@ input:focus, textarea:focus { background-color: #FAE2E3; text-align: left; border-radius:9px; + box-shadow: 0 1px 30px #333333; } #error ol { @@ -127,15 +129,17 @@ input:focus, textarea:focus { #error li { _margin-left: 45px; - font-family: Arial; - font-size: 11px; + font-family: Georgia; + font-size: 13px; + font-style: italic; } #error h3 { - margin: 0 0 .83em 0; - padding: 5px 0 0 30px; - background: url(../img/admin/error.png) no-repeat 0 0; - font-size: 1em; + margin: 0; + padding: 5px 0 12px 30px; + background: url(../img/admin/icon-cancel.png) no-repeat 0 0; + font-size: 16px; + text-indent:14px; } /* CLASS */ @@ -162,8 +166,8 @@ input:focus, textarea:focus { } .button:hover { - background-color: #F0EBD6; - cursor:default; + border:1px solid #939393; + cursor:pointer; } .center { diff --git a/img/admin/bg-admin-gradient.png b/img/admin/bg-admin-gradient.png new file mode 100644 index 0000000000000..59031469b4888 Binary files /dev/null and b/img/admin/bg-admin-gradient.png differ diff --git a/img/admin/bg-admin.jpg b/img/admin/bg-admin.jpg new file mode 100644 index 0000000000000..121b5758275da Binary files /dev/null and b/img/admin/bg-admin.jpg differ diff --git a/log/20111123_installation.log b/log/20111123_installation.log new file mode 100644 index 0000000000000..c708dc88d026d --- /dev/null +++ b/log/20111123_installation.log @@ -0,0 +1 @@ +*ERROR* 2011/11/23 - 10:27:18: A Prestashop database already exists, please drop it or change the prefix. diff --git a/modules/blockreinsurance/logo.png b/modules/blockreinsurance/logo.png new file mode 100755 index 0000000000000..3eae87d7e843f Binary files /dev/null and b/modules/blockreinsurance/logo.png differ diff --git a/modules/fianetsceau/logo.png b/modules/fianetsceau/logo.png new file mode 100644 index 0000000000000..aacb97006b1fb Binary files /dev/null and b/modules/fianetsceau/logo.png differ diff --git a/modules/graphartichow/logo.png b/modules/graphartichow/logo.png new file mode 100755 index 0000000000000..6d14c7270e3e5 Binary files /dev/null and b/modules/graphartichow/logo.png differ diff --git a/modules/hipay/logo.png b/modules/hipay/logo.png new file mode 100644 index 0000000000000..aa431556bd4f1 Binary files /dev/null and b/modules/hipay/logo.png differ diff --git a/modules/iadvize/logo.png b/modules/iadvize/logo.png new file mode 100644 index 0000000000000..c51b3193f7f68 Binary files /dev/null and b/modules/iadvize/logo.png differ diff --git a/modules/livezilla/logo.png b/modules/livezilla/logo.png new file mode 100644 index 0000000000000..6cfab37420333 Binary files /dev/null and b/modules/livezilla/logo.png differ diff --git a/modules/mailjet/logo b/modules/mailjet/logo new file mode 100644 index 0000000000000..232917015d117 Binary files /dev/null and b/modules/mailjet/logo differ diff --git a/modules/mailjet/logo.png b/modules/mailjet/logo.png new file mode 100644 index 0000000000000..33215dfb73f82 Binary files /dev/null and b/modules/mailjet/logo.png differ diff --git a/modules/ogone/logo.png b/modules/ogone/logo.png new file mode 100644 index 0000000000000..e2eb0e732300d Binary files /dev/null and b/modules/ogone/logo.png differ diff --git a/modules/reverso/logo.png b/modules/reverso/logo.png new file mode 100644 index 0000000000000..8bd7ebe7b7ef0 Binary files /dev/null and b/modules/reverso/logo.png differ diff --git a/modules/shoppingfluxexport/logo.png b/modules/shoppingfluxexport/logo.png new file mode 100644 index 0000000000000..d61d440869c2f Binary files /dev/null and b/modules/shoppingfluxexport/logo.png differ diff --git a/modules/socolissimo/logo b/modules/socolissimo/logo new file mode 100644 index 0000000000000..10d94103077e3 Binary files /dev/null and b/modules/socolissimo/logo differ diff --git a/modules/socolissimo/logo.png b/modules/socolissimo/logo.png new file mode 100644 index 0000000000000..86b83ac376a97 Binary files /dev/null and b/modules/socolissimo/logo.png differ diff --git a/modules/treepodia/logo.png b/modules/treepodia/logo.png index 37f2d0acd7e3f..60f7d7fb6ca6e 100644 Binary files a/modules/treepodia/logo.png and b/modules/treepodia/logo.png differ diff --git a/modules/trustedshops/logo.png b/modules/trustedshops/logo.png new file mode 100644 index 0000000000000..40987847cde0b Binary files /dev/null and b/modules/trustedshops/logo.png differ diff --git a/modules/twenga/logo.png b/modules/twenga/logo.png new file mode 100644 index 0000000000000..6fe2a11621e85 Binary files /dev/null and b/modules/twenga/logo.png differ diff --git a/modules/upscarrier/logo.png b/modules/upscarrier/logo.png new file mode 100644 index 0000000000000..32f19c85ab07b Binary files /dev/null and b/modules/upscarrier/logo.png differ diff --git a/modules/uspscarrier/logo.png b/modules/uspscarrier/logo.png new file mode 100644 index 0000000000000..8decb7bff080d Binary files /dev/null and b/modules/uspscarrier/logo.png differ