summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2016-08-22 19:10:34 +0500
committerChristopher Speller <crspeller@gmail.com>2016-08-22 10:10:34 -0400
commit06cf7c34a3e474ec3bb7f0f1399a93f458fe20f7 (patch)
treee3727a641a32627af9cd53c621a6fe8aab5ffe78 /webapp
parentc7150c4c80a2057b371b8d6f0c7cc786e8d240fd (diff)
downloadchat-06cf7c34a3e474ec3bb7f0f1399a93f458fe20f7.tar.gz
chat-06cf7c34a3e474ec3bb7f0f1399a93f458fe20f7.tar.bz2
chat-06cf7c34a3e474ec3bb7f0f1399a93f458fe20f7.zip
PLT-3981 - Fixing perfect scrollbar hover (#3839)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/sass/components/_scrollbar.scss23
-rw-r--r--webapp/utils/utils.jsx2
2 files changed, 24 insertions, 1 deletions
diff --git a/webapp/sass/components/_scrollbar.scss b/webapp/sass/components/_scrollbar.scss
index 06ee37dc9..a4df8230d 100644
--- a/webapp/sass/components/_scrollbar.scss
+++ b/webapp/sass/components/_scrollbar.scss
@@ -36,4 +36,25 @@ body {
.browser--ie & {
margin: 0 !important;
}
-} \ No newline at end of file
+}
+
+
+.ps-container {
+ &:hover {
+ .ps-scrollbar-x-rail,
+ .ps-scrollbar-y-rail {
+ @include opacity(.3);
+ }
+ }
+
+ > .ps-scrollbar-y-rail {
+ width: 10px;
+
+ &:hover {
+ .ps-scrollbar-y {
+ @include opacity(.6);
+ width: 6px;
+ }
+ }
+ }
+}
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index a8ad4d76a..a880c1783 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -474,6 +474,8 @@ export function applyTheme(theme) {
}
if (theme.sidebarText) {
+ changeCss('.app__body .ps-container > .ps-scrollbar-y-rail > .ps-scrollbar-y', 'background:' + theme.sidebarText, 1);
+ changeCss('.app__body .ps-container:hover .ps-scrollbar-y-rail:hover', 'background:' + changeOpacity(theme.sidebarText, 0.15), 1);
changeCss('.app__body .sidebar--left .nav-pills__container li>a, .app__body .sidebar--right, .app__body .modal .settings-modal .nav-pills>li a, .app__body .sidebar--menu', 'color:' + changeOpacity(theme.sidebarText, 0.6), 1);
changeCss('@media(max-width: 768px){.app__body .modal .settings-modal .settings-table .nav>li>a', 'color:' + theme.sidebarText, 1);
changeCss('.app__body .sidebar--left .nav-pills__container li>h4, .app__body .sidebar--left .add-channel-btn', 'color:' + changeOpacity(theme.sidebarText, 0.6), 1);