summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-08-13 23:33:18 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-08-13 23:33:18 +0500
commit6ca6072f478f556ba2d25c9762f0d73c9e84c7f6 (patch)
tree6bfbe2a5b4405b93a780a7a5a0828fd268b13cbc /web
parent673ca225cae1f5a629a36dd2b9340f5cde0880ad (diff)
downloadchat-6ca6072f478f556ba2d25c9762f0d73c9e84c7f6.tar.gz
chat-6ca6072f478f556ba2d25c9762f0d73c9e84c7f6.tar.bz2
chat-6ca6072f478f556ba2d25c9762f0d73c9e84c7f6.zip
Updating UI to cover RHS and the centre channel separately
Diffstat (limited to 'web')
-rw-r--r--web/react/components/post_list.jsx2
-rw-r--r--web/react/components/post_right.jsx2
-rw-r--r--web/sass-files/sass/partials/_base.scss1
-rw-r--r--web/sass-files/sass/partials/_post.scss6
4 files changed, 6 insertions, 5 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 53e8d0761..f45650279 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -464,7 +464,7 @@ module.exports = React.createClass({
return (
<div>
- <div className='center-file-overlay invisible'>
+ <div className='file-overlay center-file-overlay invisible'>
<div>
<i className="fa fa-upload"></i>
<span>Drop a file to upload it.</span>
diff --git a/web/react/components/post_right.jsx b/web/react/components/post_right.jsx
index b772c7ee8..09cd8cb56 100644
--- a/web/react/components/post_right.jsx
+++ b/web/react/components/post_right.jsx
@@ -296,7 +296,7 @@ module.exports = React.createClass({
return (
<div className="post-right__container">
- <div className='center-file-overlay right-file-overlay invisible'>
+ <div className='file-overlay right-file-overlay invisible'>
<div>
<i className="fa fa-upload"></i>
<span>Drop a file to upload it.</span>
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 78006ff18..5b68b488f 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -24,6 +24,7 @@ body {
height: 100%;
> .row.main {
height: 100%;
+ position: relative;
}
}
> .container-fluid {
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 614fc085b..bbf36ea93 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -106,13 +106,13 @@ body.ios {
}
}
-.center-file-overlay {
- position: fixed;
+.file-overlay {
+ position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
- background-color: rgba(0, 0, 0, 0.8);
+ background-color: rgba(0, 0, 0, 0.6);
text-align: center;
color: #FFF;
display: table;