summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2016-08-09 00:30:19 +0500
committerenahum <nahumhbl@gmail.com>2016-08-08 14:30:19 -0500
commit9a59b7912ae9b4b4600d08698978b6781c723ad4 (patch)
treea3968ac940ba3ac3b040f1042df404de3e3e0623 /webapp
parent3dfc6c30d36d8a3176e38d77e03b53b6b4a1c87a (diff)
downloadchat-9a59b7912ae9b4b4600d08698978b6781c723ad4.tar.gz
chat-9a59b7912ae9b4b4600d08698978b6781c723ad4.tar.bz2
chat-9a59b7912ae9b4b4600d08698978b6781c723ad4.zip
PLT-3817 - Updating flag icon (#3750)
* Updating flag icon * Updating padding for user list * Removing stroke from hover * PLT-3794 - Fixing integrations css
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/channel_header.jsx2
-rw-r--r--webapp/sass/components/_modal.scss1
-rw-r--r--webapp/sass/layout/_headers.scss2
-rw-r--r--webapp/sass/layout/_sidebar-right.scss2
-rw-r--r--webapp/sass/responsive/_desktop.scss2
-rw-r--r--webapp/utils/utils.jsx3
6 files changed, 5 insertions, 7 deletions
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx
index 609a15d73..65c856b4a 100644
--- a/webapp/components/channel_header.jsx
+++ b/webapp/components/channel_header.jsx
@@ -224,7 +224,7 @@ export default class ChannelHeader extends React.Component {
}
render() {
- const flagIcon = Constants.FLAG_ICON_OUTLINE_SVG;
+ const flagIcon = Constants.FLAG_ICON_SVG;
if (!this.validState()) {
return null;
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss
index 5ea1337f1..b7772c16d 100644
--- a/webapp/sass/components/_modal.scss
+++ b/webapp/sass/components/_modal.scss
@@ -531,6 +531,7 @@
flex-grow: 1;
flex-shrink: 1;
overflow: hidden;
+ padding-left: 10px;
text-overflow: ellipsis;
}
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index 832bed50e..c3a5f8fda 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -396,7 +396,7 @@
.icon__flag {
svg {
- height: 18px;
+ height: 19px;
position: relative;
top: 2px;
width: 19px;
diff --git a/webapp/sass/layout/_sidebar-right.scss b/webapp/sass/layout/_sidebar-right.scss
index 497cd3cea..d43ddf5b9 100644
--- a/webapp/sass/layout/_sidebar-right.scss
+++ b/webapp/sass/layout/_sidebar-right.scss
@@ -178,7 +178,7 @@
}
.usage__icon {
- @include opacity(.6);
+ @include opacity(.9);
margin: 0 3px;
position: relative;
top: 1px;
diff --git a/webapp/sass/responsive/_desktop.scss b/webapp/sass/responsive/_desktop.scss
index 38037d105..d891fe17f 100644
--- a/webapp/sass/responsive/_desktop.scss
+++ b/webapp/sass/responsive/_desktop.scss
@@ -34,9 +34,7 @@
}
}
}
-}
-@media screen and (max-width: 1258px) {
.backstage-content {
margin: 46px 46px 46px 150px;
}
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index 9f8b1ef6c..e3db6d827 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -567,7 +567,7 @@ export function applyTheme(theme) {
if (theme.centerChannelColor) {
changeCss('.app__body .post-list__arrows, .app__body .post .flag-icon__container', 'fill:' + changeOpacity(theme.centerChannelColor, 0.3), 1);
- changeCss('.app__body .channel-header__links .icon', 'stroke:' + theme.centerChannelColor, 1);
+ changeCss('.app__body .channel-header__links .icon, .app__body .sidebar--right .sidebar--right__subheader .usage__icon', 'fill:' + theme.centerChannelColor, 1);
changeCss('@media(min-width: 768px){.app__body .post:hover .post__header .col__reply, .app__body .post.post--hovered .post__header .col__reply', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 2);
changeCss('.app__body .sidebar--left, .app__body .sidebar--right .sidebar--right__header, .app__body .suggestion-list__content .command', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
changeCss('.app__body .post.post--system .post__body', 'color:' + changeOpacity(theme.centerChannelColor, 0.6), 1);
@@ -640,7 +640,6 @@ export function applyTheme(theme) {
changeCss('.app__body a, .app__body a:focus, .app__body a:hover, .app__body .btn, .app__body .btn:focus, .app__body .btn:hover', 'color:' + theme.linkColor, 1);
changeCss('.app__body .attachment .attachment__container', 'border-left-color:' + changeOpacity(theme.linkColor, 0.5), 1);
changeCss('.app__body .channel-header__links .icon:hover, .app__body .post .flag-icon__container.visible, .app__body .post .comment-icon__container, .app__body .post .post__reply', 'fill:' + theme.linkColor, 1);
- changeCss('.app__body .channel-header__links .icon:hover', 'stroke:' + theme.linkColor, 1);
}
if (theme.buttonBg) {