mirror of
https://github.com/LemmyNet/lemmy-ui.git
synced 2024-11-26 14:21:13 +00:00
Merge branch 'main' into fix_language_select_custom
This commit is contained in:
commit
33cbc8b50e
6 changed files with 1970 additions and 3692 deletions
|
@ -1,4 +1,4 @@
|
||||||
@import "variables.darkly";
|
@import "variables.litely";
|
||||||
|
|
||||||
$secondary: #c80000;
|
$secondary: #c80000;
|
||||||
$danger: darken($primary, 24%);
|
$danger: darken($primary, 24%);
|
||||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -544,7 +544,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
|
||||||
{post.featured_community && (
|
{post.featured_community && (
|
||||||
<small
|
<small
|
||||||
className="unselectable pointer ml-2 text-muted font-italic"
|
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" />
|
<Icon icon="pin" classes="icon-inline text-primary" />
|
||||||
</small>
|
</small>
|
||||||
|
@ -552,7 +553,8 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
|
||||||
{post.featured_local && (
|
{post.featured_local && (
|
||||||
<small
|
<small
|
||||||
className="unselectable pointer ml-2 text-muted font-italic"
|
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" />
|
<Icon icon="pin" classes="icon-inline text-secondary" />
|
||||||
</small>
|
</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() {
|
showPreviewButton() {
|
||||||
const post_view = this.postView;
|
const post_view = this.postView;
|
||||||
const body = post_view.post.body;
|
const body = post_view.post.body;
|
||||||
|
@ -694,7 +685,6 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
|
||||||
|
|
||||||
{this.showBody && post_view.post.body && this.viewSourceButton}
|
{this.showBody && post_view.post.body && this.viewSourceButton}
|
||||||
|
|
||||||
{this.hasAdvancedButtons && (
|
|
||||||
<div className="dropdown">
|
<div className="dropdown">
|
||||||
<button
|
<button
|
||||||
className="btn btn-link btn-animate text-muted py-0 dropdown-toggle"
|
className="btn btn-link btn-animate text-muted py-0 dropdown-toggle"
|
||||||
|
@ -737,7 +727,6 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
|
||||||
)}
|
)}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
)}
|
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue