Skip to content

Commit

Permalink
Merge pull request #1581 from ecency/bugfix/topic-badge
Browse files Browse the repository at this point in the history
Fixed tag list item close button and layout
  • Loading branch information
feruzm authored Mar 29, 2024
2 parents f5f286b + a3908c1 commit eddc935
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ exports[`(1) Default render 1`] = `
</div>
<div
className="editor-tool"
id="editor-tool-emoji-picker-e5a42640-c9b5-428e-9d26-7a6fcab63b93"
id="editor-tool-emoji-picker-ad7f74fc-7d16-4049-a59a-3b2511f7738b"
role="none"
title="Emoji"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,20 @@ exports[`(2) Selected tag 1`] = `
>
hive
<div
className="text-gray-600 ml-4 pointer"
className="text-gray-600 dark:text-gray-400 ml-2 pointer"
onClick={[Function]}
>
<svg
fill="currentColor"
height="16"
viewBox="0 0 24 24"
width="16"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M13.41,12l6.3-6.29a1,1,0,1,0-1.42-1.42L12,10.59,5.71,4.29A1,1,0,0,0,4.29,5.71L10.59,12l-6.3,6.29a1,1,0,0,0,0,1.42,1,1,0,0,0,1.42,0L12,13.41l6.29,6.3a1,1,0,0,0,1.42,0,1,1,0,0,0,0-1.42Z"
/>
</svg>
</div>
</a>
</div>
Expand Down
5 changes: 3 additions & 2 deletions src/common/components/trending-tags-card/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { _t } from "../../i18n";
import _c from "../../util/fix-class-names";
import { ActiveUser } from "../../store/active-user/types";
import "./_index.scss";
import { UilMultiply } from "@iconscout/react-unicons";

interface Props {
history: History;
Expand Down Expand Up @@ -75,14 +76,14 @@ export class TrendingTagsCard extends Component<Props> {
{t}
{global.tag === t && (
<div
className="text-gray-600 ml-4 pointer"
className="text-gray-600 dark:text-gray-400 ml-2 pointer"
onClick={(e) => {
e.stopPropagation();
e.preventDefault();
this.handleUnselection();
}}
>
<UilMultiply size="16" />
</div>
)}
</a>
Expand Down
4 changes: 3 additions & 1 deletion src/style/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,9 @@
.tag-list-item {
border-radius: 25px;
cursor: pointer;
display: table;
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 8px;
padding: 4px 8px;
text-decoration: none;
Expand Down

0 comments on commit eddc935

Please sign in to comment.