Merge branch 'main' of https://github.com/VedaWebProject/Tekst

Author: bkis

.github/renovate.json

@@ -2,7 +2,7 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:recommended",
-    "schedule:daily",
+    "schedule:weekly",
     "schedule:automergeDaily"
   ],
   "baseBranches": ["main"],

Tekst-API/openapi.json

@@ -14992,6 +14992,12 @@
             "description": "Show location aliases in browse view",
             "default": true
           },
+          "browseBarUsesTextColor": {
+            "type": "boolean",
+            "title": "Browsebarusestextcolor",
+            "description": "Use current working text's accent color for browse toolbar",
+            "default": false
+          },
           "uiColor": {
             "type": "string",
             "format": "color",
@@ -15274,6 +15280,19 @@
             "description": "Show location aliases in browse view",
             "optionalNullable": false
           },
+          "browseBarUsesTextColor": {
+            "anyOf": [
+              {
+                "type": "boolean"
+              },
+              {
+                "type": "null"
+              }
+            ],
+            "title": "Browsebarusestextcolor",
+            "description": "Use current working text's accent color for browse toolbar",
+            "optionalNullable": false
+          },
           "uiColor": {
             "anyOf": [
               {

Tekst-API/tekst/models/platform.py

@@ -200,6 +200,13 @@ class PlatformState(ModelBase, ModelFactoryMixin):
         ),
     ] = True
 
+    browse_bar_uses_text_color: Annotated[
+        bool,
+        Field(
+            description="Use current working text's accent color for browse toolbar",
+        ),
+    ] = False
+
     ui_color: Annotated[
         Color,
         ColorSerializer,

Tekst-Web/i18n/ui/deDE.yml

@@ -363,6 +363,7 @@ models:
     showResourceCategoryHeadings: Zeige Überschriften für Kategorien
     prioritizeBrowseLevelResources: Platziere Ressourcen der aktuellen Ebene vor anderen (innerhalb ihrer Kategorien)
     showLocationAliases: Zeige Belegstellen-Aliase
+    browseBarUsesTextColor: Färbe Toolbar der Lese-Ansicht in der Farbe des aktuellen Arbeitstextes
     denyResourceTypes: Erstellung dieser Ressourcentypen nur Administratoren erlauben
     fonts: Benutzer*innendefinierte Schritarten
     uiFont: UI-Schriftart

Tekst-Web/i18n/ui/enUS.yml

@@ -359,6 +359,7 @@ models:
     showResourceCategoryHeadings: Show category headings
     prioritizeBrowseLevelResources: Place resources of current browse level before others (inside their category)
     showLocationAliases: Show location aliases
+    browseBarUsesTextColor: Use current working text's accent color for browse toolbar
     denyResourceTypes: Allow creation of these resource types for administrators only
     fonts: Custom Fonts
     uiFont: User Interface Font

Tekst-Web/src/api/schema.d.ts

@@ -4882,6 +4882,12 @@ export interface components {
        * @default true
        */
       showLocationAliases: boolean;
+      /**
+       * Browsebarusestextcolor
+       * @description Use current working text's accent color for browse toolbar
+       * @default false
+       */
+      browseBarUsesTextColor: boolean;
       /**
        * Uicolor
        * Format: color
@@ -5001,6 +5007,11 @@ export interface components {
        * @description Show location aliases in browse view
        */
       showLocationAliases?: boolean;
+      /**
+       * Browsebarusestextcolor
+       * @description Use current working text's accent color for browse toolbar
+       */
+      browseBarUsesTextColor?: boolean;
       /**
        * Uicolor
        * @description Primary color used in for client UI

Tekst-Web/src/assets/main.css

@@ -383,7 +383,7 @@ table td {
 }
 
 .divided {
-  border-bottom: 1px solid var(--main-bg-color);
+  border-bottom: 1px solid var(--primary-color);
   margin-bottom: var(--gap-md) !important;
 }
 

Tekst-Web/src/components/browse/BookmarksWidget.vue

@@ -86,7 +86,8 @@ async function handleWidgetClick() {
 
 <template>
   <n-button
-    type="primary"
+    quaternary
+    color="var(--base-color)"
     :size="buttonSize"
     :focusable="false"
     :title="$t('browse.bookmarks.bookmarks')"

Tekst-Web/src/components/browse/BrowseLocationControls.vue

@@ -53,7 +53,8 @@ whenever(ArrowRight, () => {
   <!-- text location toolbar buttons -->
   <n-flex justify="space-between" align="center" :wrap="false">
     <n-button
-      type="primary"
+      quaternary
+      color="var(--base-color)"
       :focusable="false"
       :title="$t('browse.toolbar.tipPreviousLocation')"
       :size="buttonSize"
@@ -68,7 +69,8 @@ whenever(ArrowRight, () => {
 
     <n-badge value="!" :show="!browse.isOnDefaultLevel && !browse.loadingLocationData">
       <n-button
-        type="primary"
+        quaternary
+        color="var(--base-color)"
         :title="
           $t('browse.toolbar.tipSelectLocation') +
           (!browse.isOnDefaultLevel ? ' (' + $t('browse.toolbar.tipNotOnDefaultLevel') + ')' : '')
@@ -87,7 +89,8 @@ whenever(ArrowRight, () => {
     <bookmarks-widget v-if="!!auth.user" :button-size="buttonSize" />
 
     <n-button
-      type="primary"
+      quaternary
+      color="var(--base-color)"
       :focusable="false"
       :title="$t('browse.toolbar.tipNextLocation')"
       :size="buttonSize"

Tekst-Web/src/components/browse/BrowseSearchResultsToolbar.vue

@@ -8,7 +8,7 @@ import {
   SkipNextIcon,
   SkipPreviousIcon,
 } from '@/icons';
-import { useBrowseStore, useSearchStore } from '@/stores';
+import { useBrowseStore, useSearchStore, useStateStore, useThemeStore } from '@/stores';
 import { NBadge, NButton, NFlex, NIcon } from 'naive-ui';
 import { computed, onMounted } from 'vue';
 
@@ -22,8 +22,16 @@ withDefaults(
   }
 );
 
+const state = useStateStore();
 const browse = useBrowseStore();
 const search = useSearchStore();
+const theme = useThemeStore();
+
+const bgColor = computed(() =>
+  !!state.pf?.state.browseBarUsesTextColor
+    ? theme.getTextColors().fade4
+    : 'var(--primary-color-fade4)'
+);
 
 const resultNo = computed(
   () =>
@@ -70,7 +78,13 @@ onMounted(() => {
 
 <template>
   <div v-if="search.browseHits" class="bsr-container">
-    <n-flex justify="space-between" align="center" :wrap="false" class="bsr-toolbar">
+    <n-flex
+      justify="space-between"
+      align="center"
+      :wrap="false"
+      class="bsr-toolbar"
+      :style="{ backgroundColor: bgColor }"
+    >
       <n-flex :wrap="false">
         <!-- skip to previous search result -->
         <n-button
@@ -189,7 +203,6 @@ onMounted(() => {
 
 .bsr-toolbar {
   padding: var(--gap-sm);
-  background-color: var(--primary-color-fade3);
   border-bottom-left-radius: var(--border-radius);
   border-bottom-right-radius: var(--border-radius);
 }