[Pkg-owncloud-commits] [owncloud] 108/457: replace logo-wide on share page as well with better icon + text

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 78a04643545d692a8700706bd261f53151de2b0e
Author: Jan-Christoph Borchardt <hey at jancborchardt.net>
Date:   Fri May 22 00:04:47 2015 +0200

    replace logo-wide on share page as well with better icon + text
---
 apps/files_sharing/templates/public.php |  18 ++++++++++++++----
 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 +-
 6 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index fa349f2..5a01197 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -46,12 +46,22 @@ $thumbSize = 1024;
 <header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
 		<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
 		   title="" id="owncloud">
-			<div class="logo-wide svg">
-				<h1 class="hidden-visually">
-					<?php p($theme->getName()); ?>
-				</h1>
+			<div class="logo-icon svg">
 			</div>
 		</a>
+
+		<div class="header-appname-container">
+			<h1 class="header-appname">
+				<?php
+					if(OC_Util::getEditionString() === '') {
+						p($theme->getName());
+					} else {
+						print_unescaped($theme->getHTMLName());
+					}
+				?>
+			</h1>
+		</div>
+
 		<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 		<div class="header-right">
 			<span id="details">
diff --git a/core/css/header.css b/core/css/header.css
index 6fd30f6..466022e 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 874c42b..cfc8f8b 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 bca5fa7..0000000
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 1ee00e7..0000000
--- a/core/img/logo-wide.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="34" width="150" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" enable-background="new 0 0 595.275 311.111" viewBox="0 0 150.00267 34" xmlns:dc="http://purl.org/dc/elements/1.1/"><g transform="translate(1 .99987)" fill="#FFF"><path style="block-progression:tb;color:#000000;enable-background:accumulate;text-transform:none;text-indent:0" d="m1 [...]
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index bcf4731..61f1647 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -46,7 +46,7 @@
 				</div>
 			</a>
 
-			<a href="#" class="menutoggle" tabindex="2">
+			<a href="#" class="header-appname-container menutoggle" tabindex="2">
 				<h1 class="header-appname">
 					<?php
 						if(OC_Util::getEditionString() === '') {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git