From dfbb16521c9d10cd491429874660bfdde3e19e1d Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaadmahmood@users.noreply.github.com>
Date: Fri, 23 Jun 2017 07:28:04 +0500
Subject: 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
---
 webapp/sass/components/_error-bar.scss | 14 +++++---------
 webapp/sass/components/_search.scss    | 19 ++++++++++++-------
 webapp/sass/layout/_content.scss       |  1 -
 webapp/sass/layout/_headers.scss       |  1 +
 webapp/sass/layout/_markdown.scss      |  1 +
 webapp/sass/utils/_functions.scss      | 10 ++++++++++
 6 files changed, 29 insertions(+), 17 deletions(-)

(limited to 'webapp/sass')

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;
+}
-- 
cgit v1.2.3-1-g7c22