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 136e53ff42..47c7fa9b91 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 @@ -284,19 +284,19 @@ template { color:#fff } .h1,h1 { - font-size:4rem + font-size:3rem } .h2,h2 { - font-size:3rem + font-size:2.5rem } .h3,h3 { - font-size:2.5rem + font-size:2rem } .h4,h4 { - font-size:2rem + font-size:1.6rem } .h5,h5 { - font-size:1.5rem + font-size:1.3rem } .h6,h6 { font-size:.875rem diff --git a/apps/remix-ide/src/assets/img/gnosissafeLogo.png b/apps/remix-ide/src/assets/img/gnosissafeLogo.png new file mode 100644 index 0000000000..cd0e7ffcb6 Binary files /dev/null and b/apps/remix-ide/src/assets/img/gnosissafeLogo.png differ diff --git a/apps/remix-ide/src/assets/img/openzeppelinLogo.png b/apps/remix-ide/src/assets/img/openzeppelinLogo.png new file mode 100644 index 0000000000..6123132cdb Binary files /dev/null and b/apps/remix-ide/src/assets/img/openzeppelinLogo.png differ diff --git a/apps/remix-ide/src/assets/img/oxprojectLogo.png b/apps/remix-ide/src/assets/img/oxprojectLogo.png new file mode 100644 index 0000000000..9b200354ab Binary files /dev/null and b/apps/remix-ide/src/assets/img/oxprojectLogo.png differ diff --git a/apps/remix-ide/src/assets/img/remixverticaltextLogo.png b/apps/remix-ide/src/assets/img/remixverticaltextLogo.png new file mode 100644 index 0000000000..179807a658 Binary files /dev/null and b/apps/remix-ide/src/assets/img/remixverticaltextLogo.png differ diff --git a/apps/remix-ide/src/blockchain/execution-context.js b/apps/remix-ide/src/blockchain/execution-context.js index 7c33bb4f27..7a37c0aac6 100644 --- a/apps/remix-ide/src/blockchain/execution-context.js +++ b/apps/remix-ide/src/blockchain/execution-context.js @@ -7,7 +7,7 @@ const _paq = window._paq = window._paq || [] let web3 -const config = { defaultTransactionType: '0x0' } +const config = { defaultTransactionType: '0x0', ignoreGasPricing: true } if (typeof window !== 'undefined' && typeof window.ethereum !== 'undefined') { var injectedProvider = window.ethereum web3 = new Web3(injectedProvider) diff --git a/libs/ghaction-helper/src/methods.ts b/libs/ghaction-helper/src/methods.ts index 9bfa470033..16c5a5f2d4 100644 --- a/libs/ghaction-helper/src/methods.ts +++ b/libs/ghaction-helper/src/methods.ts @@ -11,7 +11,7 @@ const providerConfig = { blockNumber: global.blockNumber || null } -const config = { defaultTransactionType: '0x0' } +const config = { defaultTransactionType: '0x0', ignoreGasPricing: true } global.remixProvider = new Provider(providerConfig) global.remixProvider.init() global.web3Provider = new ethers.providers.Web3Provider(global.remixProvider) diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx index fc83101850..74a439979b 100644 --- a/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx @@ -74,8 +74,8 @@ function HomeTabFeaturedPlugins({plugin}: HomeTabFeaturedPluginsProps) { } const startCookbook = async () => { await plugin.appManager.activatePlugin(['cookbookdev']) - plugin.verticalIcons.select('cookbook.dev') - _paq.push(['trackEvent', 'hometabActivate', 'userActivate', 'cookbook.dev']) + plugin.verticalIcons.select('cookbookdev') + _paq.push(['trackEvent', 'hometabActivate', 'userActivate', 'cookbookdev']) } const startSolidityUnitTesting = async () => { await plugin.appManager.activatePlugin(['solidity', 'solidityUnitTesting']) diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx index b97f0faa52..4de6de4175 100644 --- a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx @@ -106,48 +106,54 @@ function HomeTabGetStarted({plugin}: HomeTabGetStartedProps) { > createWorkspace("gnosisSafeMultisig")} /> createWorkspace("zeroxErc20")} /> createWorkspace('ozerc20')} /> createWorkspace("ozerc721")} /> createWorkspace("ozerc1155")} /> createWorkspace("remixDefault")} /> diff --git a/libs/remix-ui/home-tab/src/lib/components/workspaceTemplate.tsx b/libs/remix-ui/home-tab/src/lib/components/workspaceTemplate.tsx index 2a1d78da58..ee48f5d83c 100644 --- a/libs/remix-ui/home-tab/src/lib/components/workspaceTemplate.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/workspaceTemplate.tsx @@ -1,23 +1,34 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import React, {useContext} from 'react' +import {CustomTooltip} from '@remix-ui/helper' +import {ThemeContext} from '../themeContext' + interface WorkspaceTemplateProps { gsID: string workspaceTitle: string + projectLogo: string callback: any description: string } -function WorkspaceTemplate({gsID, workspaceTitle, description, callback}: WorkspaceTemplateProps) { +function WorkspaceTemplate({gsID, workspaceTitle, description, projectLogo, callback}: WorkspaceTemplateProps) { + const themeFilter = useContext(ThemeContext) + + console.log("theme ", themeFilter) return (
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 3a8e7d6a06..a7fa9b4da4 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 @@ -76,8 +76,8 @@ text-align: left; } .remixui_home_cursorStyle { - cursor: pointer; - font-size: 0.8rem; + cursor: pointer; + font-weight: 900; } .remixui_home_envButton { width: 220px;