summaryrefslogtreecommitdiffstats
path: root/web/sass-files
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-02-22 15:03:26 -0500
committerChristopher Speller <crspeller@gmail.com>2016-02-22 15:03:26 -0500
commit7553246e65b4e92b593fdf7bf8d86770d077b491 (patch)
tree66a9ba92a7006f7b994a1c8879ce7dcb4774370f /web/sass-files
parent12fd1ddc95e1cc5320aa52afe8adc1937a8d606d (diff)
parentbc5f82f624fed139bd757298996189eca19ed1b7 (diff)
downloadchat-7553246e65b4e92b593fdf7bf8d86770d077b491.tar.gz
chat-7553246e65b4e92b593fdf7bf8d86770d077b491.tar.bz2
chat-7553246e65b4e92b593fdf7bf8d86770d077b491.zip
Merge pull request #2213 from hmhealey/ps
Updated perfect-scrollbar to 0.6.10
Diffstat (limited to 'web/sass-files')
-rw-r--r--[-rwxr-xr-x]web/sass-files/sass/partials/_perfect-scrollbar.scss61
1 files changed, 26 insertions, 35 deletions
diff --git a/web/sass-files/sass/partials/_perfect-scrollbar.scss b/web/sass-files/sass/partials/_perfect-scrollbar.scss
index 0e0967d81..de88112c9 100755..100644
--- a/web/sass-files/sass/partials/_perfect-scrollbar.scss
+++ b/web/sass-files/sass/partials/_perfect-scrollbar.scss
@@ -1,23 +1,31 @@
@charset "UTF-8";
+/* perfect-scrollbar v0.6.10 */
.ps-container {
- overflow: hidden !important; }
- .ps-container.ps-active-x > .ps-scrollbar-x-rail, .ps-container.ps-active-y > .ps-scrollbar-y-rail {
- display: block; }
+ -ms-touch-action: none;
+ touch-action: none;
+ overflow: hidden !important;
+ -ms-overflow-style: none; }
+ @supports (-ms-overflow-style: none) {
+ .ps-container {
+ overflow: auto !important; } }
+ @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+ .ps-container {
+ overflow: auto !important; } }
+ .ps-container.ps-active-x > .ps-scrollbar-x-rail,
+ .ps-container.ps-active-y > .ps-scrollbar-y-rail {
+ display: block;
+ background-color: transparent; }
.ps-container.ps-in-scrolling {
- }
+ }
.ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
background-color: #eee;
- opacity: 0.9;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";
- filter: alpha(opacity=90); }
+ opacity: 0.9; }
.ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
background-color: #999; }
.ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
background-color: #eee;
- opacity: 0.9;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";
- filter: alpha(opacity=90); }
+ opacity: 0.9; }
.ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
background-color: #999; }
.ps-container > .ps-scrollbar-x-rail {
@@ -26,11 +34,8 @@
/* please don't change 'position' */
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
- -ms-border-radius: 4px;
border-radius: 4px;
opacity: 0;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
- filter: alpha(opacity=0);
-webkit-transition: background-color .2s linear, opacity .2s linear;
-moz-transition: background-color .2s linear, opacity .2s linear;
-o-transition: background-color .2s linear, opacity .2s linear;
@@ -44,7 +49,6 @@
background-color: #aaa;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
- -ms-border-radius: 4px;
border-radius: 4px;
-webkit-transition: background-color .2s linear;
-moz-transition: background-color .2s linear;
@@ -59,11 +63,8 @@
/* please don't change 'position' */
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
- -ms-border-radius: 4px;
border-radius: 4px;
opacity: 0;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
- filter: alpha(opacity=0);
-webkit-transition: background-color .2s linear, opacity .2s linear;
-moz-transition: background-color .2s linear, opacity .2s linear;
-o-transition: background-color .2s linear, opacity .2s linear;
@@ -77,7 +78,6 @@
background-color: #aaa;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
- -ms-border-radius: 4px;
border-radius: 4px;
-webkit-transition: background-color .2s linear;
-moz-transition: background-color .2s linear;
@@ -87,36 +87,27 @@
/* there must be 'right' for ps-scrollbar-y */
width: 8px; }
.ps-container:hover.ps-in-scrolling {
- }
+ }
.ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
background-color: #eee;
- opacity: 0.9;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";
- filter: alpha(opacity=90); }
+ opacity: 0.9; }
.ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
background-color: #999; }
.ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
background-color: #eee;
- opacity: 0.9;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";
- filter: alpha(opacity=90); }
+ opacity: 0.9; }
.ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
background-color: #999; }
- .ps-container:hover > .ps-scrollbar-x-rail, .ps-container:hover > .ps-scrollbar-y-rail {
- opacity: 0.6;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
- filter: alpha(opacity=60); }
+ .ps-container:hover > .ps-scrollbar-x-rail,
+ .ps-container:hover > .ps-scrollbar-y-rail {
+ opacity: 0.6; }
.ps-container:hover > .ps-scrollbar-x-rail:hover {
background-color: #eee;
- opacity: 0.9;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";
- filter: alpha(opacity=90); }
+ opacity: 0.9; }
.ps-container:hover > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x {
background-color: #999; }
.ps-container:hover > .ps-scrollbar-y-rail:hover {
background-color: #eee;
- opacity: 0.9;
- -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";
- filter: alpha(opacity=90); }
+ opacity: 0.9; }
.ps-container:hover > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y {
background-color: #999; }