From 3470d0a44ea2b7a477af407b3d9abee81de071e3 Mon Sep 17 00:00:00 2001 From: Marin Treselj Date: Wed, 7 Jun 2017 16:06:19 +0200 Subject: Simplified Nextcloud logo icon Signed-off-by: Marin Treselj --- .../federatedfilesharing/lib/Settings/Personal.php | 2 +- apps/files_sharing/templates/public.php | 2 +- apps/theming/css/theming.scss | 6 +----- apps/theming/js/settings-admin.js | 4 ++-- core/css/guest.css | 8 ++++---- core/css/header.scss | 22 +++++++++------------- core/img/logo-icon.svg | 1 - core/img/logo.svg | 2 +- core/templates/layout.user.php | 2 +- themes/example/core/css/server.css | 5 ++--- 10 files changed, 22 insertions(+), 32 deletions(-) delete mode 100644 core/img/logo-icon.svg diff --git a/apps/federatedfilesharing/lib/Settings/Personal.php b/apps/federatedfilesharing/lib/Settings/Personal.php index 854f5f13ab6..13e96cf872e 100644 --- a/apps/federatedfilesharing/lib/Settings/Personal.php +++ b/apps/federatedfilesharing/lib/Settings/Personal.php @@ -70,7 +70,7 @@ class Personal implements ISettings { 'outgoingServer2serverShareEnabled' => $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(), 'message_with_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID, see %s', [$url]), 'message_without_URL' => $this->l->t('Share with me through my #Nextcloud Federated Cloud ID', [$cloudID]), - 'logoPath' => $this->urlGenerator->imagePath('core', 'logo-icon.svg'), + 'logoPath' => $this->urlGenerator->imagePath('core', 'logo.svg'), 'reference' => $url, 'cloudId' => $cloudID, 'color' => $this->defaults->getColorPrimary(), diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 377e3902002..f8067a03d02 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -38,7 +38,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
-
+

getName()); ?>

diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index 3967ad4ce06..e8b00e41653 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -45,12 +45,8 @@ } /* override styles for login screen in guest.css */ -#header .logo, -#header .logo-icon { +#header .logo { background-image: url(#{$image-logo}); - @if $theming-logo-mime != '' { - background-size: contain; - } } #body-login, diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js index 48c479cc9c3..8c2ab2bc08e 100644 --- a/apps/theming/js/settings-admin.js +++ b/apps/theming/js/settings-admin.js @@ -72,7 +72,7 @@ function preview(setting, value) { if (value !== '') { previewImageLogo.src = OC.generateUrl('/apps/theming/logo') + "?v" + timestamp; } else { - previewImageLogo.src = OC.getRootPath() + '/core/img/logo-icon.svg?v' + timestamp; + previewImageLogo.src = OC.getRootPath() + '/core/img/logo.svg?v' + timestamp; } } @@ -232,5 +232,5 @@ $(document).ready(function () { OC.msg.finishedSaving('#theming_settings_msg', response); }); }); - + }); diff --git a/core/css/guest.css b/core/css/guest.css index 32af45e0881..0050f198a6c 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -65,12 +65,12 @@ h3 { padding-top: 100px; } #header .logo { - background-image: url('../img/logo-icon.svg?v=1'); + background-image: url('../img/logo.svg?v=1'); background-repeat: no-repeat; - background-size: 175px; + background-size: contain; background-position: center; - width: 252px; - min-height: 120px; + width: 256px; + min-height: 128px; max-height: 200px; margin: 0 auto; } diff --git a/core/css/header.scss b/core/css/header.scss index cd6933d2755..c4d4205103a 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -100,13 +100,17 @@ #header { .logo { - background-image: url('#{$image-logo}'); + display: inline-flex; + background-image: url($image-logo); background-repeat: no-repeat; - background-size: 175px; + background-size: contain; background-position: center; - width: 252px; - height: 120px; + width: 256px; + height: 128px; margin: 0 auto; + &.logo-icon { + width: 62px; + height: 34px; img { opacity: 0; @@ -114,15 +118,7 @@ max-height: 200px; } } - .logo-icon { - /* display logo so appname can be shown next to it */ - display: inline-block; - background-image: url($image-logo); - background-repeat: no-repeat; - background-position: center center; - background-size: contain; - width: 62px; - height: 34px; + } .header-appname-container { display: none; diff --git a/core/img/logo-icon.svg b/core/img/logo-icon.svg deleted file mode 100644 index 4e5be881e89..00000000000 --- a/core/img/logo-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/core/img/logo.svg b/core/img/logo.svg index a6e6212e4b9..5fdf57a016d 100644 --- a/core/img/logo.svg +++ b/core/img/logo.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 7d54d9b21f7..a1074b4c76c 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -34,7 +34,7 @@