Mirrors
/
nextcloud-server
mirror of https://github.com/nextcloud/server
3
0
Fork 0
Code Releases Activity
Browse Source

Merge pull request #5407 from nextcloud/5157-simple-logo 

Simplified Nextcloud logo icon #2
pull/5621/head
Morris Jobke 9 years ago
committed by GitHub
parent
8e160c6638 02dd7f5965
commit
f3c25e177f
10 changed files with 21 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      apps/federatedfilesharing/lib/Settings/Personal.php
  2. 2
      apps/files_sharing/templates/public.php
  3. 3
      apps/theming/css/theming.scss
  4. 4
      apps/theming/js/settings-admin.js
  5. 6
      core/css/guest.css
  6. 22
      core/css/header.scss
  7. 1
      core/img/logo-icon.svg
  8. 2
      core/img/logo.svg
  9. 2
      core/templates/layout.user.php
  10. 5
      themes/example/core/css/server.css

2
apps/federatedfilesharing/lib/Settings/Personal.php
View File

@ -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(),

2
apps/files_sharing/templates/public.php
View File

@ -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>

3
apps/theming/css/theming.scss
View File

@ -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;

4
apps/theming/js/settings-admin.js
View File

@ -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);
});
});
});

6
core/css/guest.css
View File

@ -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-position: center;
width: 252px;
min-height: 120px;
width: 256px;
min-height: 128px;
max-height: 200px;
margin: 0 auto;
}

22
core/css/header.scss
View File

@ -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;

1
core/img/logo-icon.svg
View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" height="34" width="62" viewBox="0 0 62.000002 34"><path style="text-decoration-color:#000;isolation:auto;mix-blend-mode:normal;block-progression:tb;text-decoration-line:none;text-indent:0;text-transform:none;text-decoration-style:solid" fill="#fff" d="M31.6 4c-5.95 0-10.947 4.075-12.473 9.555-1.333-2.93-4.266-5.01-7.674-5.01C6.815 8.546 3 12.36 3 17c0 4.64 3.814 8.453 8.453 8.454 3.41 0 6.34-2.08 7.672-5.01C20.65 25.923 25.65 30 31.6 30c5.918 0 10.89-4.03 12.448-9.465 1.354 2.878 4.242 4.918 7.61 4.92 4.64 0 8.456-3.816 8.456-8.456s-3.816-8.455-8.455-8.454c-3.37 0-6.26 2.04-7.614 4.918C42.486 8.03 37.518 4 31.6 4zm0 4.962A8 8 0 0 1 39.64 17a8 8 0 0 1-8.04 8.038 8 8 0 0 1-8.037-8.04A8 8 0 0 1 31.6 8.963zm-20.147 4.546a3.454 3.454 0 0 1 3.49 3.49 3.455 3.455 0 0 1-3.49 3.494A3.455 3.455 0 0 1 7.963 17a3.454 3.454 0 0 1 3.49-3.492zm40.205 0a3.455 3.455 0 0 1 3.493 3.49 3.455 3.455 0 0 1-3.492 3.494A3.455 3.455 0 0 1 48.168 17a3.454 3.454 0 0 1 3.49-3.492z" color="#000" white-space="normal"/></svg>

2
core/img/logo.svg
View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" height="120" width="252" viewBox="0 0 252.00001 120.00171"><path style="text-decoration-color:#000;isolation:auto;mix-blend-mode:normal;block-progression:tb;text-decoration-line:none;text-indent:0;text-transform:none;text-decoration-style:solid" fill="#fff" d="M126.19 3.19c-26.05.003-47.917 17.835-54.6 41.827C65.758 32.185 52.92 23.09 38.002 23.09c-20.305.002-37 16.697-37.002 37.002-.004 20.31 16.693 37.008 37.002 37.01 14.918-.002 27.748-9.1 33.58-21.935C78.262 99.162 100.14 117 126.19 117c25.904.003 47.668-17.64 54.486-41.43 5.927 12.597 18.568 21.53 33.314 21.532 20.313.004 37.013-16.697 37.01-37.01-.002-20.31-16.7-37.006-37.01-37.002-14.746.002-27.395 8.933-33.32 21.53C173.86 20.83 152.1 3.19 126.2 3.19zm0 21.72c19.56 0 35.186 15.62 35.188 35.182 0 19.563-15.625 35.19-35.188 35.188-19.56 0-35.182-15.627-35.18-35.188.002-19.56 15.62-35.18 35.18-35.18zm-88.188 19.9c8.57.002 15.28 6.713 15.28 15.282.002 8.57-6.71 15.288-15.28 15.29-8.57-.002-15.283-6.72-15.28-15.29 0-8.57 6.71-15.28 15.28-15.28zm175.99 0c8.57 0 15.288 6.71 15.29 15.282 0 8.573-6.717 15.29-15.29 15.29-8.57-.002-15.283-6.72-15.28-15.29 0-8.57 6.71-15.28 15.28-15.28z" color="#000" white-space="normal"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" height="128" width="256" version="1.1"><g stroke="#fff" stroke-width="22" fill="none"><circle cy="64" cx="40" r="26"/><circle cy="64" cx="216" r="26"/><circle cy="64" cx="128" r="46"/></g></svg>

2
core/templates/layout.user.php
View File

@ -34,7 +34,7 @@
<div id="header-left">
<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
id="nextcloud" tabindex="1">
<div class="logo-icon">
<div class="logo logo-icon">
<h1 class="hidden-visually">
<?php p($theme->getName()); ?>
</h1>

5
themes/example/core/css/server.css
View File

@ -76,11 +76,10 @@ button.primary:focus,
/* use logos from theme */
#header .logo {
background-image: url('../img/logo.svg');
width: 250px;
height: 121px;
width: 256px;
height: 128px;
}
#header .logo-icon {
background-image: url('../img/logo-icon.svg');
width: 62px;
height: 34px;
}
Write Preview
Loading…
Cancel
Save