summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2017-06-23 07:28:04 +0500
committerJoram Wilander <jwawilander@gmail.com>2017-06-22 22:28:04 -0400
commitdfbb16521c9d10cd491429874660bfdde3e19e1d (patch)
treec83559476382e2d2b600f49a2575c2f8896552fe /webapp
parentd8cd38f4831ea2cd6a42e1d8aa68c0b24c3a4bd1 (diff)
downloadchat-dfbb16521c9d10cd491429874660bfdde3e19e1d.tar.gz
chat-dfbb16521c9d10cd491429874660bfdde3e19e1d.tar.bz2
chat-dfbb16521c9d10cd491429874660bfdde3e19e1d.zip
Minor bug and UI fixes (#6729)
* PLT-6797 - Code block language tag not selectable * PLT-6771 - Aligning search box with RHS * PLT-6827 - Fixing link color in error bar * PLT-6241 - Adding edge detection
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/channel_view.jsx2
-rw-r--r--webapp/components/new_channel_modal/new_channel_modal.jsx2
-rw-r--r--webapp/components/search_bar.jsx2
-rw-r--r--webapp/sass/components/_error-bar.scss14
-rw-r--r--webapp/sass/components/_search.scss19
-rw-r--r--webapp/sass/layout/_content.scss1
-rw-r--r--webapp/sass/layout/_headers.scss1
-rw-r--r--webapp/sass/layout/_markdown.scss1
-rw-r--r--webapp/sass/utils/_functions.scss10
9 files changed, 31 insertions, 21 deletions
diff --git a/webapp/components/channel_view.jsx b/webapp/components/channel_view.jsx
index 3f6edbd2e..35d2a5891 100644
--- a/webapp/components/channel_view.jsx
+++ b/webapp/components/channel_view.jsx
@@ -44,7 +44,7 @@ export default class ChannelView extends React.Component {
$('body').addClass('app__body');
// IE Detection
- if (UserAgent.isInternetExplorer()) {
+ if (UserAgent.isInternetExplorer() || UserAgent.isEdge()) {
$('body').addClass('browser--ie');
}
}
diff --git a/webapp/components/new_channel_modal/new_channel_modal.jsx b/webapp/components/new_channel_modal/new_channel_modal.jsx
index d77c29d64..60c0271a7 100644
--- a/webapp/components/new_channel_modal/new_channel_modal.jsx
+++ b/webapp/components/new_channel_modal/new_channel_modal.jsx
@@ -112,7 +112,7 @@ export default class NewChannelModal extends React.PureComponent {
componentDidMount() {
// ???
- if (UserAgent.isInternetExplorer()) {
+ if (UserAgent.isInternetExplorer() || UserAgent.isEdge()) {
$('body').addClass('browser--ie');
}
}
diff --git a/webapp/components/search_bar.jsx b/webapp/components/search_bar.jsx
index 7e2cecede..94760dfdf 100644
--- a/webapp/components/search_bar.jsx
+++ b/webapp/components/search_bar.jsx
@@ -255,7 +255,6 @@ export default class SearchBar extends React.Component {
mentionBtn = (
<div
className='dropdown channel-header__links'
- style={{float: 'left', marginTop: '1px'}}
>
<OverlayTrigger
delayShow={Constants.OVERLAY_TIME_DELAY}
@@ -279,7 +278,6 @@ export default class SearchBar extends React.Component {
flagBtn = (
<div
className='dropdown channel-header__links'
- style={{float: 'left', marginTop: '1px'}}
>
<OverlayTrigger
delayShow={Constants.OVERLAY_TIME_DELAY}
diff --git a/webapp/sass/components/_error-bar.scss b/webapp/sass/components/_error-bar.scss
index 765b61ba8..06a35df40 100644
--- a/webapp/sass/components/_error-bar.scss
+++ b/webapp/sass/components/_error-bar.scss
@@ -18,17 +18,13 @@
}
a {
- color: $white;
+ color: inherit !important;
text-decoration: underline;
- .app__body & {
- color: $white;
-
- &:hover,
- &:active,
- &:focus {
- color: $white;
- }
+ &:hover,
+ &:active,
+ &:focus {
+ color: inherit !important;
}
&.error-bar__close {
diff --git a/webapp/sass/components/_search.scss b/webapp/sass/components/_search.scss
index 460507d1b..c25915252 100644
--- a/webapp/sass/components/_search.scss
+++ b/webapp/sass/components/_search.scss
@@ -8,7 +8,13 @@
.search-bar__container {
@include flex(0 0 56px);
- padding: 12px 8px 0 0;
+ padding: 12px 5px 0 0;
+
+ .channel-header__links {
+ .sidebar--right & {
+ line-height: 25px;
+ }
+ }
}
.icon--rotate {
@@ -54,13 +60,13 @@
.sidebar__search-clear {
@include opacity(.5);
color: $dark-gray;
- width: 40px;
+ cursor: pointer;
margin-right: 20px;
position: absolute;
- top: 12px;
right: 0;
- cursor: pointer;
+ top: 12px;
visibility: hidden;
+ width: 40px;
}
.search__form {
@@ -74,10 +80,9 @@
}
.sidebar--right & {
- width: 300px;
float: left;
- margin-left: 17px;
- margin-right: 9px;
+ margin-right: 7px;
+ width: 325px;
}
.search-bar {
diff --git a/webapp/sass/layout/_content.scss b/webapp/sass/layout/_content.scss
index 2ea0f821f..933f57c32 100644
--- a/webapp/sass/layout/_content.scss
+++ b/webapp/sass/layout/_content.scss
@@ -20,7 +20,6 @@
// stays on the top and don't get hidden by the
// search's input block
float: right;
- margin-right: -18px;
padding-right: 0px !important;
position: relative;
z-index: 6;
diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss
index e31452c9b..1386b4169 100644
--- a/webapp/sass/layout/_headers.scss
+++ b/webapp/sass/layout/_headers.scss
@@ -426,6 +426,7 @@
.app__body {
.channel-header__links {
+ display: inline-block;
font-family: 'Open Sans', sans-serif;
font-size: 22px;
height: 30px;
diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss
index 8d06d47cb..784a35f5f 100644
--- a/webapp/sass/layout/_markdown.scss
+++ b/webapp/sass/layout/_markdown.scss
@@ -92,6 +92,7 @@ h6 {
.post-code__language {
@include opacity(0);
@include transition(opacity, .6s);
+ @include unselectable;
background: #21586d;
border-radius: 0 0 0 2px;
color: $white;
diff --git a/webapp/sass/utils/_functions.scss b/webapp/sass/utils/_functions.scss
index f399060cc..26e3c6147 100644
--- a/webapp/sass/utils/_functions.scss
+++ b/webapp/sass/utils/_functions.scss
@@ -21,3 +21,13 @@
-moz-osx-font-smoothing: grayscale;
transform: translate(0, 0);
}
+
+@mixin unselectable {
+ -webkit-user-select: none; /* Chrome/Safari */
+ -moz-user-select: none; /* Firefox */
+ -ms-user-select: none; /* IE10+ */
+
+ /* Rules below not implemented in browsers yet */
+ -o-user-select: none;
+ user-select: none;
+}