From c0bbe4f3bade2aa22b24bdeb5d08b3c0d6d1d703 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Wed, 19 Dec 2018 15:36:30 -0600 Subject: [PATCH] Remove redundant scrollbar css --- app/assets/stylesheets/app/_scrollbars.scss | 31 ------------------- app/assets/stylesheets/main.css.scss | 3 +- .../directives/account-menu.html.haml | 2 +- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 app/assets/stylesheets/app/_scrollbars.scss diff --git a/app/assets/stylesheets/app/_scrollbars.scss b/app/assets/stylesheets/app/_scrollbars.scss deleted file mode 100644 index 415aa0ac9..000000000 --- a/app/assets/stylesheets/app/_scrollbars.scss +++ /dev/null @@ -1,31 +0,0 @@ -.windows-web, .windows-desktop, .linux-web, .linux-desktop { - - $thumb-color: #dfdfdf; - $track-border-color: #E7E7E7; - $thumb-width: 4px; - - ::-webkit-scrollbar { - width: 17px; - height: 18px; - border-left: 0.5px solid $track-border-color; - } - - ::-webkit-scrollbar-thumb { - height: 6px; - border: $thumb-width solid rgba(0, 0, 0, 0); - background-clip: padding-box; - -webkit-border-radius: 10px; - background-color: $thumb-color; - -webkit-box-shadow: inset -1px -1px 0px rgba(0, 0, 0, 0.05), inset 1px 1px 0px rgba(0, 0, 0, 0.05); - } - - ::-webkit-scrollbar-button { - width: 0; - height: 0; - display: none; - } - - ::-webkit-scrollbar-corner { - background-color: transparent; - } -} diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss index 77c84f236..9e28dc002 100644 --- a/app/assets/stylesheets/main.css.scss +++ b/app/assets/stylesheets/main.css.scss @@ -1,6 +1,5 @@ @import "app/main"; @import "app/ui"; -@import "app/scrollbars"; @import "app/footer"; @import "app/tags"; @import "app/notes"; @@ -9,4 +8,4 @@ @import "app/modals"; @import "app/lock-screen"; @import "app/stylekit-sub"; -@import "app/ionicons"; \ No newline at end of file +@import "app/ionicons"; diff --git a/app/assets/templates/directives/account-menu.html.haml b/app/assets/templates/directives/account-menu.html.haml index 0979db77c..6a6f21386 100644 --- a/app/assets/templates/directives/account-menu.html.haml +++ b/app/assets/templates/directives/account-menu.html.haml @@ -2,7 +2,7 @@ .sk-panel#account-panel .sk-panel-header .sk-panel-header-title Account - %a.sk-a.infoclose-button{"ng-click" => "close()"} Close + %a.sk-a.info.close-button{"ng-click" => "close()"} Close .sk-panel-content .sk-panel-section.sk-panel-hero{"ng-if" => "!user && !formData.showLogin && !formData.showRegister && !formData.mfa"} .sk-panel-row