Merge pull request #219 from Progress1/dark_fix

Dark theme fix (bad colors)
SK-CERT · Mar 7, 2024 · 5fce1bf · 5fce1bf
2 parents 1e9d75a + 3888781
commit 5fce1bf
Show file tree

Hide file tree

Showing 26 changed files with 294 additions and 810 deletions.
diff --git a/src/gui/src/assets/centralize.css b/src/gui/src/assets/centralize.css
diff --git a/src/gui/src/assets/common.css b/src/gui/src/assets/common.css
@@ -56,4 +56,8 @@
 .valueHolder:hover {
     background-color: #f8f8f8;
     box-shadow: -3px 0 0 #6abef2;
-}
+}
+
+#app.theme--dark .valueHolder:hover {
+    background-color: #252931;
+}
diff --git a/src/gui/src/components/UserSettings.vue b/src/gui/src/components/UserSettings.vue
@@ -68,7 +68,7 @@
                                 >
 
                                     <template v-slot:top>
-                                        <v-toolbar flat color="white">
+                                        <v-toolbar flat>
                                             <v-toolbar-title>{{$t('osint_source.word_lists')}}</v-toolbar-title>
                                         </v-toolbar>
                                     </template>
@@ -84,8 +84,7 @@
                                     <v-tooltip top v-for="shortcut in shortcuts" :key="shortcut.alias">
                                         <template v-slot:activator="{on}">
                                             <v-btn  :id=shortcut.alias v-on="on"
-                                                    class="blue lighten-5 ma-1" style="width: calc(100% / 3 - 8px);"
-                                                    text
+                                                    class="ma-1" style="width: calc(100% / 3 - 8px);"
                                                     @click.stop="pressKeyDialog(shortcut.alias)"
                                                     @blur="pressKeyVisible = false"
                                             >

diff --git a/src/gui/src/components/assess/NewsItemAggregateDetail.vue b/src/gui/src/components/assess/NewsItemAggregateDetail.vue
@@ -67,7 +67,7 @@
                                 ref="assessAggregateDetailComments"
                                 v-model="editorData"
                                 :editorOptions="editorOptionVue2"
-                        />
+                        ></vue-editor>
                     </v-tab-item>
 
                 </v-tabs>
@@ -88,24 +88,13 @@
     import { VueEditor } from 'vue2-editor';
 
     const toolbarOptions = [
-        ['bold', 'italic', 'underline', 'strike'],        // toggled buttons
-        ['blockquote', 'code-block'],
-
-        [{ 'header': 1 }, { 'header': 2 }],               // custom button values
-        [{ 'list': 'ordered'}, { 'list': 'bullet' }],
-        [{ 'script':'sub'}, { 'script': 'super' }],      // superscript/subscript
-        [{ 'indent': '-1'}, { 'indent': '+1' }],          // outdent/indent
-        [{ 'direction': 'rtl' }],                         // text direction
-
-        [{ 'size': ['small', false, 'large', 'huge'] }],  // custom dropdown
-        [{ 'header': [1, 2, 3, 4, 5, 6, false] }],
-
-        [{ 'color': [] }, { 'background': [] }],          // dropdown with defaults from theme
-        [{ 'font': [] }],
-        [{ 'align': [] }],
-
-        ['clean'],                                         // remove formatting button
-        ['link', 'image', 'video']
+        ['bold', 'italic', 'underline', 'strike', { 'script': 'sub' }, { 'script': 'super' },
+            'blockquote', 'code-block', 'clean'],
+        [{ align: "" }, { align: "center" }, { align: "right" }, { align: "justify" }],
+        [{ 'list': 'ordered' }, { 'list': 'bullet' }, { 'indent': '-1' }, { 'indent': '+1' }],
+        [{ 'size': ['small', false, 'large', 'huge'] }, { 'header': [1, 2, 3, 4, 5, 6, false] },
+            { 'color': [] }, { 'background': [] }],
+        ['link', 'image'],
     ];
 
     export default {