diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less index 1ac93f0f7..6c59dcf48 100644 --- a/dev/Styles/User/MessageList.less +++ b/dev/Styles/User/MessageList.less @@ -235,7 +235,8 @@ html:not(rl-mobile) { white-space: nowrap; } - .withAttachments .attachmentParent { + .attachmentParent { + line-height: 1 !important; margin: 0 10px 0 5px; } diff --git a/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css b/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css index e1c5b2e50..4ebbba172 100644 --- a/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css +++ b/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css @@ -1,44 +1,77 @@ * { -/* Nextcloud - --color-main-text: #222; - --color-main-background: #fff; - --color-main-background-translucent: rgba(255, 255, 255, 0.97); - --gradient-main-background: var(--color-main-background) 0%, var(--color-main-background-translucent) 85%, transparent 100%; - --color-background-hover: whitesmoke; - --color-background-dark: #ededed; - --color-background-darker: #dbdbdb; - --color-placeholder-light: #e6e6e6; - --color-placeholder-dark: #ccc; - --color-primary: #0082c9; - --color-primary-hover: #339bd4; - --color-primary-light: #e6f3fa; - --color-primary-light-hover: #dce9ef; - --color-primary-text: #ffffff; - --color-primary-light-text: #0082c9; - --color-primary-text-dark: #ededed; - --color-primary-element: #0082c9; - --color-primary-element-hover: #339bd4; - --color-primary-element-light: #17adff; - --color-primary-element-lighter: #d9ecf7; - --color-error: #e9322d; - --color-error-hover: #ed5b57; - --color-warning: #eca700; - --color-warning-hover: #f0b933; - --color-success: #46ba61; - --color-success-hover: #6bc881; - --color-text-maxcontrast: #767676; - --color-text-light: #222; - --color-text-lighter: #767676; - --color-loading-light: #ccc; - --color-loading-dark: #444; - --color-box-shadow: rgba(77, 77, 77, 0.5); - --color-border: #ededed; - --color-border-dark: #dbdbdb; +/* Nextcloud 25 + --background-image-invert-if-bright: no; + --background-invert-if-bright: invert(100%); + --background-invert-if-dark: no; --border-radius: 3px; --border-radius-large: 10px; --border-radius-pill: 100px; + --breakpoint-mobile: 1024px; + --color-background-dark: #ededed; + --color-background-darker: #dbdbdb; + --color-background-hover: #f5f5f5; + --color-background-plain: #0082c9; + --color-border: #ededed; + --color-border-dark: #dbdbdb; + --color-box-shadow: rgba(var(--color-box-shadow-rgb), 0.5); + --color-box-shadow-rgb: 77,77,77; + --color-error: #e9322d; + --color-error-hover: #ed5a56; + --color-error-rgb: 233,50,45; + --color-loading-dark: #444444; + --color-loading-light: #cccccc; + --color-main-background: #ffffff; + --color-main-background-blur: rgba(var(--color-main-background-rgb), .8); + --color-main-background-rgb: 255,255,255; + --color-main-background-translucent: rgba(var(--color-main-background-rgb), .97); + --color-main-text: #222222; + --color-placeholder-dark: #cccccc; + --color-placeholder-light: #e6e6e6; + --color-primary-default: #0082c9; + --color-primary-element: #00639a; + --color-primary-element-hover: #3282ae; + --color-primary-element-light: #e5eff4; + --color-primary-element-light-hover: #dbe4e9; + --color-primary-element-light-text: #00273d; + --color-primary-element-text: #ffffff; + --color-primary-element-text-dark: #ededed; + --color-primary-hover: #3282ae; + --color-primary-light: #e5eff4; + --color-primary-light-hover: #dbe4e9; + --color-primary-light-text: #00273d; + --color-primary-text: #ffffff; + --color-primary-text-dark: #ededed; + --color-primary: #00639a; + --color-scrollbar: rgba(34,34,34, .15); + --color-success: #46ba61; + --color-success-hover: #6ac780; + --color-success-rgb: 70,186,97; + --color-text-light: #222222; + --color-text-lighter: #767676; + --color-text-maxcontrast: #767676; + --color-text-maxcontrast-background-blur: #646464; + --color-text-maxcontrast-default: #767676; + --color-warning: #eca700; + --color-warning-hover: #efb832; + --color-warning-rgb: 236,167,0; + --default-clickable-area: 44px; --default-font-size: 15px; + --default-grid-baseline: 4px; --default-line-height: 24px; + --filter-background-blur: blur(25px); + --font-face: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, sans-serif, 'Noto Color Emoji', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; + --gradient-main-background: var(--color-main-background) 0%, var(--color-main-background-translucent) 85%, transparent 100%; + --gradient-primary-background: linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-hover) 100%); + --header-height: 50px; + --header-menu-item-height: 44px; + --header-menu-profile-item-height: 66px; + --image-background: url('/nextcloud/core/img/app-background.jpg'); + --list-max-width: 300px; + --list-min-width: 200px; + --navigation-width: 300px; + --primary-invert-if-bright: no; + --sidebar-max-width: 500px; + --sidebar-min-width: 300px; */ --fontSans: var(--font-face); @@ -57,7 +90,7 @@ --warning-bg-clr: #fcf8e3; --warning-border-clr: #fbeed5; - --error-clr: #b94a48; + --error-clr: var(--color-error); --error-bg-clr: #f2dede; --error-border-clr: #eed3d7; diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php index 1a10febe7..288d4c175 100644 --- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php +++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php @@ -108,6 +108,9 @@ class SnappyMailHelper // https://github.com/the-djmaze/snappymail/issues/561#issuecomment-1301317723 // https://github.com/nextcloud/server/issues/34935#issuecomment-1302145157 require \OC::$SERVERROOT . '/version.php'; +// \OC\SystemConfig +// file_get_contents(\OC::$SERVERROOT . 'config/config.php'); +// $CONFIG['version'] if (24 < $OC_Version[0]) { $ocSession = \OC::$server->getSession(); $ocSession->reopen(); diff --git a/plugins/nextcloud/index.php b/plugins/nextcloud/index.php index 71fc30427..cdf60d4ad 100644 --- a/plugins/nextcloud/index.php +++ b/plugins/nextcloud/index.php @@ -4,8 +4,8 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin { const NAME = 'Nextcloud', - VERSION = '2.9', - RELEASE = '2022-10-29', + VERSION = '2.10', + RELEASE = '2022-11-04', CATEGORY = 'Integrations', DESCRIPTION = 'Integrate with Nextcloud v20+', REQUIRED = '2.19.0';