Skip to content

Commit

Permalink
update style
Browse files Browse the repository at this point in the history
  • Loading branch information
trazyn committed Sep 2, 2017
1 parent 146e1d8 commit 264c907
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
1 change: 1 addition & 0 deletions .ctrlpignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ DS_Store
android
git
dist
release
__tests__
5 changes: 3 additions & 2 deletions src/js/pages/Home/ChatContent/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,6 @@ export default class ChatContent extends Component {
return (
<div
className={clazz(classes.container, {
[classes.notfound]: !user,
[classes.hideConversation]: !showConversation,
})}
onClick={e => this.handleClick(e)}>
Expand Down Expand Up @@ -615,7 +614,9 @@ export default class ChatContent extends Component {
</div>
</div>
) : (
<div className={classes.inner}>
<div className={clazz({
[classes.noselected]: !user,
})}>
<img src="assets/images/noselected.png" className="disabledDrag" />
<h1>No Chat selected.</h1>
</div>
Expand Down
17 changes: 9 additions & 8 deletions src/js/pages/Home/ChatContent/style.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

.container {
position: relative;
height: 100%;

& header {
position: relative;
Expand Down Expand Up @@ -59,19 +60,14 @@
}
}

.inner {
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
}

.notfound {
.noselected {
position: relative;
display: flex;
height: 100%;
width: 100%;
justify-content: center;
align-items: center;
flex-direction: column;

& img {
width: 200px;
Expand Down Expand Up @@ -711,6 +707,11 @@
}
}

.noselected img {
width: 160px;
margin-bottom: 5vh;
}

.messages {
height: calc(100vh - 92px - 30px - 12px);
padding-top: 12px;
Expand Down
1 change: 1 addition & 0 deletions src/js/pages/Home/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
background: #e1306c;
box-shadow: 0 0 24px 0 rgba(119, 119, 119, .5);
cursor: pointer;
z-index: 9;
}
}

Expand Down

0 comments on commit 264c907

Please sign in to comment.