diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-03-09 09:44:12 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-03-09 09:44:12 +0000 |
| commit | 62b4c05fc90b8631375bf5b362b71c34680ffbe4 (patch) | |
| tree | 16355183cd868a2d7cdbec6a062a54c0a2fcc81e /roundcubemail | |
| parent | c8b5cc14b7276df642a1d1fe9c6849ef092ef185 (diff) | |
- Improve logo handling in default skin (#1488385)
git-svn-id: https://svn.roundcube.net/trunk@5992 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/program/include/html.php | 2 | ||||
| -rw-r--r-- | roundcubemail/skins/default/common.css | 12 | ||||
| -rw-r--r-- | roundcubemail/skins/default/includes/header.html | 3 | ||||
| -rw-r--r-- | roundcubemail/skins/default/print.css | 4 | ||||
| -rw-r--r-- | roundcubemail/skins/default/templates/error.html | 2 | ||||
| -rw-r--r-- | roundcubemail/skins/default/templates/messageprint.html | 2 |
6 files changed, 10 insertions, 15 deletions
diff --git a/roundcubemail/program/include/html.php b/roundcubemail/program/include/html.php index 27da2c340..0e89d778f 100644 --- a/roundcubemail/program/include/html.php +++ b/roundcubemail/program/include/html.php @@ -157,7 +157,7 @@ class html $attr = array('src' => $attr); } return self::tag('img', $attr + array('alt' => ''), null, array_merge(self::$common_attrib, - array('src','alt','width','height','border','usemap'))); + array('src','alt','width','height','border','usemap','onclick'))); } /** diff --git a/roundcubemail/skins/default/common.css b/roundcubemail/skins/default/common.css index f84c9e6b6..31ecbe905 100644 --- a/roundcubemail/skins/default/common.css +++ b/roundcubemail/skins/default/common.css @@ -154,14 +154,10 @@ img left: 20px; } -body > #header +body > #logo { - position: absolute; - top: 8px; - left: 19px; - width: 170px; - height: 40px; - z-index: 100; + margin-left: 12px; + cursor: pointer; } #taskbar @@ -170,7 +166,7 @@ body > #header top: 0px; right: 0px; height: 24px; - width: 100%; + left: 250px; background: url(images/taskbar.png) top right no-repeat; padding: 10px 6px 5px 0px; text-align: right; diff --git a/roundcubemail/skins/default/includes/header.html b/roundcubemail/skins/default/includes/header.html index 900968fd2..08d777af0 100644 --- a/roundcubemail/skins/default/includes/header.html +++ b/roundcubemail/skins/default/includes/header.html @@ -1,3 +1,2 @@ -<div id="header"><a href="./?_page=1"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" alt="Logo" /></a></div> - +<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" onclick="location.href='./?_page=1'" /> <roundcube:object name="message" id="message" /> diff --git a/roundcubemail/skins/default/print.css b/roundcubemail/skins/default/print.css index afdf67418..59d400e5c 100644 --- a/roundcubemail/skins/default/print.css +++ b/roundcubemail/skins/default/print.css @@ -25,7 +25,7 @@ a, a:active, a:visited color: #000000; } -#header +body > #logo { float: right; margin: 0 5mm 3mm 5mm; @@ -57,7 +57,7 @@ table.headers-table tr td.subject width: 90%; font-weight: bold; } - + #attachment-list { margin-top: 3mm; diff --git a/roundcubemail/skins/default/templates/error.html b/roundcubemail/skins/default/templates/error.html index 60af53b2a..fdd7c887b 100644 --- a/roundcubemail/skins/default/templates/error.html +++ b/roundcubemail/skins/default/templates/error.html @@ -6,7 +6,7 @@ </head> <body> -<div id="header"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" alt="Logo" /></div> +<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" /> <div style="width:400px; margin:60px auto;"> $__page_content diff --git a/roundcubemail/skins/default/templates/messageprint.html b/roundcubemail/skins/default/templates/messageprint.html index 31022394b..fa7822ad5 100644 --- a/roundcubemail/skins/default/templates/messageprint.html +++ b/roundcubemail/skins/default/templates/messageprint.html @@ -7,7 +7,7 @@ </head> <body> -<div id="header"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" alt="Logo" /></div> +<roundcube:object name="logo" src="/images/roundcube_logo.png" id="logo" border="0" /> <div id="printmessageframe"> <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" /> |