From 61630df60871a6bc85a9c53522cb770b23be7929 Mon Sep 17 00:00:00 2001 From: lianahus Date: Thu, 13 Jan 2022 18:55:07 +0100 Subject: [PATCH 1/2] dragbar z-index fixed, removed Optimism, added Cairo --- apps/remix-ide/src/assets/img/cairoLogo.webp | Bin 0 -> 6606 bytes apps/remix-ide/src/remixAppManager.js | 10 ---- .../src/lib/compiler-artefacts.ts | 5 -- .../remix-app/components/dragbar/dragbar.css | 4 +- .../src/lib/components/pluginButton.tsx | 25 +++++---- .../home-tab/src/lib/remix-ui-home-tab.css | 45 ++++++++-------- .../home-tab/src/lib/remix-ui-home-tab.tsx | 48 +++++++++--------- .../panel/src/lib/dragbar/dragbar.css | 2 +- .../remix-ui/run-tab/src/lib/actions/index.ts | 2 - 9 files changed, 66 insertions(+), 75 deletions(-) create mode 100644 apps/remix-ide/src/assets/img/cairoLogo.webp diff --git a/apps/remix-ide/src/assets/img/cairoLogo.webp b/apps/remix-ide/src/assets/img/cairoLogo.webp new file mode 100644 index 0000000000000000000000000000000000000000..b7210dfa3610f89fd4701b1bad2cf9a99b0f41e7 GIT binary patch literal 6606 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 M9MrjKB@1vG09$^Kh5!Hn literal 0 HcmV?d00001 diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js index d87b6ee1a9..d3cc735b3f 100644 --- a/apps/remix-ide/src/remixAppManager.js +++ b/apps/remix-ide/src/remixAppManager.js @@ -145,16 +145,6 @@ export class RemixAppManager extends PluginManager { pattern: [], sticky: true }) - await this.call('filePanel', 'registerContextMenuItem', { - id: 'optimism-compiler', - name: 'compileCustomAction', - label: 'Compile with Optimism', - type: [], - extension: ['.sol'], - path: [], - pattern: [], - sticky: true - }) } } diff --git a/libs/remix-core-plugin/src/lib/compiler-artefacts.ts b/libs/remix-core-plugin/src/lib/compiler-artefacts.ts index 715bd2e9c4..1198a012db 100644 --- a/libs/remix-core-plugin/src/lib/compiler-artefacts.ts +++ b/libs/remix-core-plugin/src/lib/compiler-artefacts.ts @@ -48,11 +48,6 @@ export class CompilerArtefacts extends Plugin { saveCompilationPerFileResult(file, source, languageVersion, data) }) - this.on('optimism-compiler', 'compilationFinished', (file, source, languageVersion, data) => { - this.compilersArtefacts.__last = new CompilerAbstract(languageVersion, data, source) - saveCompilationPerFileResult(file, source, languageVersion, data) - }) - this.on('solidityUnitTesting', 'compilationFinished', (file, source, languageVersion, data) => { this.compilersArtefacts.__last = new CompilerAbstract(languageVersion, data, source) saveCompilationPerFileResult(file, source, languageVersion, data) diff --git a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.css b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.css index 1330c1179c..44aa0598c1 100644 --- a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.css +++ b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.css @@ -7,7 +7,7 @@ left: 0px; top: 0px; width: 0.3em; - z-index: 9999; + z-index: 1000; } .overlay { @@ -17,7 +17,7 @@ width: 100vw; height: 100vh; display: block; - z-index: 9998; + z-index: 1000; } .dragbar:hover, diff --git a/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx b/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx index 468afc8756..06f108afe8 100644 --- a/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx @@ -6,21 +6,26 @@ interface PluginButtonProps { imgPath: string, envID: string, envText: string, - callback: any + callback: any, + l2?: boolean } -function PluginButton ({ imgPath, envID, envText, callback }: PluginButtonProps) { +function PluginButton ({ imgPath, envID, envText, callback, l2 }: PluginButtonProps) { const themeFilter = useContext(ThemeContext) return ( - +
+ + { l2 && } + +
) } diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css index 6644f4988e..b6bba39140 100644 --- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css +++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css @@ -1,82 +1,85 @@ -.remixui_text { +.remixui_home_text { cursor: pointer; font-weight: normal; max-width: 300px; } -.remixui_text:hover { +.remixui_home_text:hover { cursor: pointer; text-decoration: underline; } -.remixui_homeContainer { +.remixui_home_homeContainer { overflow-y: hidden; overflow-y: auto; flex-grow: 3; } -.remixui_hpLogoContainer { +.remixui_home_hpLogoContainer { margin: 30px; padding-right: 90px; } -.remixui_mediaBadge { +.remixui_home_mediaBadge { font-size: 2em; height: 2em; width: 2em; } -.remixui_mediaBadge:focus { +.remixui_home_mediaBadge:focus { outline: none; } -.remixui_image { +.remixui_home_image { height: 1em; width: 1em; text-align: center; } -.remixui_logoImg { +.remixui_home_logoImg { height: 10em; } -.remixui_rightPanel { +.remixui_home_rightPanel { right: 0; position: absolute; z-index: 3; } -.remixui_remixHomeMedia { +.remixui_home_remixHomeMedia { overflow-y: auto; overflow-x: hidden; } -.remixui_panels { +.remixui_home_panels { box-shadow: 0px 0px 13px -7px; } -.remixui_labelIt { +.remixui_home_labelIt { margin-bottom: 0; } -.remixui_bigLabelSize { +.remixui_home_bigLabelSize { font-size: 13px; } -.remixui_seeAll { +.remixui_home_seeAll { margin-top: 7px; white-space: nowrap; } -.remixui_importFrom p { +.remixui_home_importFrom p { margin-right: 10px; } -.remixui_logoContainer img{ +.remixui_home_logoContainer img{ height: 150px; opacity: 0.7; } -.remixui_envLogo { +.remixui_home_envLogo { height: 16px; } -.remixui_cursorStyle { +.remixui_home_cursorStyle { cursor: pointer; } -.remixui_envButton { +.remixui_home_envButton { width: 120px; height: 70px; } -.remixui_media { +.remixui_home_media { overflow: hidden; max-width: 400px; transition: .5s ease-out; z-index: 1000; } -.remixui_migrationBtn { +.remixui_home_migrationBtn { width: 100px; } +.remixui_home_l2Label { + bottom: 10px; +} \ No newline at end of file diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx index c130d35a64..c29df17662 100644 --- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx +++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx @@ -150,10 +150,10 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => { plugin.verticalIcons.select('solidity') _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'solidity']) } - const startOptimism = async () => { - await plugin.appManager.activatePlugin('optimism-compiler') - plugin.verticalIcons.select('optimism-compiler') - _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'optimism-compiler']) + const startCairo = async () => { + await plugin.appManager.activatePlugin('cairo_compiler') + plugin.verticalIcons.select('cairo_compiler') + _paq.push(['trackEvent', 'pluginManager', 'userActivate', 'cairo_compiler']) } const startSolhint = async () => { await plugin.appManager.activatePlugin(['solidity', 'solhint']) @@ -232,7 +232,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
- playRemi() } alt=""> + playRemi() } alt="">
-
+

Featured Plugins

startSolidity()} /> - startOptimism()} /> + startCairo()} /> startSolhint()} /> startLearnEth()} /> startSourceVerify()} /> @@ -261,11 +261,11 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {

File

- createNewFile()}>New File + createNewFile()}>New File

- + Open Files { event.stopPropagation() @@ -275,7 +275,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {

- connectToLocalhost()}>Connect to Localhost + connectToLocalhost()}>Connect to Localhost

@@ -289,28 +289,28 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {

Resources

- Documentation + Documentation

- Gitter channel + Gitter channel

- - Featuring website + + Featuring website

- - switchToPreviousVersion()}>Old experience + + switchToPreviousVersion()}>Old experience

-
+
-
-
-