mirror/Vencord
0
0
Fork 0
mirror of https://github.com/Vendicated/Vencord.git synced 2025-02-25 07:48:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix conflicts

Browse source
This commit is contained in:
Manti 2022-11-25 11:14:26 +03:00
parent 7f65345d3e
commit f8f8f9e6fe
2 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/plugins/reviewDB/components/ReviewComponent.tsx
View file

@ -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 },
@ -78,7 +78,7 @@ export default LazyComponent(() => {
} }
return ( return (
<div className={classes(cozyMessage, wrapper,message, groupStart, cozy, "user-review")} style={ <div className={classes(cozyMessage, wrapper, message, groupStart, cozy, "user-review")} style={
{ {
marginLeft: "0px", marginLeft: "0px",
paddingLeft: "52px", paddingLeft: "52px",
@ -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" }}

14
src/plugins/reviewDB/components/ReviewsView.tsx
View file

@ -70,24 +70,16 @@ export default function ReviewsView({ userId }: { userId: string; }) {
</Forms.FormText> </Forms.FormText>
)} )}
<textarea <textarea
className={classes(Classes.textarea.replace("textarea", ""),"enter-comment")} className={classes(Classes.textarea.replace("textarea", ""), "enter-comment")}
// this produces something like '-_59yqs ...' but since no class exists with that name its fine // this produces something like '-_59yqs ...' but since no class exists with that name its fine
placeholder= {"Review @" + UserStore.getUser(userId)?.username ?? ""} placeholder={"Review @" + UserStore.getUser(userId)?.username ?? ""}
onKeyDown={onKeyPress} onKeyDown={onKeyPress}
style={{ style={{
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>
); );
} }