Merge pull request #1782 from ethereum/swap_it_style_fixes_l

landing page restyleing part 1
pull/3094/head
yann300 6 years ago committed by GitHub
commit 488c3a1876
  1. 47
      src/app/ui/landing-page/landing-page.js
  2. 8
      src/app/ui/landing-page/section.js
  3. 20
      src/app/ui/landing-page/workspace.js
  4. 4
      src/app/ui/styles/modaldialog-styles.js

File diff suppressed because one or more lines are too long

@ -3,23 +3,19 @@ let csjs = require('csjs-inject')
var css = csjs` var css = csjs`
.text { .text {
background-color : var(--success);
cursor: pointer; cursor: pointer;
color: var(--primary);
font-weight: normal; font-weight: normal;
max-width: 300px;
} }
.text:hover { .text:hover {
font-weight: bold; font-weight: bold;
} }
.link { .link {
cursor: pointer; cursor: pointer;
background-color : var(--primary);
color: var(--success);
font-weight: normal; font-weight: normal;
text-decoration : none; text-decoration : none;
} }
.link:hover { .link:hover {
color: var(--success);
font-weight: bold; font-weight: bold;
text-decoration : none; text-decoration : none;
} }
@ -29,7 +25,7 @@ class Section {
constructor (title, actions) { constructor (title, actions) {
this.title = title this.title = title
this.actions = actions this.actions = actions
this.cardStyle = (this.title === 'Workspaces') ? 'bg-success text-primary' : 'bg-primary text-success border-success' this.cardStyle = (this.title === 'Workspaces') ? 'bg-success text-light' : 'bg-light text-dark border-dark'
} }
render () { render () {

@ -9,35 +9,21 @@ export class Workspace {
export const defaultWorkspaces = (appManager) => { export const defaultWorkspaces = (appManager) => {
return [ return [
new Workspace('Solidity Basic', '', () => { new Workspace('Solidity', '', () => {
appManager.ensureActivated('solidity')
}, () => {}),
new Workspace('Solidity Unit testing', '', () => {
appManager.ensureActivated('solidity')
appManager.ensureActivated('solidityUnitTesting')
}, () => {}),
new Workspace('Solidity Full Environement', '', () => {
appManager.ensureActivated('solidity') appManager.ensureActivated('solidity')
appManager.ensureActivated('run') appManager.ensureActivated('run')
appManager.ensureActivated('solidityStaticAnalysis') appManager.ensureActivated('solidityStaticAnalysis')
appManager.ensureActivated('solidityUnitTesting') appManager.ensureActivated('solidityUnitTesting')
}, () => {}), }, () => {}),
new Workspace('Vyper Basic', '', () => { new Workspace('Vyper', '', () => {
appManager.ensureActivated('vyper') appManager.ensureActivated('vyper')
appManager.ensureActivated('run')
}, () => {}), }, () => {}),
new Workspace('Pipeline', '', () => { new Workspace('Pipeline', '', () => {
appManager.ensureActivated('solidity') appManager.ensureActivated('solidity')
appManager.ensureActivated('run') appManager.ensureActivated('run')
appManager.ensureActivated('pipeline') appManager.ensureActivated('pipeline')
}, () => {}), }, () => {}),
new Workspace('Deploy and Run Solidity', '', () => {
appManager.ensureActivated('solidity')
appManager.ensureActivated('run')
}, () => {}),
new Workspace('Deploy and Run Vyper', '', () => {
appManager.ensureActivated('vyper')
appManager.ensureActivated('run')
}, () => {}),
new Workspace('Debugger', '', () => { new Workspace('Debugger', '', () => {
appManager.ensureActivated('debugger') appManager.ensureActivated('debugger')
}, () => {}) }, () => {})

@ -56,16 +56,12 @@ var css = csjs`
animation-duration: 0.4s animation-duration: 0.4s
} }
.modalFooterOk { .modalFooterOk {
background-color: var(--light);
color: var(--dark);
cursor: pointer; cursor: pointer;
} }
.modalFooterOk:hover { .modalFooterOk:hover {
cursor: pointer; cursor: pointer;
} }
.modalFooterCancel { .modalFooterCancel {
background-color: var(--light);
color: var(--dark);
margin-left: 1em; margin-left: 1em;
cursor: pointer; cursor: pointer;
} }

Loading…
Cancel
Save