Browse Source

fix(network, activity): fix 100vh height issues and search position

renovate/lint-staged-8.x
Jack Mallers 7 years ago
parent
commit
d9d7a06c24
  1. 1
      app/app.global.scss
  2. 12
      app/components/Contacts/Network.scss
  3. 2
      app/routes/activity/components/Activity.js
  4. 2
      app/routes/activity/components/Activity.scss
  5. 2
      app/routes/app/components/App.js
  6. 1
      app/routes/app/components/App.scss

1
app/app.global.scss

@ -17,7 +17,6 @@ body {
margin: 0; margin: 0;
padding: 0; padding: 0;
color: #333; color: #333;
height: 100vh;
box-sizing: border-box; box-sizing: border-box;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-webkit-tap-highlight-color: rgba(255,255,255,0); -webkit-tap-highlight-color: rgba(255,255,255,0);

12
app/components/Contacts/Network.scss

@ -85,9 +85,11 @@
} }
.search { .search {
height: 55px; position: absolute;
padding: 2px 5px; bottom: 20px;
border-top: 0.5px solid #ccc; width: calc(100% - 40px);
padding: 10px 20px;
border-top: 1px solid $darkestgrey;
.input { .input {
display: inline-block; display: inline-block;
@ -111,10 +113,10 @@
} }
.text { .text {
width: 90%; width: calc(95% - 20px);
background: transparent; background: transparent;
outline: 0; outline: 0;
padding: 0 5px; padding: 0 10px;
border: 0; border: 0;
border-radius: 0; border-radius: 0;
height: 50px; height: 50px;

2
app/routes/activity/components/Activity.js

@ -70,7 +70,7 @@ class Activity extends Component {
if (!balance.channelBalance || !balance.walletBalance) { return <LoadingBolt /> } if (!balance.channelBalance || !balance.walletBalance) { return <LoadingBolt /> }
return ( return (
<div style={{ height: '100%' }}> <div>
<Modal <Modal
modalType={modal.modalType} modalType={modal.modalType}
modalProps={modal.modalProps} modalProps={modal.modalProps}

2
app/routes/activity/components/Activity.scss

@ -78,7 +78,7 @@
background: $spaceblue; background: $spaceblue;
transition: opacity 0.25s; transition: opacity 0.25s;
padding-bottom: 50px; padding-bottom: 50px;
height: 100%; min-height: 100vh;
overflow-y: scroll; overflow-y: scroll;
padding-top: 20px; padding-top: 20px;

2
app/routes/app/components/App.js

@ -41,7 +41,7 @@ class App extends Component {
if (!currentTicker) { return <LoadingBolt /> } if (!currentTicker) { return <LoadingBolt /> }
return ( return (
<div style={{ height: '100%' }}> <div>
<div className={styles.titleBar} /> <div className={styles.titleBar} />
<GlobalError error={error} clearError={clearError} /> <GlobalError error={error} clearError={clearError} />
<ModalRoot <ModalRoot

1
app/routes/app/components/App.scss

@ -3,7 +3,6 @@
.content { .content {
position: relative; position: relative;
width: 80%; width: 80%;
height: 100vh;
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
overflow-y: scroll; overflow-y: scroll;

Loading…
Cancel
Save