Skip to content

Commit 9cea5ae

Browse files
joeizangjoeizang
authored
Merge branch 'master' into fix-fileManager-consoleerror
2 parents 1cbf277 + 61c7ba4 commit 9cea5ae

File tree

7 files changed

+24
-20
lines changed

7 files changed

+24
-20
lines changed

‎apps/circuit-compiler/src/app/components/generateProof.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export function GenerateProof () {
1919
onChange={() => circuitApp.dispatch({ type: 'SET_EXPORT_VERIFIER_CALLDATA', payload: !circuitApp.appState.exportVerifierCalldata })}
2020
checked={circuitApp.appState.exportVerifierCalldata}
2121
/>
22-
<label className="form-check-label pt-1" htmlFor="circuitExportVerifierCalldata">
22+
<label className="form-check-label" htmlFor="circuitExportVerifierCalldata">
2323
<FormattedMessage id="circuit.exportVerifierCalldata" />
2424
</label>
2525
</div>

‎apps/circuit-compiler/src/app/components/setupExports.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function SetupExports () {
1515
<label className="circuit_inner_label form-check-label">
1616
<FormattedMessage id="circuit.provingScheme" />
1717
</label>
18-
<div className="radio form-control custom-radio mb-1 form-check">
18+
<div className="radio form-control custom-radio mb-1 form-check bg-body">
1919
<input
2020
type="radio"
2121
className="align-middle form-check-input"
@@ -30,7 +30,7 @@ export function SetupExports () {
3030
Groth16
3131
</label>
3232
</div>
33-
<div className="radio form-control custom-radio form-check">
33+
<div className="radio form-control custom-radio form-check bg-body">
3434
<input
3535
type="radio"
3636
className="align-middle form-check-input"
@@ -85,7 +85,7 @@ export function SetupExports () {
8585
onChange={() => circuitApp.dispatch({ type: 'SET_EXPORT_VERIFICATION_CONTRACT', payload: !circuitApp.appState.exportVerificationContract })}
8686
checked={circuitApp.appState.exportVerificationContract}
8787
/>
88-
<label className="form-check-label pt-1" htmlFor="circuitExportVerifierContract">
88+
<label className="form-check-label" htmlFor="circuitExportVerifierContract">
8989
<FormattedMessage id="circuit.exportVerifierContract" />
9090
</label>
9191
</div>
@@ -98,7 +98,7 @@ export function SetupExports () {
9898
onChange={() => circuitApp.dispatch({ type: 'SET_EXPORT_VERIFICATION_KEY', payload: !circuitApp.appState.exportVerificationKey })}
9999
checked={circuitApp.appState.exportVerificationKey}
100100
/>
101-
<label className="form-check-label pt-1" htmlFor="circuitExportVerificationKey">
101+
<label className="form-check-label" htmlFor="circuitExportVerificationKey">
102102
<FormattedMessage id="circuit.exportVerificationKey" />
103103
</label>
104104
</div>

‎apps/circuit-compiler/src/app/components/witness.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export function WitnessSection () {
5858
onChange={() => { dispatch({ type: 'SET_EXPORT_WTNS_JSON', payload: !exportWtnsJson }) }}
5959
checked={exportWtnsJson}
6060
/>
61-
<label className="form-check-label pt-1" htmlFor="circuitExportWtnsJson">
61+
<label className="form-check-label" htmlFor="circuitExportWtnsJson">
6262
<FormattedMessage id="circuit.exportWtnsJson" />
6363
</label>
6464
</div>

‎apps/remix-ide/src/app/ui/landing-page/landing-page.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class LandingPage extends ViewPlugin {
3030
}
3131

3232
render () {
33-
return <div id='landingPageHomeContainer' className='remixui_homeContainer justify-content-between bg-light d-flex' data-id='landingPageHomeContainer' style={{ 'overflow-y': 'hidden'}}>
33+
return <div id='landingPageHomeContainer' className='remixui_homeContainer justify-content-between bg-light d-flex overflow-y-hidden' data-id='landingPageHomeContainer'>
3434
<RemixUiHomeTab plugin={this} />
3535
</div>
3636
}

‎apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
--bs-gray-800: #343a40;
3939
--bs-gray-900: #212529;
4040
--bs-primary: #007aa6;
41-
--bs-secondary: #747b90;
41+
--bs-secondary: #a2a3bd;
4242
--bs-success: #18bc9c;
4343
--bs-info: #3498db;
4444
--bs-warning: #f39c12;
4545
--bs-danger: #e74c3c;
4646
--bs-light: #f8fafe;
4747
--bs-dark: #8e94a6;
4848
--bs-primary-rgb: 0, 122, 166;
49-
--bs-secondary-rgb: 116 123 144;
49+
--bs-secondary-rgb: 162, 163, 189;
5050
--bs-success-rgb: 24, 188, 156;
5151
--bs-info-rgb: 52, 152, 219;
5252
--bs-warning-rgb: 243, 156, 18;
@@ -180,7 +180,7 @@
180180
--bs-light-border-subtle: #7b8a8b;
181181
--bs-dark-border-subtle: #343a40;
182182
--bs-heading-color: inherit;
183-
--bs-link-color: #a2a3bd;
183+
--bs-link-color: #a2a3bd;
184184
--bs-link-hover-color: #b6b8d4;
185185
--bs-link-color-rgb: 162, 163, 189;
186186
--bs-link-hover-color-rgb: 182, 184, 212;

‎apps/vyper/src/app/app.tsx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ const App = () => {
145145
<div className="pb-2 border-bottom">
146146
<Form>
147147
<div className="d-flex flex-row justify-content-around mb-1 mt-2">
148-
<div className={`form-control custom-radio ${state.environment === 'remote' ? 'd-flex' : 'd-flex cursor-status'}`}>
148+
<div className={`form-control custom-radio ${state.environment === 'remote' ? 'd-flex' : 'd-flex cursor-status'} bg-body`}>
149149
<input
150150
type="radio"
151151
id="remote-compiler"
@@ -159,10 +159,9 @@ const App = () => {
159159
<label
160160
htmlFor="remote-compiler"
161161
className="form-check-label"
162-
style={{ paddingTop: '0.19rem' }}
163162
>Remote Compiler</label>
164163
</div>
165-
<div className={`form-control custom-radio ${state.environment === 'local' ? 'me-2' : `cursor-status`}`}>
164+
<div className={`form-control custom-radio ${state.environment === 'local' ? 'me-2' : `cursor-status`} bg-body p-0 mt-1`}>
166165
<input
167166
id="local-compiler"
168167
data-id="local-compiler"
@@ -171,12 +170,11 @@ const App = () => {
171170
name="local"
172171
value={state.environment}
173172
onChange={() => setEnvironment('local')}
174-
className={`form-check-input ${state.environment === 'local' ? '' : `cursor-status`}`}
173+
className={`form-check-input ${state.environment === 'local' ? '' : `cursor-status`} me-1`}
175174
/>
176175
<label
177176
htmlFor="local-compiler"
178177
className="form-check-label"
179-
style={{ paddingTop: '0.19rem' }}
180178
>Local Compiler</label>
181179
</div>
182180
</div>

‎libs/remix-ui/helper/src/lib/components/feedbackAlert.tsx‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,23 @@ export function FeedbackAlert ({ message, askGPT }: FeedbackAlertProps) {
1414
<RenderIf condition={showAlert}>
1515
<>
1616
<span> { message } </span>
17-
<div className="btn-close" data-id="renderer" onClick={handleCloseAlert}>
17+
<div className="close" data-id="renderer" onClick={handleCloseAlert}>
1818
<i className="fas fa-times"></i>
1919
</div>
2020
<div className="d-flex pt-1 flex-row-reverse">
2121
<span className="ms-3 pt-1 py-1" >
2222
<CopyToClipboard content={message} className="p-0 m-0 far fa-copy error" direction={'top'} />
2323
</span>
24-
<span className="border border-success text-success btn-sm" onClick={(e) => {
25-
e.stopPropagation()
26-
askGPT()
27-
}}>Ask RemixAI</span>
24+
<button
25+
className="btn btn-ai"
26+
data-id="ask-remix-ai-button"
27+
onClick={(event) => {
28+
event.stopPropagation()
29+
askGPT() }}
30+
>
31+
<img src="assets/img/remixAI_small.svg" alt="Remix AI" className="explain-icon" />
32+
<span>Ask RemixAI</span>
33+
</button>
2834
</div>
2935
</>
3036
</RenderIf>

0 commit comments

Comments
 (0)