Merge pull request #1819 from ethereum/swap_it_style_fixes_l

Swap it style fixes l
pull/1/head
yann300 6 years ago committed by GitHub
commit b7425ab85d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      src/app/execution/txLogger.js
  2. 8
      src/app/panels/editor-panel.js
  3. 4
      src/app/panels/tab-proxy.js

@ -24,7 +24,7 @@ var css = csjs`
opacity: 0.8; opacity: 0.8;
} }
.arrow { .arrow {
color: var(--primary); color: var(--text-info);
font-size: 20px; font-size: 20px;
cursor: pointer; cursor: pointer;
display: flex; display: flex;
@ -57,12 +57,12 @@ var css = csjs`
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
color: var(--primary); color: var(--text-info);
text-transform: uppercase; text-transform: uppercase;
font-weight: bold; font-weight: bold;
} }
.txItem { .txItem {
color: var(--primary); color: var(--text-info);
margin-right: 5px; margin-right: 5px;
float: left; float: left;
} }
@ -70,7 +70,7 @@ var css = csjs`
font-weight: bold; font-weight: bold;
} }
.tx { .tx {
color: var(--primary); color: var(--text-info);
font-weight: bold; font-weight: bold;
float: left; float: left;
margin-right: 10px; margin-right: 10px;
@ -80,8 +80,8 @@ var css = csjs`
.td { .td {
border-collapse: collapse; border-collapse: collapse;
font-size: 10px; font-size: 10px;
color: var(--primary); color: var(--text-info);
border: 1px solid var(--primary); border: 1px solid var(--text-info);
} }
#txTable { #txTable {
margin-top: 1%; margin-top: 1%;

@ -55,8 +55,14 @@ class EditorPanel {
self._view.editor.style.display = 'none' self._view.editor.style.display = 'none'
self._components.contextView.hide() self._components.contextView.hide()
self._view.mainPanel.style.display = 'block' self._view.mainPanel.style.display = 'block'
self.tabProxy.sh
} }
self.appManager.event.on('ensureActivated', (name) => { if (name === 'home') { showApp(name) } }) self.appManager.event.on('ensureActivated', (name) => {
if (name === 'home') {
showApp(name)
self.tabProxy.showTab('home')
}
})
/* /*
We listen here on event from the tab component to display / hide the editor and mainpanel We listen here on event from the tab component to display / hide the editor and mainpanel
depending on the content that should be displayed depending on the content that should be displayed

@ -100,6 +100,10 @@ export class TabProxy {
} }
} }
showTab (name) {
this._view.filetabs.activateTab(name)
}
addTab (name, switchTo, close, kind) { addTab (name, switchTo, close, kind) {
var slash = name.split('/') var slash = name.split('/')
let title = name.indexOf('/') !== -1 ? slash[slash.length - 1] : name let title = name.indexOf('/') !== -1 ? slash[slash.length - 1] : name

Loading…
Cancel
Save