mirror of
https://github.com/Vendicated/Vencord.git
synced 2025-02-25 07:48:32 +00:00
Fix conflicts
This commit is contained in:
parent
7f65345d3e
commit
f8f8f9e6fe
2 changed files with 5 additions and 14 deletions
|
@ -29,7 +29,7 @@ export default LazyComponent(() => {
|
||||||
// this is terrible, blame mantika
|
// this is terrible, blame mantika
|
||||||
const p = filters.byProps;
|
const p = filters.byProps;
|
||||||
const [
|
const [
|
||||||
{ cozyMessage, buttons },
|
{ cozyMessage, buttons, message, groupStart },
|
||||||
{ container, isHeader },
|
{ container, isHeader },
|
||||||
{ avatar, clickable, username, messageContent, wrapper, cozy },
|
{ avatar, clickable, username, messageContent, wrapper, cozy },
|
||||||
{ contents },
|
{ contents },
|
||||||
|
@ -89,7 +89,6 @@ export default LazyComponent(() => {
|
||||||
<div className={contents} style={{ paddingLeft: "0px" }}>
|
<div className={contents} style={{ paddingLeft: "0px" }}>
|
||||||
<img
|
<img
|
||||||
className={classes(avatar, clickable)}
|
className={classes(avatar, clickable)}
|
||||||
style={{ left: "8px" }}
|
|
||||||
onClick={openModal}
|
onClick={openModal}
|
||||||
src={review.profile_photo || "/assets/1f0bfc0865d324c2587920a7d80c609b.png?size=128"}
|
src={review.profile_photo || "/assets/1f0bfc0865d324c2587920a7d80c609b.png?size=128"}
|
||||||
style={{ left: "0px" }}
|
style={{ left: "0px" }}
|
||||||
|
|
|
@ -78,16 +78,8 @@ export default function ReviewsView({ userId }: { userId: string; }) {
|
||||||
marginTop: "6px",
|
marginTop: "6px",
|
||||||
resize: "none",
|
resize: "none",
|
||||||
marginBottom: "12px",
|
marginBottom: "12px",
|
||||||
|
|
||||||
padding: "12px",
|
|
||||||
marginBottom: "12px",
|
|
||||||
color: "var(--text-normal)",
|
|
||||||
border: "1px solid var(--profile-message-input-border-color)",
|
|
||||||
fontSize: "14px",
|
|
||||||
borderRadius: "3px",
|
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<div/>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue