summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2016-10-18 20:55:59 +0500
committerCorey Hulen <corey@hulen.com>2016-10-18 08:55:59 -0700
commitd14a44cf98ad746e3067aa425144602bc27cfb0a (patch)
tree2ffb79566412f37e4cd6b50de52e1afaba95ebe0 /webapp
parent06e5c097b362eeb84131406acc0c44420ae41271 (diff)
downloadchat-d14a44cf98ad746e3067aa425144602bc27cfb0a.tar.gz
chat-d14a44cf98ad746e3067aa425144602bc27cfb0a.tar.bz2
chat-d14a44cf98ad746e3067aa425144602bc27cfb0a.zip
Multiple UI Improvements (#4253)
Reverting config Reverting config.json
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/post_view/components/post.jsx13
-rw-r--r--webapp/components/select_team/select_team.jsx2
-rw-r--r--webapp/sass/components/_popover.scss2
-rw-r--r--webapp/sass/layout/_post.scss11
-rw-r--r--webapp/sass/responsive/_mobile.scss41
5 files changed, 56 insertions, 13 deletions
diff --git a/webapp/components/post_view/components/post.jsx b/webapp/components/post_view/components/post.jsx
index 7eeffb039..6a5994469 100644
--- a/webapp/components/post_view/components/post.jsx
+++ b/webapp/components/post_view/components/post.jsx
@@ -199,6 +199,16 @@ export default class Post extends React.Component {
/>
);
+ if (this.props.compactDisplay) {
+ profilePic = (
+ <ProfilePicture
+ src=''
+ status={this.props.status}
+ user={this.props.user}
+ />
+ );
+ }
+
if (PostUtils.isSystemMessage(post)) {
profilePic = (
<span
@@ -214,10 +224,9 @@ export default class Post extends React.Component {
}
let compactClass = '';
- let profilePicContainer = (<div className='post__img'>{profilePic}</div>);
+ const profilePicContainer = (<div className='post__img'>{profilePic}</div>);
if (this.props.compactDisplay) {
compactClass = 'post--compact';
- profilePicContainer = '';
}
let dropdownOpenedClass = '';
diff --git a/webapp/components/select_team/select_team.jsx b/webapp/components/select_team/select_team.jsx
index e6156ecb9..5f8d9f463 100644
--- a/webapp/components/select_team/select_team.jsx
+++ b/webapp/components/select_team/select_team.jsx
@@ -193,7 +193,7 @@ export default class SelectTeam extends React.Component {
let adminConsoleLink;
if (isSystemAdmin) {
adminConsoleLink = (
- <div className='margin--extra'>
+ <div className='margin--extra hidden-xs'>
<Link
to='/admin_console'
className='signup-team-login'
diff --git a/webapp/sass/components/_popover.scss b/webapp/sass/components/_popover.scss
index d1e14ec72..18d70268d 100644
--- a/webapp/sass/components/_popover.scss
+++ b/webapp/sass/components/_popover.scss
@@ -25,6 +25,8 @@
}
.popover-content {
+ word-break: break-word;
+
p {
&:last-child {
margin-bottom: 5px;
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 95c6e4443..137ab4f1c 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -530,6 +530,12 @@ body.ios {
}
}
+ .status-wrapper {
+ &:after {
+ bottom: 10px;
+ }
+ }
+
blockquote {
display: inline-block;
font-size: 1em;
@@ -636,12 +642,13 @@ body.ios {
.post__img {
padding-top: 3px;
- width: 27px;
+ width: 16px;
img,
svg {
height: 20px;
- width: 20px;
+ visibility: hidden;
+ width: 9px;
}
}
}
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss
index e0915178a..9a0190ebd 100644
--- a/webapp/sass/responsive/_mobile.scss
+++ b/webapp/sass/responsive/_mobile.scss
@@ -21,6 +21,21 @@
}
}
+ .video-div {
+ &.embed-responsive-item {
+ height: 0;
+ padding-bottom: 75%;
+
+ iframe {
+ height: 100%;
+ left: 0;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ }
+ }
+ }
+
.tutorial-steps__container {
.tutorial__content {
.tutorial__steps {
@@ -124,6 +139,14 @@
}
}
+ &.post--compact {
+ .status-wrapper {
+ &:after {
+ bottom: 12px;
+ }
+ }
+ }
+
&.same--root {
&.same--user {
.flag-icon__container {
@@ -795,7 +818,7 @@
}
.sidebar--menu {
- @include single-transition(transform, .5s, ease);
+ @include single-transition(transform, .35s, ease);
@include translate3d(290px, 0, 0);
border: none;
display: block;
@@ -808,10 +831,11 @@
}
.sidebar--left {
- @include single-transition(transform, .5s, ease);
+ @include single-transition(transform, .35s, ease);
@include translate3d(-290px, 0, 0);
- width: 290px;
border: none;
+ width: 290px;
+
&.sidebar--padded {
padding-top: 0;
}
@@ -944,7 +968,7 @@
}
.inner-wrap {
- @include single-transition(all, .5s, ease);
+ @include single-transition(all, .35s, ease);
.app__body & {
&:before {
@@ -955,7 +979,7 @@
left: -15px;
position: absolute;
top: 0;
- transition: background-color 0.5s ease, z-index 0s ease 0.5s;
+ transition: background-color .35s ease, z-index 0s ease .35s;
width: calc(100% + 30px);
z-index: 0;
}
@@ -965,8 +989,9 @@
@include translate3d(290px, 0, 0);
&:before {
+ @include single-transition(all, .35s, ease);
+
background-color: rgba(0, 0, 0, .4);
- transition: background-color .5s ease;
z-index: 9999;
}
}
@@ -975,8 +1000,8 @@
@include translate3d(-290px, 0, 0);
&:before {
- background-color: rgba(0, 0, 0, 0.4);
- transition: background-color 0.5s ease;
+ @include single-transition(all, .35s, ease);
+ background-color: rgba(0, 0, 0, .4);
z-index: 9999;
}
}