aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-01-18 13:25:04 +0000
committerplegall <plg@piwigo.org>2011-01-18 13:25:04 +0000
commit790e91754165abad7cf94b64e1acc456832a3fac (patch)
treeade62ca84bd0f64ed09f9f48abdffe3e78e94ecc
parent6db359c6222072f0f02e0c603ecfb52e8d0f13ab (diff)
feature 2113: new logo on administration screen
git-svn-id: http://piwigo.org/svn/trunk@8732 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/themes/clear/images/piwigo_logo_small.pngbin0 -> 4749 bytes
-rw-r--r--admin/themes/clear/theme.css3
-rw-r--r--admin/themes/default/default-layout.css4
-rw-r--r--admin/themes/default/template/header.tpl2
-rw-r--r--admin/themes/roma/images/piwigo_logo_small.pngbin0 -> 4810 bytes
-rw-r--r--admin/themes/roma/theme.css3
6 files changed, 4 insertions, 8 deletions
diff --git a/admin/themes/clear/images/piwigo_logo_small.png b/admin/themes/clear/images/piwigo_logo_small.png
new file mode 100644
index 000000000..952bba57d
--- /dev/null
+++ b/admin/themes/clear/images/piwigo_logo_small.png
Binary files differ
diff --git a/admin/themes/clear/theme.css b/admin/themes/clear/theme.css
index 87b488987..f9454346c 100644
--- a/admin/themes/clear/theme.css
+++ b/admin/themes/clear/theme.css
@@ -73,8 +73,6 @@ body { margin: 0; padding: 0; background:#f9f9f9 }
#headbranch { width: 233px; height: 240px; margin: 0; padding: 0;
position:absolute; left:0px; top:0px; z-index: 0;
background:transparent }
-#theHeader { display:none; height:40px; margin: 0; padding: 0;
-background:transparent }
h3, #imageToolBar a:hover, .content, .throw, .row1 { background-color: #ddd; }
.row2 { background-color:#eeeeee; }
.throw em { font-style: normal; color: #0cc9c; }
@@ -255,6 +253,7 @@ display:block; height:85px; left:225px; position:relative; top:-42px; width:313p
#pwgHead, #footer {color:#666;}
#pwgHead A, #footer A {color:#444;}
#pwgHead A:hover, #footer A:hover {color:black; border-color:black;}
+#footer { background-image: url(images/piwigo_logo_small.png);}
.pluginBox {background-color:#ddd;color:#333}
.pluginBoxNameCell {font-weight:bold;}
diff --git a/admin/themes/default/default-layout.css b/admin/themes/default/default-layout.css
index 43c51c045..e950f9939 100644
--- a/admin/themes/default/default-layout.css
+++ b/admin/themes/default/default-layout.css
@@ -593,7 +593,7 @@ html, body {height:100%; margin:0; padding:0;}
bottom:0;
width:100%;
height:46px;
- background: url(images/logo.png) no-repeat bottom left;
+ background: url(images/logo.png) no-repeat 2px 1px;
background-color:#464646;
color:#aaa;
line-height:46px;
@@ -614,7 +614,7 @@ html, body {height:100%; margin:0; padding:0;}
#adminHome A {display:block; font-size:1.1em; font-weight:bold;}
#adminHome A {border:none;}
-#piwigoInfos {float:left; margin-left:100px;}
+#piwigoInfos {float:left; margin-left:200px;}
#pageInfos {float:right; margin-right:10px;}
/* TipTip CSS - Version 1.2 */
diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl
index a64fcbf17..19ef37908 100644
--- a/admin/themes/default/template/header.tpl
+++ b/admin/themes/default/template/header.tpl
@@ -70,8 +70,6 @@
</div>
{/if}
-<div id="theHeader">{*$PAGE_BANNER*}</div>
-
{if not empty($header_notes)}
<div class="header_notes">
{foreach from=$header_notes item=elt}
diff --git a/admin/themes/roma/images/piwigo_logo_small.png b/admin/themes/roma/images/piwigo_logo_small.png
new file mode 100644
index 000000000..7da34528c
--- /dev/null
+++ b/admin/themes/roma/images/piwigo_logo_small.png
Binary files differ
diff --git a/admin/themes/roma/theme.css b/admin/themes/roma/theme.css
index de1612a28..78263602a 100644
--- a/admin/themes/roma/theme.css
+++ b/admin/themes/roma/theme.css
@@ -42,8 +42,6 @@ background-color:#111111; }
#headbranch { width: 233px; height: 240px; margin: 0; padding: 0;
position:absolute; left:0px; top:0px; z-index: 0;
}
-#theHeader { display:none;min-height:105px; margin: 0; padding: 0;
-background:transparent url(images/piwigo_logo_sombre_214x100.png) no-repeat scroll 245px top; }
h3, #imageToolBar a:hover, .row2, .content { background-color: #222; }
.throw, .row1 { background-color:#111; }
.throw em { font-style: normal; color: #ff3363; }
@@ -234,6 +232,7 @@ display:block; height:85px; left:225px; position:relative; top:-42px; width:313p
#helpContent, #pLoaderPage, #ftpPage, #ftpPage LEGEND {color:#aaa;}
#pwgHead, #footer {background-color:#222;}
+#footer {background-image: url(images/piwigo_logo_small.png);}
.pluginBox {background-color:#333;color:#999}
.pluginBoxNameCell {color:#ccc;}