diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-07-04 12:56:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-04 12:56:05 +0200 |
| commit | f3c25e177f428d0438d73505915e4bf110c835b7 (patch) | |
| tree | 5ef9e5c6c08a90ad9172b88c09ea7e683d6c3c03 /apps | |
| parent | 8e160c6638b8e5dab077ac1f62c6f88ca93a4b58 (diff) | |
| parent | 02dd7f59655cd54daff06511b87134fe6018bfae (diff) | |
| download | nextcloud-server-f3c25e177f428d0438d73505915e4bf110c835b7.tar.gz nextcloud-server-f3c25e177f428d0438d73505915e4bf110c835b7.zip | |
Merge pull request #5407 from nextcloud/5157-simple-logo
Simplified Nextcloud logo icon #2
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/federatedfilesharing/lib/Settings/Personal.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 2 | ||||
| -rw-r--r-- | apps/theming/css/theming.scss | 3 | ||||
| -rw-r--r-- | apps/theming/js/settings-admin.js | 4 |
4 files changed, 5 insertions, 6 deletions
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); <div id="header-left"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="nextcloud"> - <div class="logo-icon svg"></div> + <div class="logo logo-icon svg"></div> <h1 class="header-appname"> <?php p($theme->getName()); ?> </h1> diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index 3967ad4ce06..20b84d2a0d3 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -45,8 +45,7 @@ } /* 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; 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); }); }); - + }); |