Merge branch 'main' into undefined_quote

This commit is contained in:
Jay Sitter 2023-07-02 15:11:48 -04:00 committed by GitHub
commit c2990fd644
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 5 deletions

View file

@ -81,6 +81,7 @@
} }
.vote-bar { .vote-bar {
min-width: 5ch;
margin-top: -6.5px; margin-top: -6.5px;
} }

View file

@ -473,7 +473,7 @@ export class MarkdownTextArea extends Component<
// Keybind handler // Keybind handler
// Keybinds inspired by github comment area // Keybinds inspired by github comment area
handleKeyBinds(i: MarkdownTextArea, event: KeyboardEvent) { handleKeyBinds(i: MarkdownTextArea, event: KeyboardEvent) {
if (event.ctrlKey) { if (event.ctrlKey || event.metaKey) {
switch (event.key) { switch (event.key) {
case "k": { case "k": {
i.handleInsertLink(i, event); i.handleInsertLink(i, event);

View file

@ -174,7 +174,7 @@ export class VoteButtons extends Component<VoteButtonsProps, VoteButtonsState> {
render() { render() {
return ( return (
<div className="vote-bar pe-0 small text-center"> <div className="vote-bar small text-center">
<button <button
type="button" type="button"
className={`btn-animate btn btn-link p-0 ${ className={`btn-animate btn btn-link p-0 ${
@ -193,7 +193,7 @@ export class VoteButtons extends Component<VoteButtonsProps, VoteButtonsState> {
</button> </button>
{showScores() ? ( {showScores() ? (
<div <div
className="unselectable pointer text-muted px-1 post-score" className="unselectable pointer text-muted post-score"
data-tippy-content={tippy(this.props.counts)} data-tippy-content={tippy(this.props.counts)}
> >
{numToSI(this.props.counts.score)} {numToSI(this.props.counts.score)}

View file

@ -333,7 +333,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
return ( return (
<button <button
type="button" type="button"
className="thumbnail rounded overflow-hidden d-inline-block position-relative p-0 border-0" className="thumbnail rounded overflow-hidden d-inline-block position-relative p-0 border-0 bg-transparent"
data-tippy-content={I18NextService.i18n.t("expand_here")} data-tippy-content={I18NextService.i18n.t("expand_here")}
onClick={linkEvent(this, this.handleImageExpandClick)} onClick={linkEvent(this, this.handleImageExpandClick)}
aria-label={I18NextService.i18n.t("expand_here")} aria-label={I18NextService.i18n.t("expand_here")}

View file

@ -284,7 +284,6 @@ export class PrivateMessage extends Component<
<div className="row"> <div className="row">
<div className="col-sm-6"> <div className="col-sm-6">
<PrivateMessageForm <PrivateMessageForm
privateMessageView={message_view}
replyType={true} replyType={true}
recipient={otherPerson} recipient={otherPerson}
onCreate={this.props.onCreate} onCreate={this.props.onCreate}

View file

@ -38,6 +38,7 @@ export class UserService {
secure: isHttps(), secure: isHttps(),
domain: location.hostname, domain: location.hostname,
sameSite: true, sameSite: true,
path: "/",
}); });
this.#setJwtInfo(); this.#setJwtInfo();
} }