Merge pull request #1880 from ethereum/origin/develop_L

search input field style on terminal
pull/1/head
Liana Husikyan 6 years ago committed by GitHub
commit 8fca40fe8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      src/app/panels/styles/terminal-styles.js
  2. 25
      src/app/panels/terminal.js
  3. 1
      src/app/tabs/styles/debugger-tab-styles.js
  4. 10
      src/app/ui/landing-page/landing-page.js

@ -90,17 +90,17 @@ var css = csjs`
.search { .search {
display : flex; display : flex;
align-items : center; align-items : center;
width : 200px; width : 330px;
padding-left : 20px; padding-left : 20px;
height : 100%; height : 100%;
} }
.filter { .filter {
width : 200px;
padding-right : 0px; padding-right : 0px;
margin-right : 0px; margin-right : 0px;
border-top-left-radius : 0px;
border-bottom-left-radius : 0px;
height : 100%; height : 100%;
white-space : nowrap;
overflow : hidden;
text-overflow : ellipsis;
} }
.searchIcon { .searchIcon {
height : 100%; height : 100%;

@ -125,7 +125,14 @@ class Terminal extends BaseApi {
<div onmousedown=${mousedown} class=${css.dragbarHorizontal}></div>` <div onmousedown=${mousedown} class=${css.dragbarHorizontal}></div>`
self._view.pendingTxCount = yo`<div class=${css.pendingTx} title='Pending Transactions'>0</div>` self._view.pendingTxCount = yo`<div class=${css.pendingTx} title='Pending Transactions'>0</div>`
self._view.inputSearch = yo`<input spellcheck="false" type="text" class="${css.filter} form-control" id="input" onkeydown=${filter} placeholder="Search transactions"></input>` self._view.inputSearch = yo`<input
spellcheck="false"
type="text"
class="${css.filter} form-control"
id="searchInput"
onkeydown=${filter}
placeholder="Search with transaction hash or address">
</input>`
self._view.bar = yo` self._view.bar = yo`
<div class="${css.bar}"> <div class="${css.bar}">
${self._view.dragbar} ${self._view.dragbar}
@ -138,9 +145,19 @@ class Terminal extends BaseApi {
${self._view.pendingTxCount} ${self._view.pendingTxCount}
<div class=${css.verticalLine}></div> <div class=${css.verticalLine}></div>
<div class="form-check"> <div class="form-check">
<input id="listenNetworkCheck" onchange=${listenOnNetwork} type="checkbox" class="form-check-input " <input
title="If checked Remix will listen on all transactions mined in the current environment and not only transactions created by you"> id="listenNetworkCheck"
<label class="form-check-label" title="If checked Remix will listen on all transactions mined in the current environment and not only transactions created by you" for="listenNetworkCheck">listen on network</label> onchange=${listenOnNetwork}
type="checkbox" class="form-check-input "
title="If checked Remix will listen on all transactions mined in the current environment and not only transactions created by you"
>
<label
class="form-check-label"
title="If checked Remix will listen on all transactions mined in the current environment and not only transactions created by you"
for="listenNetworkCheck"
>
listen on network
</label>
</div> </div>
<div class=${css.search}> <div class=${css.search}>
<i class="fas fa-search ${css.searchIcon} bg-light" aria-hidden="true"></i> <i class="fas fa-search ${css.searchIcon} bg-light" aria-hidden="true"></i>

@ -6,6 +6,7 @@ const css = csjs`
} }
.debugger { .debugger {
margin-bottom: 1%; margin-bottom: 1%;
width: max-content;
} }
` `

@ -163,11 +163,19 @@ export class LandingPage extends BaseApi {
globalRegistry.get('verticalicon').api.select('fileExplorers') globalRegistry.get('verticalicon').api.select('fileExplorers')
} }
globalRegistry.get('themeModule').api.events.on('themeChanged', (type) => {
const invert = type === 'dark' ? 1 : 0
const img = document.getElementById('remixLogo')
if (img) {
img.style.filter = `invert(${invert})`
}
})
let container = yo`<div class="${css.homeContainer} bg-light"> let container = yo`<div class="${css.homeContainer} bg-light">
<div class="${css.jumbotronContainer}"> <div class="${css.jumbotronContainer}">
<div class="alert alert-info clearfix ${css.thisJumboton}"> <div class="alert alert-info clearfix ${css.thisJumboton}">
<div class="${css.logoContainer}"> <div class="${css.logoContainer}">
<img src="${logo}" alt="remix logo"> <img id="remixLogo" src="${logo}" alt="remix logo">
</div> </div>
<div class="${css.headlineContainer}"> <div class="${css.headlineContainer}">
<h2 class="">The new layout has arrived</h2> <h2 class="">The new layout has arrived</h2>

Loading…
Cancel
Save