Skip to content

Simplified Nextcloud logo icon - #5288

Closed
pixelipo wants to merge 104 commits into
nextcloud:masterfrom
pixelipo:simplify-logo
Closed

Simplified Nextcloud logo icon#5288
pixelipo wants to merge 104 commits into
nextcloud:masterfrom
pixelipo:simplify-logo

Conversation

@pixelipo

@pixelipopixelipo commented Jun 7, 2017

Copy link
Copy Markdown
Contributor

This is part of the SVG optimization task #5157

Nextcloud logo code has been simplified, but at the same time it's more human-readable.

I've changed the size to more traditional values (256*128). Circles are a bit fatter than they used to be (+0.5px at 128px width). If that is an issue, I can change their width to 21.5px.

logo-icon.svg is deprecated since new logo.svg is already much smaller in weight.

I've combined .logo and .logo-icon - this is not strictly needed, I can revert if @nextcloud/designers disagree. It requires adding logo class to tags that have logo-icon class in apps - mainly where pages are shared publicly, e.g. Calendar.

PNG images and favicons were not edited.

Signed-off-by: Marin Treselj marin@pixelipo.com

nickvergessenand others added 18 commits May 22, 2017 09:54
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Joas Schilling <coding@schilljs.com>
UserManager
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Fixed typo and removed doclink symbol.
Reported at transifex
Update util.php
Another l10n improvement from transifex.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Signed-off-by: Marin Treselj <marin@pixelipo.com>
…ale mode
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
…ut fields
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* password form overlaps upload button and doesn't allow to click it
* regression from nextcloud#5259
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
make sure that we always clear all floating rules after the user settings parts
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
…s-regression
Allow to change avatar when groups are disables
Don't try to generate logs for chunking paths
@MorrisJobke

Copy link
Copy Markdown
Member

cc @nextcloud/designers

@MorrisJobkeMorrisJobke added 3. to review Waiting for reviews design Design, UI, UX, etc. labels Jun 7, 2017
nextcloud-botand others added 9 commits June 8, 2017 00:08
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
…e users email address
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
show input fields if they are not empty but disable them in global scale mode
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Signed-off-by: Artem Anufrij <artem.anufrij@live.de>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
MorrisJobkeand others added 13 commits June 13, 2017 10:30
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
…escaping
Fix escaping of user and group names in "shared by" message
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Signed-off-by: Joas Schilling <coding@schilljs.com>
…h-auth-headers-for-clients-that-dont-follow-specs
Prevent sending second WWW-Authenticate header
Revert "allow admin to disable groups on personal page"
Better error message on invalid sharing link
Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
@MorrisJobke

Copy link
Copy Markdown
Member

@pixelipo Could I ask you to resolve the conflict?

MorrisJobkeand others added 4 commits June 13, 2017 18:11
…oppatches_to_birthday_calendar
allow PropPatch requests to contact_birthdays
…al-dir-from-encryption
don't try to encrypt/decrypt the certificate bundle
…avauth-check
remove check, user_webdavauth is not an app anymore for long
@jancborchardt

Copy link
Copy Markdown
Member

We need to check this with theming also cc @nextcloud/theming

#header .logo-icon {
#header .logo {
background-image: url(#{$image-logo});
@if $theming-logo-mime != '' {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That should not be removed, otherwise we have #4585 again.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah … when seeing the "contain" I was reminded of something too :D

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, if we want to limit this logo to 175px, as is defined here, than the solution would be to simply change the width of the .logo element. Why is it set to 252px if it never fills that space?

@codecov

codecovBot commented Jun 14, 2017

Copy link
Copy Markdown

Codecov Report

Merging #5288 into master will increase coverage by <.01%.
The diff coverage is 0%.

@@ Coverage Diff @@## master #5288 +/- ##
============================================
+ Coverage 54.16% 54.16% +<.01% 
Complexity 22311 22311 ============================================
Files 1380 1380 Lines 85406 85406 Branches 1321 1321 ============================================
+ Hits 46257 46259 +2 + Misses 39149 39147 -2
Impacted FilesCoverage ΔComplexity Δ
apps/files_sharing/templates/public.php0% <0%> (ø)0 <0> (ø)⬇️
apps/federatedfilesharing/settings-personal.php0% <0%> (ø)0 <0> (ø)⬇️
core/templates/layout.user.php0% <0%> (ø)0 <0> (ø)⬇️
apps/comments/lib/EventHandler.php87.5% <0%> (+8.33%)7% <0%> (ø)⬇️

@pixelipo

Copy link
Copy Markdown
ContributorAuthor

@MorrisJobke I just managed to royally screw up this PR while attempting a rebase 👎

I guess I'll have to create a new one...

@jancborchardt

Copy link
Copy Markdown
Member

@pixelipo happens to all of us sometimes. ;) It's always best to test the rebase locally, then in case it's broken the last good version is still in the main repository. :)

@juliusknorr

Copy link
Copy Markdown
Member

@pixelipo You should be able to just create a new branch from master and run git cherry-pick de9088d to pick the commit from this PR.

@pixelipo

Copy link
Copy Markdown
ContributorAuthor

Replaced by #5407@juliushaertl@jancborchardt please review over there

@pixelipo
pixelipo deleted the simplify-logo branch June 14, 2017 11:13
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsdesignDesign, UI, UX, etc.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

18 participants

@pixelipo@MorrisJobke@jancborchardt@juliusknorr@nickvergessen@mjmunger@blizzz@rakekniven@schiessle@nextcloud-bot@georgehrke@artemanufrij@danxuliu@LukasReschke@MariusBluem@m4dz@icewind1991@patschi