Merge branch '2024.11'

tine-groupware · Jan 29, 2025 · ca4b5e1 · ca4b5e1
2 parents 7199e0e + 57af33e
commit ca4b5e1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/tine20/Tinebase/js/widgets/dialog/vue/PasswordDialog/PasswordDialog.vue b/tine20/Tinebase/js/widgets/dialog/vue/PasswordDialog/PasswordDialog.vue
@@ -22,7 +22,7 @@
     <BButton
       v-if="hasPwGen"
       @click="onPWGenClick"
-      variant="outline-primary"
+      variant="primary"
       class="mb-2"
     >{{ window.i18n._('Generate password') }}</BButton>
   </div>

diff --git a/tine20/Tinebase/js/widgets/dialog/vue/components/PasswordField.vue b/tine20/Tinebase/js/widgets/dialog/vue/components/PasswordField.vue
@@ -33,15 +33,15 @@
           variant="outline-primary"
           :title="window.formatMessage('Cleartext/Hidden')"
         >
-          <img v-if="_locked" src="images/icon-set/icon_preview.svg" alt="copy-to-clipboard" :style="{width: '1.5em'}" class="enlarge-on-hover shrink-on-click">
-          <img v-else src="images/icon-set/icon_preview_disabled.svg" alt="copy-to-clipboard" :style="{width: '1.5em'}" class="enlarge-on-hover shrink-on-click">
+          <img v-if="_locked" src="images/icon-set/icon_preview.svg" alt="copy-to-clipboard" :style="{width: '1.5em'}" class="enlarge-on-hover shrink-on-click dark-reverse">
+          <img v-else src="images/icon-set/icon_preview_disabled.svg" alt="copy-to-clipboard" :style="{width: '1.5em'}" class="enlarge-on-hover shrink-on-click dark-reverse">
         </BInputGroupText>
         <BInputGroupText
           v-if="clipboard"
           @click="handleCopy"
           :title="window.formatMessage('Copy to Clipboard')"
         >
-          <img src="images/icon-set/icon_copy_to_clipboard.svg" alt="copy-to-clipboard" :style="{width: '1.4em'}" class="enlarge-on-hover shrink-on-click">
+          <img src="images/icon-set/icon_copy_to_clipboard.svg" alt="copy-to-clipboard" :style="{width: '1.4em'}" class="enlarge-on-hover shrink-on-click dark-reverse">
         </BInputGroupText>
       </BInputGroupAppend>
     </BInputGroup>

diff --git a/tine20/images/icon-set b/tine20/images/icon-set
+13 −0		Icon_inner-menu-arrow-left.svg
+13 −0		Icon_inner-menu-arrow-right.svg
+11 −0		Icon_inner-menu-bullets-horizontal.svg
+11 −0		Icon_inner-menu-bullets-vertical.svg