Merge remote-tracking branch 'upstream/master' into whiteboards

This commit is contained in:
Peng Xiao
2022-09-01 10:29:29 +08:00
121 changed files with 6780 additions and 2084 deletions

View File

@@ -210,7 +210,7 @@
margin: 0 6px;
}
.is-mac.is-electron :is(.cp__header, .cp__right-sidebar-topbar) :is(button, .button, a) {
.is-mac.is-electron :is(.cp__header, .cp__right-sidebar-topbar) :is(button, .button, a):not(.file-sync-item) {
cursor: default !important;
}
@@ -317,12 +317,8 @@ html.is-native-iphone {
--ls-headbar-inner-top-padding: 36px;
.left-sidebar-inner {
> .wrap {
padding-top: 12px;
}
.new-page {
padding-bottom: 12px;
padding-bottom: 32px;
}
}