diff --git a/css/global.css b/css/global.css
new file mode 100644
index 000000000..80a846b21
--- /dev/null
+++ b/css/global.css
@@ -0,0 +1,10 @@
+.icon-notes {
+ background-image: url(../img/notes-dark.svg);
+ filter: var(--background-invert-if-dark);
+}
+
+.icon-notes-trans {
+ background-image: url(../img/notes-trans.svg);
+ filter: var(--background-invert-if-dark);
+}
+
diff --git a/css/global.scss b/css/global.scss
deleted file mode 100644
index 0dcd63a46..000000000
--- a/css/global.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@include icon-black-white('notes', 'notes', 1);
-@include icon-black-white('notes-trans', 'notes', 1);
diff --git a/css/app-navigation.scss b/css/notes.css
similarity index 54%
rename from css/app-navigation.scss
rename to css/notes.css
index 8a0595d14..520192ff2 100644
--- a/css/app-navigation.scss
+++ b/css/notes.css
@@ -1,3 +1,10 @@
+/* workaround for https://github.com/nextcloud/nextcloud-vue/issues/1384 */
+body {
+ min-height: 100%;
+ height: auto;
+}
+
+/* App Navigation fixes */
.app-navigation-entry.category-header:not(.app-navigation-entry--opened) .app-navigation-entry__title {
font-weight: bold;
}
@@ -7,23 +14,6 @@
pointer-events: inherit;
}
-#app-navigation > ul > li.app-navigation-caption.timeslot {
- color: var(--color-text-maxcontrast);
-}
-
-/* icons for sidebar */
-.icon-files {
- @include icon-color('folder', 'notes', $color-black);
-}
-
-.icon-emptyfolder {
- @include icon-color('folder-empty', 'notes', $color-black);
-}
-
-.icon-recent {
- @include icon-color('recent', 'notes', $color-black);
-}
-
.app-navigation-entry__utils .action-item {
visibility: hidden;
}
@@ -36,3 +26,27 @@ li:focus .app-navigation-entry__utils .action-item {
visibility: visible;
}
+@media print {
+ #header,
+ .app-navigation,
+ #note-container .action-buttons,
+ #note-container .upload-button {
+ display: none !important;
+ }
+
+ .content {
+ display: block;
+ padding: 0;
+ color: #000;
+ }
+
+ #note-container .note-editor,
+ #note-container .note-preview {
+ padding: 0 !important;
+ font-size: 10pt !important;
+ }
+
+ .app-content {
+ margin-left: 0 !important;
+ }
+}
diff --git a/css/notes.scss b/css/notes.scss
deleted file mode 100644
index 02f6f1db0..000000000
--- a/css/notes.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-@import 'app-navigation';
-@import 'print';
-
-// workaround for https://github.com/nextcloud/nextcloud-vue/issues/1384
-body {
- min-height: 100%;
- height: auto;
-}
diff --git a/css/print.scss b/css/print.scss
deleted file mode 100644
index 2a473ec65..000000000
--- a/css/print.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-@media print {
- #header,
- .app-navigation,
- #note-container .action-buttons {
- display: none !important;
- }
-
- .content {
- display: block;
- padding: 0;
- color: #000;
- }
-
- #note-container .note-editor,
- #note-container .note-preview {
- padding: 0 !important;
- font-size: 10pt !important;
- }
-
- .app-content {
- margin-left: 0 !important;
- }
-}
diff --git a/img/folder-empty.svg b/img/folder-empty.svg
deleted file mode 100644
index 6fefe1d27..000000000
--- a/img/folder-empty.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/img/folder.svg b/img/folder.svg
deleted file mode 100644
index b58c3e232..000000000
--- a/img/folder.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/img/notes-dark.svg b/img/notes-dark.svg
new file mode 100644
index 000000000..beaba9e4c
--- /dev/null
+++ b/img/notes-dark.svg
@@ -0,0 +1 @@
+
diff --git a/img/notes-trans.svg b/img/notes-trans.svg
index 1850accbb..1163eb6e5 100644
--- a/img/notes-trans.svg
+++ b/img/notes-trans.svg
@@ -1 +1 @@
-
+
diff --git a/img/recent.svg b/img/recent.svg
deleted file mode 100644
index cb681fb70..000000000
--- a/img/recent.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue
index 71cd4dc7c..39ff0c06e 100644
--- a/src/components/Dashboard.vue
+++ b/src/components/Dashboard.vue
@@ -104,7 +104,7 @@ export default {
}
.note-item-favorite {
- background: var(--icon-star-dark-FC0, var(--icon-star-dark-fc0));
+ background: var(--icon-starred-yellow, var(--icon-star-dark-FC0, var(--icon-star-dark-fc0)));
}
.note-item {
diff --git a/src/components/NavigationCategoriesItem.vue b/src/components/NavigationCategoriesItem.vue
index 28c0f396c..67e134a60 100644
--- a/src/components/NavigationCategoriesItem.vue
+++ b/src/components/NavigationCategoriesItem.vue
@@ -1,18 +1,18 @@
+
+
{{ numNotes }}
@@ -21,9 +21,18 @@
+
+
{{ category.count }}
@@ -37,6 +46,10 @@ import {
AppNavigationCounter,
} from '@nextcloud/vue'
+import FolderIcon from 'vue-material-design-icons/Folder.vue'
+import FolderOutlineIcon from 'vue-material-design-icons/FolderOutline.vue'
+import HistoryIcon from 'vue-material-design-icons/History.vue'
+
import { getCategories } from '../NotesService.js'
import { categoryLabel } from '../Util.js'
import store from '../store.js'
@@ -47,6 +60,9 @@ export default {
components: {
AppNavigationItem,
AppNavigationCounter,
+ FolderIcon,
+ FolderOutlineIcon,
+ HistoryIcon,
},
props: {
diff --git a/src/components/NavigationList.vue b/src/components/NavigationList.vue
index e7e5e03c2..2ee9383b6 100644
--- a/src/components/NavigationList.vue
+++ b/src/components/NavigationList.vue
@@ -11,7 +11,6 @@
+
{{ t('notes', 'Details') }}
+
+
{{ preview ? t('notes', 'Edit') : t('notes', 'Preview') }}
+
{{ fullscreen ? t('notes', 'Exit full screen') : t('notes', 'Full screen') }}
-
+
{{ t('notes', 'Note is read-only. You cannot change it.') }}
@@ -103,8 +113,12 @@ import {
import { showError } from '@nextcloud/dialogs'
import { emit } from '@nextcloud/event-bus'
+import EditIcon from 'vue-material-design-icons/LeadPencil.vue'
+import EyeIcon from 'vue-material-design-icons/Eye.vue'
+import FullscreenIcon from 'vue-material-design-icons/Fullscreen.vue'
+import NoEditIcon from 'vue-material-design-icons/PencilOff.vue'
+import SidebarIcon from 'vue-material-design-icons/PageLayoutSidebarRight.vue'
import SyncAlertIcon from 'vue-material-design-icons/SyncAlert.vue'
-import PencilOffIcon from 'vue-material-design-icons/PencilOff.vue'
import { config } from '../config.js'
import { fetchNote, refreshNote, saveNoteManually, queueCommand, conflictSolutionLocal, conflictSolutionRemote } from '../NotesService.js'
@@ -122,8 +136,12 @@ export default {
ActionButton,
AppContent,
ConflictSolution,
+ EditIcon,
+ EyeIcon,
+ FullscreenIcon,
Modal,
- PencilOffIcon,
+ NoEditIcon,
+ SidebarIcon,
SyncAlertIcon,
TheEditor,
ThePreview,
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index f3f16b6f9..df3ffe53a 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -8,8 +8,15 @@
@close="onCloseSidebar"
>