From beace1be7adb3cd91b5aae7b8e60ca3ae91dab23 Mon Sep 17 00:00:00 2001 From: Konstantinos Kaloutas Date: Fri, 28 Jul 2023 13:42:14 +0300 Subject: [PATCH 1/3] fix: remove outdated styles (resolves #9940) --- resources/css/common.css | 9 --------- 1 file changed, 9 deletions(-) diff --git a/resources/css/common.css b/resources/css/common.css index cbe59305a79..d49ca8b72bb 100644 --- a/resources/css/common.css +++ b/resources/css/common.css @@ -837,15 +837,6 @@ a.tooltip-priority { font-size: 13px; } -/* excalidraw */ -.Island > div > div > div { - width: 44px; -} - -.excalidraw hr { - margin: 0; -} - .text-link { color: var(--ls-primary-text-color); } From fb5efd4a23e8f065f7c1731cba947a0db315d57e Mon Sep 17 00:00:00 2001 From: Andelf Date: Sun, 30 Jul 2023 16:10:46 +0800 Subject: [PATCH 2/3] chore(deps): update diff-merge --- ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index fadebc95af0..dd1d1752a14 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -519,7 +519,7 @@ INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.9.11; + MARKETING_VERSION = 0.9.12; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -546,7 +546,7 @@ INFOPLIST_FILE = App/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 0.9.11; + MARKETING_VERSION = 0.9.12; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; @@ -571,7 +571,7 @@ INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 0.9.11; + MARKETING_VERSION = 0.9.12; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController; @@ -598,7 +598,7 @@ INFOPLIST_KEY_NSHumanReadableCopyright = ""; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 0.9.11; + MARKETING_VERSION = 0.9.12; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.logseq.logseq.ShareViewController; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/package.json b/package.json index b5549318767..a8426a0fb8a 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@excalidraw/excalidraw": "0.12.0", "@hugotomazi/capacitor-navigation-bar": "^2.0.0", "@logseq/capacitor-file-sync": "0.0.32", - "@logseq/diff-merge": "0.1.0", + "@logseq/diff-merge": "0.2.0", "@logseq/react-tweet-embed": "1.3.1-1", "@radix-ui/colors": "^0.1.8", "@sentry/react": "^6.18.2", diff --git a/yarn.lock b/yarn.lock index 5d0f8edcb49..f99a93177ae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -496,10 +496,10 @@ resolved "https://registry.yarnpkg.com/@logseq/capacitor-file-sync/-/capacitor-file-sync-0.0.32.tgz#fcb978e5e62f1b61a8ac22e57d5e96a39adffa7a" integrity sha512-WA0O+NAHJkZZTXqCRDXFRW9VNADsXJXBoMGuMnPimenxoZimpqgX3awT30AcIWxRppLz/H9vFumQyZF10rojTA== -"@logseq/diff-merge@0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@logseq/diff-merge/-/diff-merge-0.1.0.tgz#fca282e3ff7c256a1f447d0463d78fb23ebee1d9" - integrity sha512-VNAJI7Mo/xHEw2LN6rpoWf/BbVfsC1wRpyyLbvm1jQbRxcwRgqYwWkSIVS0t1wswquDS64ZolJkCIFXeNXQbTA== +"@logseq/diff-merge@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@logseq/diff-merge/-/diff-merge-0.2.0.tgz#be52ad3c6f44a34d115eb9030f9cc8a42fd57f99" + integrity sha512-6fM9CeAU5NBzXv5lQQcx6ehr0nfsAwswX0XhFKyyGmrL8BySxxKTuArejaCRhI8IJu2fTT50YK+kQucVWeVcxw== "@logseq/react-tweet-embed@1.3.1-1": version "1.3.1-1" From 49a1f1536a46b44ac304fce19c6d1dfb55381366 Mon Sep 17 00:00:00 2001 From: Andelf Date: Mon, 31 Jul 2023 01:32:22 +0800 Subject: [PATCH 3/3] chore(deps): update diff-merge v0.2.2 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a8426a0fb8a..71c3b49072e 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "@excalidraw/excalidraw": "0.12.0", "@hugotomazi/capacitor-navigation-bar": "^2.0.0", "@logseq/capacitor-file-sync": "0.0.32", - "@logseq/diff-merge": "0.2.0", + "@logseq/diff-merge": "0.2.2", "@logseq/react-tweet-embed": "1.3.1-1", "@radix-ui/colors": "^0.1.8", "@sentry/react": "^6.18.2", diff --git a/yarn.lock b/yarn.lock index f99a93177ae..d78b5a4d733 100644 --- a/yarn.lock +++ b/yarn.lock @@ -496,10 +496,10 @@ resolved "https://registry.yarnpkg.com/@logseq/capacitor-file-sync/-/capacitor-file-sync-0.0.32.tgz#fcb978e5e62f1b61a8ac22e57d5e96a39adffa7a" integrity sha512-WA0O+NAHJkZZTXqCRDXFRW9VNADsXJXBoMGuMnPimenxoZimpqgX3awT30AcIWxRppLz/H9vFumQyZF10rojTA== -"@logseq/diff-merge@0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@logseq/diff-merge/-/diff-merge-0.2.0.tgz#be52ad3c6f44a34d115eb9030f9cc8a42fd57f99" - integrity sha512-6fM9CeAU5NBzXv5lQQcx6ehr0nfsAwswX0XhFKyyGmrL8BySxxKTuArejaCRhI8IJu2fTT50YK+kQucVWeVcxw== +"@logseq/diff-merge@0.2.2": + version "0.2.2" + resolved "https://registry.yarnpkg.com/@logseq/diff-merge/-/diff-merge-0.2.2.tgz#583bd8c8c66d5ff05ea70906475efaa078e839a3" + integrity sha512-0WeKNhq8PsjvunOqNEd9aSM4tgiClwhonXgXzrQ4KYj8VoyLaEAyEWWGOAoE7mwR+aqwM+bMB4MxuNFywnUb8A== "@logseq/react-tweet-embed@1.3.1-1": version "1.3.1-1"