summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmoodspin@users.noreply.github.com>2016-05-06 11:45:19 +0500
committerCorey Hulen <corey@hulen.com>2016-05-05 23:45:19 -0700
commit4b2843ee9d513a6b464e1e581e9cee8baaaa4317 (patch)
tree0cd18e242df0294b7943714bb0c311c90db60d14
parent7c006ea384d3f79031892b7be7ac9fb1bc7c392c (diff)
downloadchat-4b2843ee9d513a6b464e1e581e9cee8baaaa4317.tar.gz
chat-4b2843ee9d513a6b464e1e581e9cee8baaaa4317.tar.bz2
chat-4b2843ee9d513a6b464e1e581e9cee8baaaa4317.zip
Improvements to reply (#2905)
-rw-r--r--webapp/sass/layout/_post.scss16
-rw-r--r--webapp/sass/responsive/_tablet.scss2
-rw-r--r--webapp/utils/utils.jsx4
3 files changed, 16 insertions, 6 deletions
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 22b19d539..a99c6d57c 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -509,6 +509,13 @@ body.ios {
}
}
+ &.post--comment {
+ .post__body {
+ padding-left: 7px;
+ border-left: 4px solid $gray;
+ }
+ }
+
&.same--root {
&.same--user {
padding: 0 .5em 0 1em;
@@ -543,10 +550,6 @@ body.ios {
display: none;
}
}
-
- .post__body {
- border-left: 4px solid #dddddd;
- }
}
}
@@ -558,6 +561,7 @@ body.ios {
}
&.post--comment {
+
.popover {
margin-top: 84px;
@@ -800,6 +804,10 @@ body.ios {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
+
+ a {
+ font-weight: bold;
+ }
}
.post__embed-visibility {
diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss
index 1e9dedb8a..72b4b5aad 100644
--- a/webapp/sass/responsive/_tablet.scss
+++ b/webapp/sass/responsive/_tablet.scss
@@ -88,7 +88,7 @@
.post__time {
@include opacity(0);
font-size: 11px;
- left: 8px;
+ left: -4px;
line-height: 37px;
position: absolute;
text-rendering: auto;
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index e34fa403f..9d4ddee53 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -716,7 +716,7 @@ export function applyTheme(theme) {
changeCss('.app__body .modal .custom-textarea:focus', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.3), 1);
changeCss('.app__body .channel-intro, .app__body .modal .settings-modal .settings-table .settings-content .divider-dark, .app__body hr, .app__body .modal .settings-modal .settings-table .settings-links, .app__body .modal .settings-modal .settings-table .settings-content .appearance-section .theme-elements__header', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
changeCss('.app__body .post.current--user .post__body, .app__body .post.post--comment.other--root.current--user .post-comment, .app__body pre, .app__body .post-right__container .post.post--root', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
- changeCss('.app__body .post.current--user .post__body, .app__body .post.post--comment.other--root.current--user .post-comment, .app__body .post.same--root.post--comment .post__body, .app__body .more-modal__list .more-modal__row, .app__body .member-div:first-child, .app__body .member-div, .app__body .access-history__table .access__report, .app__body .activity-log__table', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.1), 2);
+ changeCss('.app__body .post.post--comment.other--root.current--user .post-comment, .app__body .more-modal__list .more-modal__row, .app__body .member-div:first-child, .app__body .member-div, .app__body .access-history__table .access__report, .app__body .activity-log__table', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.1), 2);
changeCss('@media(max-width: 1800px){.app__body .inner-wrap.move--left .post.post--comment.same--root', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.07), 2);
changeCss('.app__body .post:hover, .app__body .more-modal__list .more-modal__row:hover, .app__body .modal .settings-modal .settings-table .settings-content .section-min:hover', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
changeCss('.app__body .date-separator.hovered--before:after, .app__body .date-separator.hovered--after:before, .app__body .new-separator.hovered--after:before, .app__body .new-separator.hovered--before:after', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1);
@@ -731,6 +731,8 @@ export function applyTheme(theme) {
changeCss('.app__body .modal .about-modal .about-modal__logo svg, .app__body .post .post__img svg', 'fill:' + theme.centerChannelColor, 1);
changeCss('.app__body .scrollbar--horizontal, .app__body .scrollbar--vertical', 'background:' + changeOpacity(theme.centerChannelColor, 0.5), 2);
changeCss('.app__body .post-list__new-messages-below', 'background:' + changeColor(theme.centerChannelColor, 0.5), 2);
+ changeCss('.app__body .post.post--comment .post__body', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
+ changeCss('.app__body .post.post--comment.current--user .post__body', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.13), 1);
}
if (theme.newMessageSeparator) {