Skip to content

B
baas-ide
Unverified Commit 9925c986 authored by David Disu's avatar David Disu Committed by GitHub
Browse files
Options

Merge pull request #365 from ethereum/filterThemes

filtered the themes and added new once
parents b3a6133a 7ec95003
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 151 deletions
apps/remix-ide-e2e/src/tests/generalSettings.test.ts
View file @ 9925c986
......@@ -101,55 +101,7 @@ module.exports = {
.checkElementStyle(':root', '--danger', remixIdeThemes.flatly.danger)
},
'Should load Lumen theme': function (browser: NightwatchBrowser) {
browser.waitForElementVisible('*[data-id="verticalIconsKindsettings"]', 5000)
.click('*[data-id="settingsTabThemeLabelLumen"]')
.pause(2000)
.checkElementStyle(':root', '--primary', remixIdeThemes.lumen.primary)
.checkElementStyle(':root', '--secondary', remixIdeThemes.lumen.secondary)
.checkElementStyle(':root', '--success', remixIdeThemes.lumen.success)
.checkElementStyle(':root', '--info', remixIdeThemes.lumen.info)
.checkElementStyle(':root', '--warning', remixIdeThemes.lumen.warning)
.checkElementStyle(':root', '--danger', remixIdeThemes.lumen.danger)
},
'Should load Minty theme': function (browser: NightwatchBrowser) {
browser.waitForElementVisible('*[data-id="verticalIconsKindsettings"]', 5000)
.click('*[data-id="settingsTabThemeLabelMinty"]')
.pause(2000)
.checkElementStyle(':root', '--primary', remixIdeThemes.minty.primary)
.checkElementStyle(':root', '--secondary', remixIdeThemes.minty.secondary)
.checkElementStyle(':root', '--success', remixIdeThemes.minty.success)
.checkElementStyle(':root', '--info', remixIdeThemes.minty.info)
.checkElementStyle(':root', '--warning', remixIdeThemes.minty.warning)
.checkElementStyle(':root', '--danger', remixIdeThemes.minty.danger)
},
'Should load Pulse theme': function (browser: NightwatchBrowser) {
browser.waitForElementVisible('*[data-id="verticalIconsKindsettings"]', 5000)
.click('*[data-id="settingsTabThemeLabelPulse"]')
.pause(2000)
.checkElementStyle(':root', '--primary', remixIdeThemes.pulse.primary)
.checkElementStyle(':root', '--secondary', remixIdeThemes.pulse.secondary)
.checkElementStyle(':root', '--success', remixIdeThemes.pulse.success)
.checkElementStyle(':root', '--info', remixIdeThemes.pulse.info)
.checkElementStyle(':root', '--warning', remixIdeThemes.pulse.warning)
.checkElementStyle(':root', '--danger', remixIdeThemes.pulse.danger)
},
'Should load Sandstone theme': function (browser: NightwatchBrowser) {
browser.waitForElementVisible('*[data-id="verticalIconsKindsettings"]', 5000)
.click('*[data-id="settingsTabThemeLabelSandstone"]')
.pause(2000)
.checkElementStyle(':root', '--primary', remixIdeThemes.sandstone.primary)
.checkElementStyle(':root', '--secondary', remixIdeThemes.sandstone.secondary)
.checkElementStyle(':root', '--success', remixIdeThemes.sandstone.success)
.checkElementStyle(':root', '--info', remixIdeThemes.sandstone.info)
.checkElementStyle(':root', '--warning', remixIdeThemes.sandstone.warning)
.checkElementStyle(':root', '--danger', remixIdeThemes.sandstone.danger)
},
'Should load Spacelab theme': function (browser: NightwatchBrowser) {
'Should load Spacelab theme': function (browser) {
browser.waitForElementVisible('*[data-id="verticalIconsKindsettings"]', 5000)
.click('*[data-id="settingsTabThemeLabelSpacelab"]')
.pause(2000)
......@@ -161,19 +113,7 @@ module.exports = {
.checkElementStyle(':root', '--danger', remixIdeThemes.spacelab.danger)
},
'Should load Yeti theme': function (browser: NightwatchBrowser) {
browser.waitForElementVisible('*[data-id="verticalIconsKindsettings"]', 5000)
.click('*[data-id="settingsTabThemeLabelYeti"]')
.pause(2000)
.checkElementStyle(':root', '--primary', remixIdeThemes.yeti.primary)
.checkElementStyle(':root', '--secondary', remixIdeThemes.yeti.secondary)
.checkElementStyle(':root', '--success', remixIdeThemes.yeti.success)
.checkElementStyle(':root', '--info', remixIdeThemes.yeti.info)
.checkElementStyle(':root', '--warning', remixIdeThemes.yeti.warning)
.checkElementStyle(':root', '--danger', remixIdeThemes.yeti.danger)
},
'Should load Cyborg theme': function (browser: NightwatchBrowser) {
'Should load Cyborg theme': function (browser) {
browser.waitForElementVisible('*[data-id="verticalIconsKindsettings"]', 5000)
.click('*[data-id="settingsTabThemeLabelCyborg"]')
.pause(2000)
......@@ -185,31 +125,6 @@ module.exports = {
.checkElementStyle(':root', '--danger', remixIdeThemes.cyborg.danger)
},
'Should load Darkly theme': function (browser: NightwatchBrowser) {
browser.waitForElementVisible('*[data-id="verticalIconsKindsettings"]', 5000)
.click('*[data-id="settingsTabThemeLabelDarkly"]')
.pause(2000)
.checkElementStyle(':root', '--primary', remixIdeThemes.darkly.primary)
.checkElementStyle(':root', '--secondary', remixIdeThemes.darkly.secondary)
.checkElementStyle(':root', '--success', remixIdeThemes.darkly.success)
.checkElementStyle(':root', '--info', remixIdeThemes.darkly.info)
.checkElementStyle(':root', '--warning', remixIdeThemes.darkly.warning)
.checkElementStyle(':root', '--danger', remixIdeThemes.darkly.danger)
},
'Should load Superhero theme': function (browser: NightwatchBrowser) {
browser.waitForElementVisible('*[data-id="verticalIconsKindsettings"]', 5000)
.click('*[data-id="settingsTabThemeLabelSuperhero"]')
.pause(2000)
.checkElementStyle(':root', '--primary', remixIdeThemes.superhero.primary)
.checkElementStyle(':root', '--secondary', remixIdeThemes.superhero.secondary)
.checkElementStyle(':root', '--success', remixIdeThemes.superhero.success)
.checkElementStyle(':root', '--info', remixIdeThemes.superhero.info)
.checkElementStyle(':root', '--warning', remixIdeThemes.superhero.warning)
.checkElementStyle(':root', '--danger', remixIdeThemes.superhero.danger)
.end()
},
tearDown: sauce
}
......@@ -246,38 +161,6 @@ const remixIdeThemes = {
warning: '#F39C12',
danger: '#E74C3C'
},
lumen: {
primary: '#158CBA',
secondary: '#f0f0f0',
success: '#28B62C',
info: '#75CAEB',
warning: '#FF851B',
danger: '#FF4136'
},
minty: {
primary: '#78C2AD',
secondary: '#F3969A',
success: '#56CC9D',
info: '#6CC3D5',
warning: '#FFCE67',
danger: '#FF7851'
},
pulse: {
primary: '#593196',
secondary: '#A991D4',
success: '#13B955',
info: '#009CDC',
warning: '#EFA31D',
danger: '#FC3939'
},
sandstone: {
primary: '#325D88',
secondary: '#8E8C84',
success: '#93C54B',
info: '#29ABE0',
warning: '#F47C3C',
danger: '#d9534f'
},
spacelab: {
primary: '#446E9B',
secondary: '#999',
......@@ -286,14 +169,6 @@ const remixIdeThemes = {
warning: '#D47500',
danger: '#CD0200'
},
yeti: {
primary: '#008cba',
secondary: '#eee',
success: '#43ac6a',
info: '#5bc0de',
warning: '#E99002',
danger: '#F04124'
},
cyborg: {
primary: '#2A9FD6',
secondary: '#555',
......@@ -301,21 +176,5 @@ const remixIdeThemes = {
info: '#9933CC',
warning: '#FF8800',
danger: '#CC0000'
},
darkly: {
primary: '#375a7f',
secondary: '#444',
success: '#00bc8c',
info: '#3498DB',
warning: '#F39C12',
danger: '#E74C3C'
},
superhero: {
primary: '#DF691A',
secondary: '#4E5D6C',
success: '#5cb85c',
info: '#5bc0de',
warning: '#f0ad4e',
danger: '#d9534f'
}
}
apps/remix-ide/src/app/tabs/theme-module.js
View file @ 9925c986
......@@ -7,18 +7,14 @@ import yo from 'yo-yo'
const themes = [
{name: 'Dark', quality: 'dark', url: 'https://res.cloudinary.com/lianahus/raw/upload/v1597918237/remix-themes/PR365/remix-dark_tvx1s2.css'},
{name: 'Light', quality: 'light', url: 'https://res.cloudinary.com/lianahus/raw/upload/v1597918237/remix-themes/PR365/remix-light_powaqg.css'},
{name: 'Midcentury', quality: 'light', url: 'https://res.cloudinary.com/lianahus/raw/upload/v1598014334/remix-themes/PR365/remix-midcentury_hrzph3.css'},
{name: 'Black', quality: 'dark', url: 'https://res.cloudinary.com/lianahus/raw/upload/v1598014334/remix-themes/PR365/remix-black_undtds.css'},
{name: 'Candy', quality: 'light', url: 'https://res.cloudinary.com/lianahus/raw/upload/v1598014799/remix-themes/PR365/remix-candy_ikhg4m.css'},
{name: 'Cerulean', quality: 'light', url: 'https://bootswatch.com/4/cerulean/bootstrap.min.css'},
{name: 'Flatly', quality: 'light', url: 'https://bootswatch.com/4/flatly/bootstrap.min.css'},
{name: 'Lumen', quality: 'light', url: 'https://bootswatch.com/4/lumen/bootstrap.min.css'},
{name: 'Minty', quality: 'light', url: 'https://bootswatch.com/4/minty/bootstrap.min.css'},
{name: 'Pulse', quality: 'light', url: 'https://bootswatch.com/4/pulse/bootstrap.min.css'},
{name: 'Sandstone', quality: 'light', url: 'https://bootswatch.com/4/sandstone/bootstrap.min.css'},
{name: 'Spacelab', quality: 'light', url: 'https://bootswatch.com/4/spacelab/bootstrap.min.css'},
{name: 'Yeti', quality: 'light', url: 'https://bootswatch.com/4/yeti/bootstrap.min.css'},
{name: 'Cyborg', quality: 'dark', url: 'https://bootswatch.com/4/cyborg/bootstrap.min.css'},
{name: 'Darkly', quality: 'dark', url: 'https://stackpath.bootstrapcdn.com/bootswatch/4.3.1/darkly/bootstrap.min.css'},
{name: 'Superhero', quality: 'dark', url: 'https://stackpath.bootstrapcdn.com/bootswatch/4.3.1/superhero/bootstrap.min.css'}
{name: 'Cyborg', quality: 'dark', url: 'https://bootswatch.com/4/cyborg/bootstrap.min.css'}
]
const profile = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment