diff options
author | Marin Treselj <marin@pixelipo.com> | 2017-06-07 17:06:19 +0300 |
---|---|---|
committer | Julius Härtl <jus@bitgrid.net> | 2017-07-02 15:14:49 +0300 |
commit | 3470d0a44ea2b7a477af407b3d9abee81de071e3 (patch) | |
tree | 6bfbe62ce8ea0c2c913a3aef40c499b051ce8148 /apps/theming | |
parent | cc4373c90157679f2ff8bc21b8cf55e386e9ccea (diff) |
Simplified Nextcloud logo icon
Signed-off-by: Marin Treselj <marin@pixelipo.com>
Diffstat (limited to 'apps/theming')
-rw-r--r-- | apps/theming/css/theming.scss | 6 | ||||
-rw-r--r-- | apps/theming/js/settings-admin.js | 4 |
2 files changed, 3 insertions, 7 deletions
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); }); }); - + }); |