Skip to content

Commit 8fa911f

Browse files
authored
Merge pull request #5798 from ethereum/uiSR
script runner ui fixes and not only ui
2 parents e93f5fd + c950568 commit 8fa911f

File tree

5 files changed

+15
-16
lines changed

5 files changed

+15
-16
lines changed

apps/remix-ide/src/app/tabs/script-runner-ui.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export class ScriptRunnerUIPlugin extends ViewPlugin {
3636

3737
render() {
3838
return (
39-
<div id="scriptrunnerTab">
39+
<div className="bg-light" id="scriptrunnerTab">
4040
<PluginViewWrapper plugin={this} />
4141
</div>
4242
)

apps/remix-ide/src/remixAppManager.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@ class PluginLoader {
424424
'dapp-draft',
425425
'solidityumlgen',
426426
'remixGuide',
427-
'doc-viewer'
427+
'doc-viewer',
428+
'UIScriptRunner'
428429
]
429430
this.loaders = {}
430431
this.loaders.localStorage = {

libs/remix-ui/scriptrunner/src/lib/components/config-section.tsx

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,27 +81,26 @@ export default function ConfigSection(props: ConfigSectionProps) {
8181
}
8282

8383
return (
84-
<section className="mb-4">
84+
<section className="mb-2">
8585
<section className="d-flex flex-row ">
8686
<SectionHeader />
87-
<div className="d-flex flex-row ml-3">
88-
{props.config.isLoading && <div className="d-flex flex-row pb-1 align-items-center justify-content-center">
89-
<span>Loading config</span><i className="fas fa-spinner fa-spin ml-1"></i>
90-
</div>}
91-
</div>
9287
<>
9388
{!props.config.isLoading && !props.config.errorStatus && !props.config.error &&
9489
<div onClick={() => props.loadScriptRunner(props.config)} className="pointer px-2 pb-1">
9590
{ props.activeConfig && props.activeConfig.name === props.config.name &&
9691
<div className={`${!isVisible ? 'd-flex flex-row align-items-center justify-content-center pt-1' : 'd-flex flex-row pb-1 align-items-center justify-content-center'}`}>
97-
{isVisible && <span onAnimationEnd={handleAnimationEnd} className="text-success" style={{ animation: 'fadeOut 5s forwards', animationFillMode: 'forwards' }}>Config loaded</span>}
98-
<FontAwesomeIcon data-id={`sr-loaded-${props.config.title}`} className="text-success ml-3" icon={faCheck}></FontAwesomeIcon>
92+
<FontAwesomeIcon data-id={`sr-loaded-${props.config.name}`} className="text-success ml-3" icon={faCheck}></FontAwesomeIcon>
93+
{isVisible && <span onAnimationEnd={handleAnimationEnd} className="text-success px-3" style={{ animation: 'fadeOut 5s forwards', animationFillMode: 'forwards' }}>Config loaded</span>}
9994
</div>
10095
}
10196
</div>
10297
}
103-
<div className="w-25"></div>
10498
</>
99+
<div className="d-flex flex-row mx-4">
100+
{props.config.isLoading && <div className="d-flex flex-row pb-1 align-items-center justify-content-center">
101+
<i className="fas fa-spinner fa-spin"></i><span className='pl-3'>Loading config</span>
102+
</div>}
103+
</div>
105104
</section>
106105
<section id="errorSection">
107106
{props.config.errorStatus && props.config.error && <div className="text-danger">
@@ -122,16 +121,15 @@ export default function ConfigSection(props: ConfigSectionProps) {
122121
</div>
123122
}
124123
</section>
125-
<section className="d-flex flex-column" style={{ width: '100%' }} >
126-
<div className="mt-4 bg-light p-3 ">
124+
<section className="d-flex flex-column w-100">
125+
<div className="mt-2 mb-4 bg-dark p-3 ">
127126
<p className="text-dark text-monospace">{props.config.description}</p>
128127
<p className="text-dark">Dependencies</p>
129128
<ul className="list-unstyled ">
130129
<Dependencies />
131130
</ul>
132131
</div>
133132
</section>
134-
135133
</section>
136134
)
137135
}

libs/remix-ui/scriptrunner/src/lib/script-runner-ui.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const ScriptRunnerUI = (props: ScriptRunnerUIProps) => {
3939
<div className="text-uppercase mb-3 text-dark h2" style={{ fontSize: 'x-large' }}>script configuration</div>
4040
<div className="text-uppercase text-dark h3" style={{ fontSize: 'large' }}>choose a specific configuration for your script</div>
4141
</div>
42-
<div className="mt-5 d-flex flex-column gap-3 mb-4">
42+
<div className="mt-3 d-flex flex-column gap-3 mb-4">
4343
{configurations.filter((config) => config.publish).map((config: ProjectConfiguration, index) => (
4444
<ConfigSection
4545
activeKey={activeKey}

libs/remix-ui/statusbar/src/lib/components/scamDetails.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default function ScamDetails ({ refs, floatStyle, scamAlerts }: ScamDetai
2828
willChange: 'transform',
2929
boxShadow: "0 1px 7px var(--secondary)"
3030
} }
31-
className="p-1 pb-0 mb-0 d-flex alert alert-warning border border-warning"
31+
className="py-2 px-4 pb-0 mb-0 d-flex alert alert-warning border border-warning"
3232
>
3333
<span className="align-self-center pl-2 mt-1">
3434
<i style={{ fontSize: 'xxx-large', fontWeight: 'lighter' }} className="pr-2 far fa-exclamation-triangle"></i>

0 commit comments

Comments
 (0)