diff options
| -rw-r--r-- | apps/files_sharing/templates/public.php | 18 | ||||
| -rw-r--r-- | core/css/header.css | 15 | ||||
| -rw-r--r-- | core/css/mobile.css | 9 | ||||
| -rw-r--r-- | core/img/logo-wide.png | bin | 2022 -> 0 bytes | |||
| -rw-r--r-- | core/img/logo-wide.svg | 2 | ||||
| -rw-r--r-- | 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 fa349f29811..5a0119747f1 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 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 Binary files differdeleted file mode 100644 index bca5fa7997f..00000000000 --- a/core/img/logo-wide.png +++ /dev/null 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 @@ -<?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="m104 13v15.344c0 2.008 1.71 3.656 3.72 3.656v-1c-1.52 0-2.72-1.137-2.72-2.656v-15.344h-1zm42 0v8h-4.53c-2.99 0-5.47 2.571-5.47 5.562s2.48 5.466 5.47 5.438h1.78c0.88 0 1.74-0.442 2.44-1.094 0.7-0.651 1.29-1.555 1.31-2.562v-15.344h-1zm-44.5 2c-4.635 0-8.5 3.865-8.5 8.5s3.865 8.5 8.5 8.5v-1c-4.146 0-7.5-3.353-7.5-7.5s3.354-7.5 7.5-7.5v-1zm-46 6c-0.606 0-1.201 0.092-1.75 0.281 0.071 0.325 0.15 0.664 0.188 1 0.489-0.18 1.007-0.281 1.562-0.281 2.503 0 4.5 1.997 4.5 4.5s-1.997 4.5-4.5 4.5c-1.444 0-2.71-0.676-3.531-1.719-0.198 0.255-0.434 0.485-0.657 0.719 1.017 1.208 2.521 2 4.188 2 2.991 0 5.5-2.509 5.5-5.5s-2.509-5.5-5.5-5.5zm7.5 0v7.344c0 2.008 1.992 3.656 4 3.656 1.368 0 2.905-0.695 3.531-1.812 0.622 1.117 2.101 1.812 3.469 1.812 2.008 0 4-1.648 4-3.656v-7.344h-1v7.344c0 1.519-1.481 2.656-3 2.656s-3-1.002-3-2.656v-7.344h-1v7.344c0 1.519-1.48 2.656-3 2.656-1.519 0-3-1.137-3-2.656v-7.344h-1zm22.531 0c-2.991 0-5.531 2.54-5.531 5.531v5.469h1v-5.469c0-2.502 2.029-4.531 4.531-4.531 2.503 0 4.469 2.029 4.469 4.531v5.469h1v-5.469c0-2.991-2.477-5.531-5.469-5.531zm29.969 0c-2.99 0-5.5 2.509-5.5 5.5s2.51 5.5 5.5 5.5 5.5-2.509 5.5-5.5-2.51-5.5-5.5-5.5zm7.5 0v5.562c0 2.991 2.48 5.438 5.47 5.438s5.53-2.447 5.53-5.438v-5.562h-1v5.562c0 2.502-2.03 4.438-4.53 4.438s-4.47-1.936-4.47-4.438v-5.562h-1zm-7.5 1c2.5 0 4.5 1.997 4.5 4.5s-2 4.5-4.5 4.5-4.5-1.997-4.5-4.5 2-4.5 4.5-4.5zm25.97 0h4.53v6.344c-0.01 0.7-0.35 1.387-0.91 1.906-0.55 0.519-1.27 0.75-1.84 0.75h-1.78c-2.5 0-4.47-1.936-4.47-4.438s1.97-4.562 4.47-4.562z" transform="translate(-3.1714e-6,0)"/><path d="m16.398 3.6857c-2.2943 0-4.1386 1.8599-4.1386 4.1542 0 0.74283 0.19165 1.4447 0.53099 2.0459 1.3845-0.781 2.9851-1.2338 4.6852-1.2338 0.16408 0 0.32211 0.00666 0.48414 0.015617-0.01834-0.23258-0.03123-0.46554-0.03123-0.70278 0-1.2779 0.27755-2.4937 0.76525-3.592-0.657-0.4403-1.443-0.6871-2.296-0.6871z"/><path d="m7.9805 15.852c-4.4057 0-7.9805 3.544-7.9805 7.949 0 4.4057 3.5748 7.9805 7.9805 7.9805 1.6769 0 3.2302-0.52246 4.5134-1.4056-0.53024-0.82393-0.84334-1.809-0.84334-2.858 0-0.54446 0.08034-1.0675 0.23426-1.5617-2.4023-1.7361-3.9668-4.5612-3.9668-7.7462 0-0.80924 0.10664-1.5917 0.29673-2.3426-0.0791-0.002-0.1549-0.015-0.2344-0.015z"/><path d="m17.476 9.5578c-4.7826 0-8.652 3.8694-8.652 8.652 0 2.8154 1.3414 5.3078 3.4202 6.8873 0.87636-1.6903 2.6365-2.8424 4.6696-2.8424 0.24572 0 0.48158 0.02978 0.7184 0.06247-0.07434-0.54088-0.10932-1.0943-0.10932-1.6554 0-2.6831 0.87339-5.1644 2.3582-7.1684-0.889-1.112-1.525-2.448-1.796-3.9039-0.201-0.014-0.405-0.0313-0.609-0.0313z"/><path d="m36.045 6.5437c-0.1695 0-0.33288 0.02081-0.49976 0.031235 0.07218 0.45513 0.12494 0.9147 0.12494 1.3899 0 0.7396-0.09406 1.4533-0.2655 2.1396 2.01 1.1123 3.6791 2.7767 4.7789 4.7945 1.1407-0.59386 2.4132-0.97147 3.7638-1.062-0.34807-4.082-3.7298-7.2933-7.9024-7.2933z"/><path d="m26.799 5.1362e-7c-4.4056 0-7.9649 3.5593-7.9649 7.9649 0 1.816 0.60469 3.4874 1.6242 4.8258 2.2117-2.5599 5.4759-4.1855 9.1205-4.1855 1.7831 0 3.474 0.39707 4.9976 1.0932 0.124-0.5582 0.188-1.1384 0.188-1.7338 0-4.4056-3.559-7.9649-7.965-7.9649z"/><path d="m44.588 14.712c-1.4522 0-2.8126 0.37076-4.0137 0.99951 0.682 1.5107 1.062 3.1868 1.062 4.9507 0 3.3027-1.3279 6.3016-3.4827 8.4802 1.583 1.7575 3.8797 2.858 6.4344 2.858 4.7826 0 8.652-3.8694 8.652-8.652 0-4.7827-3.8694-8.6364-8.652-8.6364z"/><path d="m16.914 23.161c-2.415 0-4.3572 1.9422-4.3572 4.3572s1.9422 4.3729 4.3572 4.3729c1.8512 0 3.4224-1.1551 4.0605-2.7799-1.557-1.5857-2.6759-3.6087-3.1703-5.8565-0.28932-0.05983-0.58298-0.09371-0.89019-0.09371z"/><path d="m29.579 9.511c-6.1647 0-11.151 4.9857-11.151 11.151 0 6.1645 4.9858 11.151 11.151 11.151 6.165 0 11.151-4.9864 11.151-11.151 0-6.1651-4.9861-11.151-11.151-11.151z"/></g></svg> 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 @@ </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() === '') { |
