From d51660c654d8a7e143b4fab81e235996b7cd81c9 Mon Sep 17 00:00:00 2001 From: filip mertens Date: Thu, 15 Sep 2022 17:10:26 +0200 Subject: [PATCH 1/7] fix config --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e308cf5191..3e19a05dbc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -493,10 +493,10 @@ jobs: working_directory: ~/remix-project steps: + - checkout - node/install: install-yarn: true node-version: "v14.17.6" - - checkout - run: yarn - run: yarn run downloadsolc_assets - run: yarn run build:production @@ -526,6 +526,9 @@ jobs: steps: - checkout + - node/install: + install-yarn: true + node-version: "v14.17.6" - run: yarn - run: yarn run downloadsolc_assets - run: yarn run build:production From 8af0e5dbe539b6c96cb34da4b19039546244e01c Mon Sep 17 00:00:00 2001 From: lianahus Date: Fri, 2 Sep 2022 13:09:58 +0200 Subject: [PATCH 2/7] typo and better condition --- .../static-analyser/src/lib/remix-ui-static-analyser.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx index 84aab5e5d0..e0379d1b11 100644 --- a/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx +++ b/libs/remix-ui/static-analyser/src/lib/remix-ui-static-analyser.tsx @@ -80,9 +80,9 @@ export const RemixUiStaticAnalyser = (props: RemixUiStaticAnalyserProps) => { const tmp: RegExpExecArray | null = /^(\d+.\d+.\d+)/.exec(version) return tmp ? tmp[1] : version } - if (version != '' && !semver.gt(truncateVersion(version), '0.4.12')) { + if (version && version != '' && !semver.gt(truncateVersion(version), '0.4.12')) { setIsSupportedVersion(false) - setRunButtonTitle('Sselect Solidity compiler version greater than 0.4.12.') + setRunButtonTitle('Select Solidity compiler version greater than 0.4.12.') } else { setIsSupportedVersion(true) setRunButtonTitle('Run static analysis') From fa9f3dda5aba22e91e9f778b7042024639032a03 Mon Sep 17 00:00:00 2001 From: lianahus Date: Fri, 2 Sep 2022 14:27:12 +0200 Subject: [PATCH 3/7] rm double scroll --- libs/remix-ui/workspace/src/lib/css/remix-ui-workspace.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/remix-ui/workspace/src/lib/css/remix-ui-workspace.css b/libs/remix-ui/workspace/src/lib/css/remix-ui-workspace.css index db1165b494..44e67f30fd 100644 --- a/libs/remix-ui/workspace/src/lib/css/remix-ui-workspace.css +++ b/libs/remix-ui/workspace/src/lib/css/remix-ui-workspace.css @@ -7,7 +7,7 @@ } .remixui_fileexplorer { position : relative; - overflow-y : auto; + overflow-y : hidden; } .remixui_fileExplorerTree { cursor : default; From 904b21525eb5bff496e4591f0fbb66d97a31241f Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 5 Sep 2022 12:41:00 +0200 Subject: [PATCH 4/7] editor menu color scheme fixes for some themes editor's tab layout fix FE selection color fixed for several themes --- .../src/assets/css/themes/bootstrap-cyborg.min.css | 8 ++++---- .../src/assets/css/themes/bootstrap-flatly.min.css | 4 ++-- .../src/assets/css/themes/bootstrap-spacelab.min.css | 4 ++-- .../remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css | 2 +- libs/remix-ui/editor/src/lib/remix-ui-editor.tsx | 4 +++- libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css index 30026bb48b..ced466267d 100644 --- a/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css +++ b/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css @@ -25,7 +25,7 @@ --gray:#555; --gray-dark:#222; --primary:#2a9fd6; - --secondary:#555; + --secondary:#3c3939; --success:#77b300; --info:#93c; --warning:#f80; @@ -5595,7 +5595,7 @@ a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary: background-color:#2180ac!important } .bg-secondary { - background-color:#555!important + background-color:#3c3939!important } a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover { background-color:#3c3c3c!important @@ -8358,7 +8358,7 @@ a.text-warning:focus,a.text-warning:hover { color:#b35f00!important } .text-danger { - color:#c00!important + color:#ff4242!important } a.text-danger:focus,a.text-danger:hover { color:maroon!important @@ -8594,7 +8594,7 @@ legend { color:#555 } .nav-pills .nav-link.active,.nav-tabs .nav-link.active { - background-color:#2a9fd6 + background-color:#034767 } .breadcrumb a { color:#fff diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css index c62ab28e0f..5940867b25 100644 --- a/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css +++ b/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css @@ -24,7 +24,7 @@ --gray:#95a5a6; --gray-dark:#343a40; --primary:#2c3e50; - --secondary:#95a5a6; + --secondary:#dadfe0; --success:#18bc9c; --info:#3498db; --warning:#f39c12; @@ -4460,7 +4460,7 @@ a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary: background-color:#1a252f!important } .bg-secondary { - background-color:#95a5a6!important + background-color:#dadfe0!important } a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover { background-color:#798d8f!important diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css index 4639bcdad8..b8e90b0107 100644 --- a/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css +++ b/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css @@ -25,7 +25,7 @@ --gray:#777; --gray-dark:#333; --primary:#446e9b; - --secondary:#999; + --secondary:#dadfe0; --success:#3cb521; --info:#3399f3; --warning:#d47500; @@ -5596,7 +5596,7 @@ a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary: background-color:#345578!important } .bg-secondary { - background-color:#999!important + background-color:#dadfe0!important } a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover { background-color:gray!important diff --git a/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css b/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css index e039facfec..28503c8562 100644 --- a/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css +++ b/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css @@ -3641,7 +3641,7 @@ input[type="submit"].btn-block { .nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active { color: #fff; - background-color: var(--body-bg); + background-color: #2a2c3f; border-color: #3f4455; } .nav-tabs .dropdown-menu { diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx index 715ecf9c7a..d51cd7f0d0 100644 --- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx +++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx @@ -158,6 +158,7 @@ export const EditorUI = (props: EditorUIProps) => { const infoColor = formatColor('--info') const darkColor = formatColor('--dark') const secondaryColor = formatColor('--secondary') + const primaryColor = formatColor('--primary') const textColor = formatColor('--text') || darkColor const textbackground = formatColor('--text-background') || lightColor @@ -266,7 +267,8 @@ export const EditorUI = (props: EditorUIProps) => { 'editorSuggestWidget.background': lightColor, 'editorSuggestWidget.selectedBackground': secondaryColor, 'editorSuggestWidget.selectedForeground': textColor, - 'editorSuggestWidget.highlightForeground': infoColor, + 'editorSuggestWidget.highlightForeground': primaryColor, + 'editorSuggestWidget.focusHighlightForeground': infoColor, 'editor.lineHighlightBorder': secondaryColor, 'editor.lineHighlightBackground': textbackground === darkColor ? lightColor : secondaryColor, 'editorGutter.background': lightColor, diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx index afe4c54897..4bca319f0e 100644 --- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx +++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx @@ -186,7 +186,7 @@ export const TabsUI = (props: TabsUIProps) => { }} > - {props.tabs.map((tab, i) => {renderTab(tab, i)})} + {props.tabs.map((tab, i) => {renderTab(tab, i)})} {props.tabs.map((tab) => )} From 1c8603ebcb9fd8cc063c3d54c44892ce050263e8 Mon Sep 17 00:00:00 2001 From: lianahus Date: Wed, 7 Sep 2022 11:11:13 +0200 Subject: [PATCH 5/7] fixing e2e golden input --- apps/remix-ide-e2e/src/tests/generalSettings.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide-e2e/src/tests/generalSettings.test.ts b/apps/remix-ide-e2e/src/tests/generalSettings.test.ts index 9ca0bb89ba..a522e92eca 100644 --- a/apps/remix-ide-e2e/src/tests/generalSettings.test.ts +++ b/apps/remix-ide-e2e/src/tests/generalSettings.test.ts @@ -163,7 +163,7 @@ const remixIdeThemes = { }, flatly: { primary: '#2C3E50', - secondary: '#95a5a6', + secondary: '#dadfe0', success: '#18BC9C', info: '#3498DB', warning: '#F39C12', From c29f29a8e79df62a844b630ad6aa175e99e83b19 Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 12 Sep 2022 13:24:17 +0200 Subject: [PATCH 6/7] e2e`:wq `` --- apps/remix-ide-e2e/src/tests/generalSettings.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide-e2e/src/tests/generalSettings.test.ts b/apps/remix-ide-e2e/src/tests/generalSettings.test.ts index a522e92eca..32a6636b81 100644 --- a/apps/remix-ide-e2e/src/tests/generalSettings.test.ts +++ b/apps/remix-ide-e2e/src/tests/generalSettings.test.ts @@ -171,7 +171,7 @@ const remixIdeThemes = { }, spacelab: { primary: '#446E9B', - secondary: '#999', + secondary: '#dadfe0', success: '#3CB521', info: '#3399F3', warning: '#D47500', From 0c98746302a826a60a5252e6da70e544dc4c1bdd Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 12 Sep 2022 15:10:05 +0200 Subject: [PATCH 7/7] e2e --- apps/remix-ide-e2e/src/tests/generalSettings.test.ts | 2 +- libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/remix-ide-e2e/src/tests/generalSettings.test.ts b/apps/remix-ide-e2e/src/tests/generalSettings.test.ts index 32a6636b81..ef6213ea23 100644 --- a/apps/remix-ide-e2e/src/tests/generalSettings.test.ts +++ b/apps/remix-ide-e2e/src/tests/generalSettings.test.ts @@ -179,7 +179,7 @@ const remixIdeThemes = { }, cyborg: { primary: '#2A9FD6', - secondary: '#555', + secondary: '#3c3939', success: '#77B300', info: '#93C', warning: '#F80', diff --git a/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx b/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx index 75c3698f1f..37fa018c92 100644 --- a/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx +++ b/libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx @@ -15,7 +15,7 @@ export function RemixPluginPanel (props: RemixPanelProps) { <> {props.header}
-
+
{Object.values(props.plugins).map((pluginRecord) => { return })}