Skip to content

Commit 7cda89b

Browse files
committed
Include scss style in webpack output
Signed-off-by: Louis Chemineau <[email protected]>
1 parent f27995c commit 7cda89b

File tree

5 files changed

+13
-20
lines changed

5 files changed

+13
-20
lines changed

js/notifications-main.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/notifications-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Listener/BeforeTemplateRenderedListener.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,5 @@ public function handle(Event $event): void {
8585
);
8686

8787
Util::addScript('notifications', 'notifications-main');
88-
Util::addStyle('notifications', 'styles');
8988
}
9089
}

src/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import Vue from 'vue'
2222
import App from './App'
23+
import './styles/styles.scss'
2324

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

css/styles.scss renamed to src/styles/styles.scss

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,6 @@
6161
flex-direction: column;
6262
}
6363

64-
.emptycontent {
65-
padding: 50px 0;
66-
margin: 0;
67-
68-
@include icon-black-white('notifications', 'notifications', 1);
69-
}
70-
7164
.dismiss-all {
7265
display: flex;
7366
justify-content: center;
@@ -196,18 +189,18 @@
196189
&:active {
197190
box-shadow: 0 0 0 2px var(--color-main-text);
198191
}
192+
}
199193

200-
&--tabbed {
201-
box-shadow: 0 0 0 2px var(--color-main-text);
202-
background-color: var(--color-primary-light-hover);
194+
&--tabbed:not(.primary) {
195+
box-shadow: 0 0 0 2px var(--color-main-text);
196+
background-color: var(--color-primary-light-hover);
203197

204-
&.button-vue--vue-primary {
205-
background-color: var(--color-primary-hover);
206-
}
198+
&.button-vue--vue-primary {
199+
background-color: var(--color-primary-hover);
200+
}
207201

208-
&.button-vue--vue-secondary {
209-
box-shadow: 0 0 0 2px var(--color-main-text);
210-
}
202+
&.button-vue--vue-secondary {
203+
box-shadow: 0 0 0 2px var(--color-main-text);
211204
}
212205
}
213206

0 commit comments

Comments
 (0)