fix terminal bootstrap

pull/1/head
yann300 6 years ago
parent 44737a197d
commit 1faf99c18c
  1. 7
      src/app/panels/styles/terminal-styles.js
  2. 8
      src/app/panels/terminal.js
  3. 6
      src/app/ui/auto-complete-popup.js

@ -6,7 +6,6 @@ var css = csjs`
display : flex; display : flex;
flex-direction : column; flex-direction : column;
font-size : 12px; font-size : 12px;
color : var(--primary);
height : 100%; height : 100%;
min-height : 1.7em; min-height : 1.7em;
overflow : hidden; overflow : hidden;
@ -18,7 +17,6 @@ var css = csjs`
z-index : 3; z-index : 3;
} }
.menu { .menu {
color : var(--primary);
position : relative; position : relative;
display : flex; display : flex;
align-items : center; align-items : center;
@ -28,7 +26,6 @@ var css = csjs`
margin-right : 20px; margin-right : 20px;
width : 10px; width : 10px;
cursor : pointer; cursor : pointer;
color : var(--primary);
display : flex; display : flex;
} }
.clear:hover { .clear:hover {
@ -40,7 +37,6 @@ var css = csjs`
font-size : 14px; font-size : 14px;
font-weight : bold; font-weight : bold;
cursor : pointer; cursor : pointer;
color : var(--primary);
} }
.toggleTerminal:hover { .toggleTerminal:hover {
color : var(--secondary); color : var(--secondary);
@ -73,7 +69,6 @@ var css = csjs`
line-height : 2ch; line-height : 2ch;
padding : 1ch; padding : 1ch;
margin-top : 2ch; margin-top : 2ch;
color : var(--primary)
} }
.cli { .cli {
line-height : 1.7em; line-height : 1.7em;
@ -87,7 +82,6 @@ var css = csjs`
font-family : monospace; font-family : monospace;
font-weight : bold; font-weight : bold;
font-size : 14px; font-size : 14px;
color : var(--secondary);
} }
.input { .input {
word-break : break-all; word-break : break-all;
@ -107,7 +101,6 @@ var css = csjs`
border-bottom-left-radius : 0px; border-bottom-left-radius : 0px;
} }
.searchIcon { .searchIcon {
color : var(--primary)
height : 25px; height : 25px;
width : 25px; width : 25px;
border-top-left-radius : 3px; border-top-left-radius : 3px;

@ -119,7 +119,7 @@ class Terminal {
` `
self._view.input.innerText = '\n' self._view.input.innerText = '\n'
self._view.cli = yo` self._view.cli = yo`
<div class="${css.cli} bg-light"> <div class="${css.cli}">
<span class=${css.prompt}>${'>'}</span> <span class=${css.prompt}>${'>'}</span>
${self._view.input} ${self._view.input}
</div> </div>
@ -132,7 +132,7 @@ class Terminal {
self._view.dropdown = self._components.dropdown.render() self._view.dropdown = self._components.dropdown.render()
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.bar = yo` self._view.bar = yo`
<div class="${css.bar} bg-light"> <div class="${css.bar}">
${self._view.dragbar} ${self._view.dragbar}
<div class=${css.menu}> <div class=${css.menu}>
${self._view.icon} ${self._view.icon}
@ -156,7 +156,7 @@ class Terminal {
</div> </div>
` `
self._view.term = yo` self._view.term = yo`
<div class="${css.terminal_container} bg-light" onscroll=${throttle(reattach, 10)} onclick=${focusinput}> <div class="${css.terminal_container}" onscroll=${throttle(reattach, 10)} onclick=${focusinput}>
<div class=${css.terminal}> <div class=${css.terminal}>
${self._view.journal} ${self._view.journal}
${self._view.cli} ${self._view.cli}
@ -165,7 +165,7 @@ class Terminal {
` `
self._view.autoCompletePopup = self._components.autoCompletePopup.render() self._view.autoCompletePopup = self._components.autoCompletePopup.render()
self._view.el = yo` self._view.el = yo`
<div class="${css.panel} bg-light"> <div class="${css.panel}">
${self._view.bar} ${self._view.bar}
${self._view.term} ${self._view.term}
</div> </div>

@ -6,7 +6,7 @@ var modal = require('./modaldialog.js')
// -------------- styling ---------------------- // -------------- styling ----------------------
var css = require('./styles/auto-complete-popup-styles') var css = require('./styles/auto-complete-popup-styles')
var cssModal = require('./styles/modaldialog-styles') // var cssModal = require('./styles/modaldialog-styles')
/* USAGE: /* USAGE:
@ -32,11 +32,13 @@ class AutoCompletePopup {
} }
resetCSSValuesModalContainer () { resetCSSValuesModalContainer () {
/*
var modalContainer = document.querySelector(`.${cssModal.modal}`) var modalContainer = document.querySelector(`.${cssModal.modal}`)
modalContainer.style.display = 'none' modalContainer.style.display = 'none'
var modalContent = document.querySelector(`.${css.modalContent}`) var modalContent = document.querySelector(`.${css.modalContent}`)
let newModalContent = modalContent ? document.querySelector(`.${css.modalContent}`) : document.querySelector(`.${cssModal.modalContent}`) let newModalContent = modalContent ? document.querySelector(`.${css.modalContent}`) : document.querySelector(`.${cssModal.modalContent}`)
newModalContent.className = cssModal.modalContent newModalContent.className = cssModal.modalContent
*/
} }
render () { render () {
@ -121,9 +123,11 @@ class AutoCompletePopup {
} }
function editCSSValuesModalContainer () { function editCSSValuesModalContainer () {
/*
var modalContent = document.querySelector(`.${cssModal.modalContent}`) var modalContent = document.querySelector(`.${cssModal.modalContent}`)
let newModalContent = modalContent ? document.querySelector(`.${cssModal.modalContent}`) : document.querySelector(`.${css.modalContent}`) let newModalContent = modalContent ? document.querySelector(`.${cssModal.modalContent}`) : document.querySelector(`.${css.modalContent}`)
newModalContent.className = css.modalContent newModalContent.className = css.modalContent
*/
} }
setUpPopUp() setUpPopUp()

Loading…
Cancel
Save