Skip to content

Port sidebar icon to material #981

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.

Sign up for GitHub

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

Closed
CarlSchwan wants to merge 1 commit into from
Closed

Port sidebar icon to material #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/activity-sidebar.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/activity-sidebar.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ import { translate as t, translatePlural as n } from '@nextcloud/l10n'

import ActivityTab from './views/ActivityTab.vue'

import LightningBolt from 'vue-material-design-icons/LightningBolt.vue'

Vue.prototype.t = t
Vue.prototype.n = n

Expand All @@ -35,7 +37,7 @@ let ActivityTabInstance = null
const activityTab = new OCA.Files.Sidebar.Tab({
id: 'activity',
name: t('activity', 'Activity'),
icon: 'icon-activity',
icon: LightningBolt,
Copy link
Collaborator

@artonge artonge Oct 26, 2022

Choose a reason for hiding this comment

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

Sexy, didn't we could do that :)

Copy link
Member

@skjnldsv skjnldsv Oct 26, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Don't get too excited, this is a bad approach I regret implementing 🙈
We can have conflicts in vue template compilation versions between those renders methods

Copy link
Member

@skjnldsv skjnldsv Oct 26, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

The real good way is to import the icon as svg, similarly.
Then we can render the svg inline with sanitization. And forcing the same color="currentColor" trick the vue-material-design-icons is doing 😉

Copy link
Member

@skjnldsv skjnldsv Oct 26, 2022

Choose a reason for hiding this comment

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

Oh wait, I thought that was my code @CarlSchwan
https://github.com/nextcloud/server/pull/34769/files#diff-91cd7c7f024a3f52536789f769ad017e1b60f17806d42a8342f19f67caaee4ee

I also did that in other locations 😁

Copy link
Member Author

@CarlSchwan CarlSchwan Oct 27, 2022

Choose a reason for hiding this comment

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

@skjnldsv is there a good way to import material icons as svg? or do we end up copying the svg in a bunch of places?

Copy link
Member

@skjnldsv skjnldsv Oct 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

No it's as easy as what you're doing here :)
Just use the official material design icon
nextcloud-libraries/nextcloud-upload#444 (comment)

import FolderPlus from '@mdi/svg/svg/folder-plus.svg'


async mount(el, fileInfo, context) {
if (ActivityTabInstance) {
Expand Down