fedi/lemmy-ui
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy-ui.git synced 2024-11-23 15:05:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix_language_select_custom

Browse source
This commit is contained in:
SleeplessOne1917 2023-06-20 00:21:43 +00:00 committed by GitHub
parent b7da6851aa 52961cb198
commit 33cbc8b50e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 1970 additions and 3692 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/assets/css/themes/_variables.litely-red.scss
View file

@ -1,4 +1,4 @@
@import "variables.darkly";
@import "variables.litely";
$secondary: #c80000;
$danger: darken($primary, 24%);

1016
src/assets/css/themes/darkly-red.css
View file

File diff suppressed because it is too large Load diff

1016
src/assets/css/themes/darkly.css
View file

File diff suppressed because it is too large Load diff

2519
src/assets/css/themes/litely-red.css
View file

File diff suppressed because it is too large Load diff

1012
src/assets/css/themes/litely.css
View file

File diff suppressed because it is too large Load diff

97
src/shared/components/post/post-listing.tsx
View file

@ -544,7 +544,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
{post.featured_community && (
<small
className="unselectable pointer ml-2 text-muted font-italic"
data-tippy-content={i18n.t("featured")}
data-tippy-content={i18n.t("featured_in_community")}
aria-label={i18n.t("featured_in_community")}
>
<Icon icon="pin" classes="icon-inline text-primary" />
</small>
@ -552,7 +553,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
{post.featured_local && (
<small
className="unselectable pointer ml-2 text-muted font-italic"
data-tippy-content={i18n.t("featured")}
data-tippy-content={i18n.t("featured_in_local")}
aria-label={i18n.t("featured_in_local")}
>
<Icon icon="pin" classes="icon-inline text-secondary" />
</small>
@ -642,17 +644,6 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
);
}
get hasAdvancedButtons() {
return (
this.myPost ||
(this.showBody && this.postView.post.body) ||
amMod(this.props.moderators) ||
amAdmin() ||
this.canMod_ ||
this.canAdmin_
);
}
showPreviewButton() {
const post_view = this.postView;
const body = post_view.post.body;
@ -694,50 +685,48 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
{this.showBody && post_view.post.body && this.viewSourceButton}
{this.hasAdvancedButtons && (
<div className="dropdown">
<button
className="btn btn-link btn-animate text-muted py-0 dropdown-toggle"
onClick={linkEvent(this, this.handleShowAdvanced)}
data-tippy-content={i18n.t("more")}
data-bs-toggle="dropdown"
aria-expanded="false"
aria-controls="advancedButtonsDropdown"
aria-label={i18n.t("more")}
>
<Icon icon="more-vertical" inline />
</button>
<div className="dropdown">
<button
className="btn btn-link btn-animate text-muted py-0 dropdown-toggle"
onClick={linkEvent(this, this.handleShowAdvanced)}
data-tippy-content={i18n.t("more")}
data-bs-toggle="dropdown"
aria-expanded="false"
aria-controls="advancedButtonsDropdown"
aria-label={i18n.t("more")}
>
<Icon icon="more-vertical" inline />
</button>
<ul className="dropdown-menu" id="advancedButtonsDropdown">
{!this.myPost ? (
<>
<li>{this.reportButton}</li>
<li>{this.blockButton}</li>
</>
) : (
<>
<li>{this.editButton}</li>
<li>{this.deleteButton}</li>
</>
)}
<ul className="dropdown-menu" id="advancedButtonsDropdown">
{!this.myPost ? (
<>
<li>{this.reportButton}</li>
<li>{this.blockButton}</li>
</>
) : (
<>
<li>{this.editButton}</li>
<li>{this.deleteButton}</li>
</>
)}
{/* Any mod can do these, not limited to hierarchy*/}
{(amMod(this.props.moderators) || amAdmin()) && (
<>
<li>
<hr className="dropdown-divider" />
</li>
<li>{this.lockButton}</li>
{this.featureButtons}
</>
)}
{/* Any mod can do these, not limited to hierarchy*/}
{(amMod(this.props.moderators) || amAdmin()) && (
<>
<li>
<hr className="dropdown-divider" />
</li>
<li>{this.lockButton}</li>
{this.featureButtons}
</>
)}
{(this.canMod_ || this.canAdmin_) && (
<li>{this.modRemoveButton}</li>
)}
</ul>
</div>
)}
{(this.canMod_ || this.canAdmin_) && (
<li>{this.modRemoveButton}</li>
)}
</ul>
</div>
</>
);
}