Merge pull request #2861 from ethereum/diss

bug fixes

apps/remix-ide-e2e/src/commands/addFile.ts

@@ -15,6 +15,7 @@ class AddFile extends EventEmitter {
 
 function addFile (browser: NightwatchBrowser, name: string, content: NightwatchContractContent, done: VoidFunction) {
   browser
+    .saveScreenshot('./reports/screenshots/addFile.png')
     .isVisible({
       selector: "//*[@data-id='sidePanelSwapitTitle' and contains(.,'File explorer')]",
       locateStrategy: 'xpath',
@@ -23,8 +24,11 @@ function addFile (browser: NightwatchBrowser, name: string, content: NightwatchC
     }, (okVisible) => {
       if (!okVisible.value) {
         browser.clickLaunchIcon('filePanel')
+        .saveScreenshot('./reports/screenshots/addFile2.png')
       }
     })
+    .scrollInto('li[data-id="treeViewLitreeViewItemREADME.txt"]')
+    .saveScreenshot('./reports/screenshots/addFile3.png')
     .waitForElementVisible('li[data-id="treeViewLitreeViewItemREADME.txt"]')
     .click('li[data-id="treeViewLitreeViewItemREADME.txt"]').pause(1000) // focus on root directory
     .elements('css selector', `li[data-id="treeViewLitreeViewItem${name}"]`, (res) => {

apps/remix-ide-e2e/src/helpers/init.ts

@@ -24,8 +24,8 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
       .pause(6000)
       .perform(done())
     })
-    .maximizeWindow()
-    .fullscreenWindow(() => {
+    //.maximizeWindow()
+    .perform(() => {
       if (preloadPlugins) {
         initModules(browser, () => {
           browser.pause(2000).clickLaunchIcon('solidity')

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',
@@ -171,7 +171,7 @@ const remixIdeThemes = {
   },
   spacelab: {
     primary: '#446E9B',
-    secondary: '#999',
+    secondary: '#dadfe0',
     success: '#3CB521',
     info: '#3399F3',
     warning: '#D47500',
@@ -179,7 +179,7 @@ const remixIdeThemes = {
   },
   cyborg: {
     primary: '#2A9FD6',
-    secondary: '#555',
+    secondary: '#3c3939',
     success: '#77B300',
     info: '#93C',
     warning: '#F80',

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

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

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

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 {

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,

libs/remix-ui/panel/src/lib/plugins/remix-ui-panel.tsx

@@ -15,7 +15,7 @@ export function RemixPluginPanel (props: RemixPanelProps) {
     <>
       {props.header}
       <div className="pluginsContainer">
-        <div className='plugins pb-2' id='plugins'>
+        <div className='plugins' id='plugins'>
           {Object.values(props.plugins).map((pluginRecord) => {
             return <RemixUIPanelPlugin key={pluginRecord.profile.name} pluginRecord={pluginRecord} />
           })}

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')

libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx

@@ -186,7 +186,7 @@ export const TabsUI = (props: TabsUIProps) => {
           }}
         >
           <TabList className="d-flex flex-row align-items-center">
-            {props.tabs.map((tab, i) => <Tab className="py-1" key={tab.name}>{renderTab(tab, i)}</Tab>)}
+            {props.tabs.map((tab, i) => <Tab className="" key={tab.name}>{renderTab(tab, i)}</Tab>)}
           </TabList>
           {props.tabs.map((tab) => <TabPanel key={tab.name} ></TabPanel>)}
         </Tabs>

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;