From 78a04643545d692a8700706bd261f53151de2b0e Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 22 May 2015 00:04:47 +0200 Subject: replace logo-wide on share page as well with better icon + text --- core/css/header.css | 15 ++++----------- core/css/mobile.css | 9 +++------ core/img/logo-wide.png | Bin 2022 -> 0 bytes core/img/logo-wide.svg | 2 -- core/templates/layout.user.php | 2 +- 5 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 core/img/logo-wide.png delete mode 100644 core/img/logo-wide.svg (limited to 'core') diff --git a/core/css/header.css b/core/css/header.css index 6fd30f657b7..466022e9f76 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -77,13 +77,6 @@ margin: 0 auto; } -#header .logo-wide { - background-image: url(../img/logo-wide.svg); - background-repeat: no-repeat; - width: 150px; - height: 34px; -} - #header .logo-icon { /* display logo so appname can be shown next to it */ display: inline-block; @@ -93,7 +86,7 @@ height: 34px; } -#header .menutoggle { +#header .header-appname-container { display: inline-block; position: absolute; left: 70px; @@ -103,7 +96,7 @@ } /* hover effect for app switcher label */ -.menutoggle .header-appname, +.header-appname-container .header-appname, .menutoggle .icon-caret { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=75)"; opacity: .75; @@ -350,8 +343,8 @@ margin-bottom: -3px; margin-right: 6px; } - #expanddiv a:hover, - #expanddiv a:focus, + #expanddiv a:hover, + #expanddiv a:focus, #expanddiv a:active, #expanddiv a.active { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; diff --git a/core/css/mobile.css b/core/css/mobile.css index 874c42b92ef..cfc8f8bfdca 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -21,12 +21,9 @@ box-align: center; } -/* on mobile, show logo-icon instead of logo-wide */ -#header .logo-wide { - background-image: url(../img/logo-icon.svg); - background-repeat: no-repeat; - width: 62px; - height: 34px; +/* on mobile, show only the icon of the logo, hide the text */ +#header .header-appname-container { + display: none; } /* compress search box on mobile, expand when focused */ diff --git a/core/img/logo-wide.png b/core/img/logo-wide.png deleted file mode 100644 index bca5fa7997f..00000000000 Binary files a/core/img/logo-wide.png and /dev/null differ diff --git a/core/img/logo-wide.svg b/core/img/logo-wide.svg deleted file mode 100644 index 1ee00e725e5..00000000000 --- a/core/img/logo-wide.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index bcf47316a73..61f164719d0 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -46,7 +46,7 @@ - +

Date: Fri, 22 May 2015 00:35:12 +0200 Subject: also replace logo-mail with new look --- core/img/logo-mail.gif | Bin 1191 -> 1006 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'core') diff --git a/core/img/logo-mail.gif b/core/img/logo-mail.gif index f1dd108450e..32ba878b80b 100644 Binary files a/core/img/logo-mail.gif and b/core/img/logo-mail.gif differ -- cgit v1.2.3