Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix AdBlock blocking share icon #417

Merged
merged 2 commits into from
Apr 30, 2017
Merged

Fix AdBlock blocking share icon #417

merged 2 commits into from
Apr 30, 2017

Conversation

jancborchardt
Copy link
Member

@jancborchardt jancborchardt commented Apr 12, 2017

Same as nextcloud/server#4337, but for the share icons in the Calendar.

Please review @kumzugloom @Pommesumdreher @MariusBluem @Bullnados @GetBoz @georgehrke @MariusBluem :)

@jancborchardt jancborchardt added 3. to review Waiting for reviews bug design Related to design, interface, interaction design, UX, etc. labels Apr 12, 2017
@jancborchardt jancborchardt added this to the 1.6.0-current milestone Apr 12, 2017
@mention-bot
Copy link

@jancborchardt, thanks for your PR! By analyzing the history of the files in this pull request, we identified @georgehrke, @tcitworld and @raghunayyar to be potential reviewers.

@ryanbr
Copy link

ryanbr commented Apr 14, 2017

Given the domains for this tool changes, no way to cover all instances. If nextcloud has changed the element from icon-share to icon-shared? does that fix it?

@@ -49,7 +49,7 @@
ng-class="{'withitems': item.calendar.isShared() || item.calendar.isPublished() }">
<span
class="calendarlist-icon share permanent"
ng-class="{'icon-shared': item.calendar.isShared() && !item.calendar.isPublished(), 'icon-public': item.calendar.isPublished(), 'icon-share': !item.calendar.isShared() && !item.calendar.isPublished()}"
ng-class="{'icon-shared': item.calendar.isShared() && !item.calendar.isPublished(), 'icon-public': item.calendar.isPublished(), 'icon-shared': !item.calendar.isShared() && !item.calendar.isPublished()}"
Copy link
Member

Choose a reason for hiding this comment

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

now the key exists twice

Copy link
Member Author

Choose a reason for hiding this comment

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

@georgehrke could you please look into this? The images share.svg and shared.svg are exactly the same. They if shared or not should only differ in opacity of the icon, like in Files.

@georgehrke georgehrke self-assigned this Apr 19, 2017
@jancborchardt
Copy link
Member Author

@georgehrke @raghunayyar can you check this out so it’s ready for Nextcloud 12? :)

@jancborchardt
Copy link
Member Author

@georgehrke
Copy link
Member

georgehrke commented Apr 26, 2017 via email

@jancborchardt
Copy link
Member Author

I know, still it’s good practice do do this as early as possible. ;)

jancborchardt and others added 2 commits April 30, 2017 16:43
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
@georgehrke
Copy link
Member

Fixed the styles:
calendar - nextcloud chromium today at 4 42 14 pm

@georgehrke georgehrke modified the milestones: 1.5.3-next-maintenance, 1.6.0-current Apr 30, 2017
@georgehrke georgehrke merged commit ec27306 into master Apr 30, 2017
@georgehrke georgehrke deleted the fix-adblock-share-icon branch April 30, 2017 15:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews bug design Related to design, interface, interaction design, UX, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants