Merge branch 'master' into enhance/undo-redo

This commit is contained in:
Tienson Qin
2021-01-12 05:12:32 -08:00
committed by GitHub
11 changed files with 108 additions and 26 deletions

View File

@@ -1,6 +1,16 @@
.blocks-container {
}
.block-control,
.block-control:hover {
text-decoration: none;
cursor: pointer;
font-size: 14px;
min-width: 10px;
color: initial;
user-select: none;
}
.block-content {
min-height: 24px;
max-width: 100%;
@@ -12,6 +22,7 @@
max-width: 100%;
/* FIXME: img macros */
&.left {
float: left;
}
@@ -201,8 +212,8 @@
.bullet-container {
display: flex;
height: 13px;
width: 13px;
height: 12px;
width: 12px;
border-radius: 50%;
justify-content: center;
align-items: center;
@@ -213,9 +224,16 @@
.bullet {
border-radius: 50%;
width: 5px;
height: 5px;
width: 6px;
height: 6px;
background-color: var(--ls-block-bullet-color, #394b59);
transition: transform .2s;
}
&:hover {
.bullet {
transform: scale(1.2);
}
}
&.bullet-closed {

View File

@@ -42,6 +42,14 @@
}
}
.is-mobile {
.absolute-modal {
&.is-overflow-vw-x {
transform: translateX(-1%);
}
}
}
.non-block-editor textarea,
pre {
display: block;

View File

@@ -237,8 +237,8 @@
[:tr [:td (t :help/new-line-in-block)] [:td "Shift-Enter"]]
[:tr [:td (t :undo)] [:td (util/->platform-shortcut "Ctrl-z")]]
[:tr [:td (t :redo)] [:td (util/->platform-shortcut "Ctrl-y")]]
[:tr [:td (t :help/zoom-in)] [:td (util/->platform-shortcut "Alt-Right")]]
[:tr [:td (t :help/zoom-out)] [:td (util/->platform-shortcut "Alt-left")]]
[:tr [:td (t :help/zoom-in)] [:td (util/->platform-shortcut (if util/mac? "Alt-." "Alt-Right"))]]
[:tr [:td (t :help/zoom-out)] [:td (util/->platform-shortcut (if util/mac? "Alt-," "Alt-left"))]]
[:tr [:td (t :help/follow-link-under-cursor)] [:td (util/->platform-shortcut "Ctrl-o")]]
[:tr [:td (t :help/open-link-in-sidebar)] [:td (util/->platform-shortcut "Ctrl-shift-o")]]
[:tr [:td (t :expand)] [:td (util/->platform-shortcut "Ctrl-Down")]]