Merge pull request #1354 from electrobet/master

Fixed issue #1292; terminal scrollbar may now be scrolled
pull/1/head
yann300 6 years ago committed by GitHub
commit 78addbf28a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 23
      src/app/panels/styles/terminal-styles.js
  2. 2
      src/app/panels/terminal.js
  3. 2
      src/app/ui/styles-guide/style-guide.js
  4. 2
      src/app/ui/styles-guide/styleGuideDark.js

@ -57,25 +57,10 @@ var css = csjs`
overflow-y : auto; overflow-y : auto;
font-family : monospace; font-family : monospace;
margin : 0px; margin : 0px;
} background-image : ${styles.terminal.backgroundImage_Terminal};
.terminal_bg { background-repeat : no-repeat;
display : flex; background-position : center 15%;
flex-direction : column; background-size : auto calc(75% - 1.7em);
height : 100%;
padding-left : 5px;
padding-right : 5px;
padding-bottom : 3px;
overflow-y : auto;
font-family : monospace;
background-image : ${styles.terminal.backgroundImage_Terminal};
opacity : 0.1;
top : 15%;
left : 33%;
bottom : 0;
right : 0;
position : absolute;
background-repeat : no-repeat;
background-size : 45%;
} }
.terminal { .terminal {
position: relative; position: relative;

@ -145,8 +145,6 @@ class Terminal {
self._view.term = yo` self._view.term = yo`
<div class=${css.terminal_container} onscroll=${throttle(reattach, 10)} onclick=${focusinput}> <div class=${css.terminal_container} onscroll=${throttle(reattach, 10)} onclick=${focusinput}>
<div class=${css.terminal_bg}>
</div>
<div class=${css.terminal}> <div class=${css.terminal}>
${self._view.journal} ${self._view.journal}
${self._view.cli} ${self._view.cli}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save