Skip to content

Include scss style in webpack output #1209

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

Merged
nickvergessen merged 1 commit into from
Jun 2, 2022
Merged

Include scss style in webpack output #1209

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/notifications-main.js
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion lib/Listener/BeforeTemplateRenderedListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,5 @@ public function handle(Event $event): void {
);

Util::addScript('notifications', 'notifications-main');
Util::addStyle('notifications', 'styles');
}
}
1 change: 1 addition & 0 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import Vue from 'vue'
import NotificationsApp from './NotificationsApp.vue'

// Styles
import './styles/styles.scss'
import '@nextcloud/dialogs/styles/toast.scss'

Vue.prototype.t = t
Expand Down
25 changes: 9 additions & 16 deletions css/styles.scss → src/styles/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,6 @@
flex-direction: column;
}

.emptycontent {
padding: 50px 0;
margin: 0;

@include icon-black-white('notifications', 'notifications', 1);
}

Comment on lines -64 to -70
Copy link
Contributor Author

@artonge artonge Jun 2, 2022

Choose a reason for hiding this comment

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

Useless as we use vue component for that

.dismiss-all {
display: flex;
justify-content: center;
Expand Down Expand Up @@ -196,18 +189,18 @@
&:active {
box-shadow: 0 0 0 2px var(--color-main-text);
}
}

&--tabbed {
box-shadow: 0 0 0 2px var(--color-main-text);
background-color: var(--color-primary-light-hover);
&--tabbed:not(.primary) {
box-shadow: 0 0 0 2px var(--color-main-text);
background-color: var(--color-primary-light-hover);

&.button-vue--vue-primary {
background-color: var(--color-primary-hover);
}
&.button-vue--vue-primary {
background-color: var(--color-primary-hover);
}

&.button-vue--vue-secondary {
box-shadow: 0 0 0 2px var(--color-main-text);
}
&.button-vue--vue-secondary {
box-shadow: 0 0 0 2px var(--color-main-text);
}
}

Expand Down