From 4b24dd47d74cba73947fb8dcba2445a35e1837d4 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Thu, 25 Feb 2016 11:26:06 -0500 Subject: Revert "Updated perfect-scrollbar to 0.6.10" This reverts commit bc5f82f624fed139bd757298996189eca19ed1b7. --- .../sass/partials/_perfect-scrollbar.scss | 61 +++++++++++++--------- 1 file changed, 35 insertions(+), 26 deletions(-) mode change 100644 => 100755 web/sass-files/sass/partials/_perfect-scrollbar.scss (limited to 'web/sass-files/sass') diff --git a/web/sass-files/sass/partials/_perfect-scrollbar.scss b/web/sass-files/sass/partials/_perfect-scrollbar.scss old mode 100644 new mode 100755 index de88112c9..0e0967d81 --- a/web/sass-files/sass/partials/_perfect-scrollbar.scss +++ b/web/sass-files/sass/partials/_perfect-scrollbar.scss @@ -1,31 +1,23 @@ @charset "UTF-8"; -/* perfect-scrollbar v0.6.10 */ .ps-container { - -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; } + overflow: hidden !important; } + .ps-container.ps-active-x > .ps-scrollbar-x-rail, .ps-container.ps-active-y > .ps-scrollbar-y-rail { + display: block; } .ps-container.ps-in-scrolling { - } + } .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail { background-color: #eee; - opacity: 0.9; } + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); } .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; } + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); } .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y { background-color: #999; } .ps-container > .ps-scrollbar-x-rail { @@ -34,8 +26,11 @@ /* 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; @@ -49,6 +44,7 @@ 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; @@ -63,8 +59,11 @@ /* 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; @@ -78,6 +77,7 @@ 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,27 +87,36 @@ /* 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; } + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); } .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; } + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); } .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; } + .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:hover { background-color: #eee; - opacity: 0.9; } + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); } .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; } + opacity: 0.9; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; + filter: alpha(opacity=90); } .ps-container:hover > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y { background-color: #999; } -- cgit v1.2.3-1-g7c22