Skip to content

Add css variables and props for custom styling #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elliotBraem merged 2 commits into from
Jan 29, 2024
Merged

Add css variables and props for custom styling #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
470b64c
Add css variables and props for custom styling
itexpert120 Jan 29, 2024
07e1908
Add missing prop to text widget
itexpert120 Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions apps/builddao/widget/components/Modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ const Overlay = styled.div`
z-index: 1000;
width: 100vw;
height: 100vh;
background: rgba(11, 12, 20, 0.5);
background: var(--modal-overlay-color, rgba(11, 12, 20, 0.5));
`;

const Content = styled.div`
min-width: 500px;
max-width: 1000px;
padding: 24px;
outline: none !important;
background: #23242b;
background: var(--modal-background-color, #23242b);
border-radius: 16px;
color: white;
color: var(--modal-text-color, #fff);

@media screen and (max-width: 768px) {
width: 80%;
Expand Down
15 changes: 14 additions & 1 deletion apps/builddao/widget/components/modals/CreateProposal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ const { Modal, Button, User } = VM.require(
const showModal = props.showModal;
const toggleModal = props.toggleModal;
const toggle = props.toggle;
const bootstrapTheme = props.bootstrapTheme || "dark";
const editorCSS = props.editorCSS;

if (!showModal) {
return "";
}
Expand Down Expand Up @@ -102,7 +105,7 @@ return (
<select
name="proposal-type"
id="proposal-type"
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
class="form-select"
onChange={(e) => setSelectedOption(e.target.value)}
value={selectedOption}
Expand All @@ -124,6 +127,8 @@ return (
props={{
selectedDAO: selectedDAO,
item: props.item,
bootstrapTheme: bootstrapTheme,
customCSS: editorCSS,
}}
/>
</>
Expand All @@ -135,6 +140,8 @@ return (
props={{
selectedDAO: selectedDAO,
item: props.item,
bootstrapTheme: bootstrapTheme,
customCSS: editorCSS,
}}
/>
</>
Expand All @@ -146,6 +153,8 @@ return (
props={{
selectedDAO: selectedDAO,
item: props.item,
bootstrapTheme: bootstrapTheme,
customCSS: editorCSS,
}}
/>
</>
Expand All @@ -158,6 +167,8 @@ return (
roles: roles,
selectedDAO: selectedDAO,
item: props.item,
bootstrapTheme: bootstrapTheme,
customCSS: editorCSS,
}}
/>
</>
Expand All @@ -170,6 +181,8 @@ return (
roles: roles,
selectedDAO: selectedDAO,
item: props.item,
bootstrapTheme: bootstrapTheme,
customCSS: editorCSS,
}}
/>
</>
Expand Down
18 changes: 10 additions & 8 deletions apps/builddao/widget/components/modals/propose/AddMember.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ const selectedDAO = props.selectedDAO;

const [text, setText] = useState("");
const [editorKey, setEditorKey] = useState(0);

const bootstrapTheme = props.bootstrapTheme;
useEffect(() => {
if (!props.item) {
return;
Expand Down Expand Up @@ -167,7 +169,7 @@ return (
name="accountId"
id="accountId"
className="form-control"
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
value={accountId}
onChange={(e) => setAccountId(e.target.value)}
/>
Expand All @@ -185,7 +187,7 @@ return (
<select
name="role"
id="role"
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
class="form-select"
onChange={(e) => setRole(e.target.value)}
selected={role}
Expand All @@ -207,10 +209,10 @@ return (
src="mob.near/widget/MarkdownEditorIframe"
props={{
initialText: text,
embedCss: MarkdownEditor,
embedCss: props.customCSS || MarkdownEditor,
onChange: (v) => {
setText(v);
}
},
}}
/>
</TextareaWrapper>
Expand All @@ -228,10 +230,10 @@ return (
kind: {
AddMemberToRole: {
member_id: accountId,
role: role
}
}
}
role: role,
},
},
},
})
}
>
Expand Down
29 changes: 16 additions & 13 deletions apps/builddao/widget/components/modals/propose/FunctionCall.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ const [deposit, useDeposit] = useState(0);

const [text, setText] = useState("");
const [editorKey, setEditorKey] = useState(0);

const bootstrapTheme = props.bootstrapTheme;

useEffect(() => {
if (!props.item) {
return;
Expand Down Expand Up @@ -158,7 +161,7 @@ return (
<input
name="contract"
id="contract"
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
value={contract}
onChange={(e) => setContract(e.target.value)}
className="form-control"
Expand All @@ -171,7 +174,7 @@ return (
<input
name="method"
id="method"
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
value={method}
onChange={(e) => setMethod(e.target.value)}
className="form-control"
Expand All @@ -182,7 +185,7 @@ return (
<textarea
name="args"
id="args"
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
value={args}
onChange={(e) => setArgs(e.target.value)}
className="form-control"
Expand All @@ -194,7 +197,7 @@ return (
name="gas"
id="gas"
type="number"
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
value={gas}
onChange={(e) => setGas(e.target.value)}
className="form-control"
Expand All @@ -206,7 +209,7 @@ return (
name="deposit"
id="deposit"
type="number"
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
value={deposit}
onChange={(e) => setDeposit(e.target.value)}
className="form-control"
Expand All @@ -223,10 +226,10 @@ return (
src="mob.near/widget/MarkdownEditorIframe"
props={{
initialText: text,
embedCss: MarkdownEditor,
embedCss: props.customCSS || MarkdownEditor,
onChange: (v) => {
setText(v);
}
},
}}
/>
</TextareaWrapper>
Expand All @@ -248,12 +251,12 @@ return (
method_name: method,
args: args,
deposit: deposit,
gas: gas
}
]
}
}
}
gas: gas,
},
],
},
},
},
})
}
>
Expand Down
18 changes: 10 additions & 8 deletions apps/builddao/widget/components/modals/propose/RemoveMember.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ const selectedDAO = props.selectedDAO;

const [text, setText] = useState("");
const [editorKey, setEditorKey] = useState(0);

const bootstrapTheme = props.bootstrapTheme;
useEffect(() => {
if (!props.item) {
return;
Expand Down Expand Up @@ -167,7 +169,7 @@ return (
name="accountId"
id="accountId"
className="form-control"
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
value={accountId}
onChange={(e) => setAccountId(e.target.value)}
/>
Expand All @@ -185,7 +187,7 @@ return (
<select
name="role"
id="role"
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
class="form-select"
onChange={(e) => setRole(e.target.value)}
selected={role}
Expand All @@ -211,10 +213,10 @@ return (
src="mob.near/widget/MarkdownEditorIframe"
props={{
initialText: text,
embedCss: MarkdownEditor,
embedCss: props.customCSS || MarkdownEditor,
onChange: (v) => {
setText(v);
}
},
}}
/>
</TextareaWrapper>
Expand All @@ -232,10 +234,10 @@ return (
kind: {
RemoveMemberFromRole: {
member_id: accountId,
role: role
}
}
}
role: role,
},
},
},
})
}
>
Expand Down
8 changes: 4 additions & 4 deletions apps/builddao/widget/components/modals/propose/Text.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@ return (
src="mob.near/widget/MarkdownEditorIframe"
props={{
initialText: text,
embedCss: MarkdownEditor,
embedCss: props.customCSS || MarkdownEditor,
onChange: (v) => {
setText(v);
}
},
}}
/>
</TextareaWrapper>
Expand All @@ -170,8 +170,8 @@ return (
Near.call(selectedDAO, "add_proposal", {
proposal: {
description: text,
kind: "Vote"
}
kind: "Vote",
},
})
}
>
Expand Down
20 changes: 11 additions & 9 deletions apps/builddao/widget/components/modals/propose/Transfer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ const [amount, setAmount] = useState(0);
const [description, setDescription] = useState("");
const [validatedAddresss, setValidatedAddress] = useState(true);

const bootstrapTheme = props.bootstrapTheme;

const [text, setText] = useState("");
const [editorKey, setEditorKey] = useState(0);
useEffect(() => {
Expand Down Expand Up @@ -177,7 +179,7 @@ return (
id="recipient"
placeholder="NEAR Address"
value={recipient}
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
onChange={(e) => setRecipient(e.target.value)}
/>
{!validatedAddresss && (
Expand All @@ -195,7 +197,7 @@ return (
name="token"
id="token"
value={token}
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
onChange={(e) => setToken(e.target.value)}
>
<option value="">Select a token</option>
Expand All @@ -216,7 +218,7 @@ return (
id="amount"
type="number"
value={amount}
data-bs-theme="dark"
data-bs-theme={bootstrapTheme}
onChange={(e) => setAmount(e.target.value)}
/>
</div>
Expand All @@ -231,10 +233,10 @@ return (
src="mob.near/widget/MarkdownEditorIframe"
props={{
initialText: text,
embedCss: MarkdownEditor,
embedCss: props.customCSS || MarkdownEditor,
onChange: (v) => {
setText(v);
}
},
}}
/>
</TextareaWrapper>
Expand All @@ -252,10 +254,10 @@ return (
Transfer: {
token_id: token,
reciever_id: recipient,
amount: amount
}
}
}
amount: amount,
},
},
},
})
}
>
Expand Down