Skip to content

Fix missing clipboard icon in shared links - #8032

Merged
MorrisJobke merged 1 commit into
masterfrom
fix-missing-clipboard-icon-in-shared-links
Jan 24, 2018
Merged

Fix missing clipboard icon in shared links#8032
MorrisJobke merged 1 commit into
masterfrom
fix-missing-clipboard-icon-in-shared-links

Conversation

@danxuliu

Copy link
Copy Markdown
Member

This pull request fixesa regression introduced in #7476 when fixing a regression introduced in #7064 (Inception is a great movie, by the way :-P ).

In #7064a padding of 0 was removed from menu items; as the padding of the Copy menu item was no longer forced to 0 it ended with a large padding.

This was fixed in #7476 by removing all the padding from the clipboard icon, but as the padding (and other CSS rules) were removed also when the clipboard icon was not in the menu it was no longer properly shown in the link input field.

This pull request restores the CSS rules when the clipboard icon is shown in the link input field and also forces the padding to 0 when it is in the menu, which causes the icon to be shown as expected in both cases (and I hope that I have not inadvertently introduced yet another regression :-P ).

@nextcloud/designers

The clipboard icon in shared links appears either directly on the link
input field or, if any social sharing app is enabled, in a menu. The
clipboard icon uses the same CSS rules as other icons (like the
information icon) to be posioned on the end of the input field, and
those rules have to be "cancelled" when the icon is shown in the menu.
Fixes#7990
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliudanxuliu added this to the Nextcloud 14 milestone Jan 24, 2018

@rullzerrullzer left a comment

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.

Works!

@danxuliudanxuliu mentioned this pull request Jan 24, 2018
@codecov

codecovBot commented Jan 24, 2018

Copy link
Copy Markdown

Codecov Report

Merging #8032 into master will increase coverage by 0.16%.
The diff coverage is n/a.

@@ Coverage Diff @@## master #8032 +/- ##
============================================
+ Coverage 51.22% 51.39% +0.16% + Complexity 24865 24862 -3 
============================================
Files 1598 1590 -8 Lines 94922 94591 -331 Branches 1376 1376 ============================================
- Hits 48626 48614 -12 + Misses 46296 45977 -319
Impacted FilesCoverage ΔComplexity Δ
apps/federation/lib/AppInfo/Application.php
...les_sharing/lib/Middleware/ShareInfoMiddleware.php
apps/files_sharing/templates/authenticate.php
apps/dav/lib/CalDAV/PublicCalendarObject.php
apps/files/lib/App.php
...files_external/lib/Lib/Notify/SMBNotifyHandler.php
apps/dav/lib/CardDAV/AddressBookRoot.php
lib/private/Search.php
core/js/files/fileinfo.js
apps/files_external/lib/Lib/Auth/AuthMechanism.php
... and 3178 more

@MorrisJobkeMorrisJobke mentioned this pull request Jan 24, 2018
5 tasks
@MorrisJobke
MorrisJobke merged commit e0b329c into masterJan 24, 2018
@MorrisJobke
MorrisJobke deleted the fix-missing-clipboard-icon-in-shared-links branch January 24, 2018 16:27
@MorrisJobke

Copy link
Copy Markdown
Member

Let me do the backport.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbugdesignDesign, UI, UX, etc.regression

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Clippy icon missing?

3 participants

@danxuliu@MorrisJobke@rullzer