Merge branch 'master' into editorcontext_merge

2 years ago · f008abd8af
parent 17c91d342d d5af8d205a
commit f008abd8af
2 changed files with 86 additions and 84 deletions
--- a/apps/remix-ide-e2e/src/tests/gist.test.ts
+++ b/apps/remix-ide-e2e/src/tests/gist.test.ts
@ -128,7 +128,7 @@ module.exports = {

  'Import From Gist For Valid Gist ID #group2': function (browser: NightwatchBrowser) {
    browser
-      .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
+      .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 15000)
      .clickLaunchIcon('settings')
      .click('*[data-id="settingsTabGenerateContractMetadataLabel"]')
      .setValue('[data-id="settingsTabGistAccessToken"]', process.env.gist_token)
--- a/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css
+++ b/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css
@ -30,7 +30,9 @@
    --info:#3399f3;
    --warning:#d47500;
    --danger:#cd0200;
-    --text:#eee;
+    --text: #343a40;
+    /* --text:#eee; */
+    /* --text-background: #; */
    --light:#eee;
    --dark:#333;
    --body-bg:#fff;