From a968938832e83895cbd564e5a3efb6af82b47485 Mon Sep 17 00:00:00 2001
From: chylex <contact@chylex.com>
Date: Mon, 31 Jul 2017 14:55:31 +0200
Subject: [PATCH] Move square scrollbars from edit-design plugin to code.js
---
Resources/Plugins/edit-design/browser.js | 12 ------------
Resources/Plugins/edit-design/modal.html | 4 ----
Resources/Scripts/code.js | 7 +++++++
3 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/Resources/Plugins/edit-design/browser.js b/Resources/Plugins/edit-design/browser.js
index 687f4eb9..569ca357 100644
--- a/Resources/Plugins/edit-design/browser.js
+++ b/Resources/Plugins/edit-design/browser.js
@@ -18,7 +18,6 @@ enabled(){
moveTweetActionsToRight: true,
revertReplies: false,
themeColorTweaks: true,
- roundedScrollBars: false,
revertIcons: true,
smallComposeTextSize: false,
optimizeAnimations: true,
@@ -389,17 +388,6 @@ enabled(){
this.css.insert(".compose-text { font-size: 12px !important; height: 120px !important }");
}
- if (!this.config.roundedScrollBars){
- this.css.insert(".scroll-styled-v:not(.antiscroll-inner)::-webkit-scrollbar { width: 8px }");
- this.css.insert(".scroll-styled-h:not(.antiscroll-inner)::-webkit-scrollbar { height: 8px }");
- this.css.insert(".scroll-styled-v::-webkit-scrollbar-thumb { border-radius: 0 }");
- this.css.insert(".scroll-styled-h::-webkit-scrollbar-thumb { border-radius: 0 }");
- this.css.insert(".antiscroll-scrollbar { border-radius: 0 }");
- this.css.insert(".antiscroll-scrollbar-vertical { margin-top: 0 }");
- this.css.insert(".antiscroll-scrollbar-horizontal { margin-left: 0 }");
- this.css.insert(".app-columns-container::-webkit-scrollbar { height: 9px !important }");
- }
-
if (this.config.revertReplies){
this.css.insert(".activity-header + .tweet .tweet-context { margin-left: -35px }");
this.css.insert(".activity-header + .tweet .tweet-context .obj-left { margin-right: 5px }");
diff --git a/Resources/Plugins/edit-design/modal.html b/Resources/Plugins/edit-design/modal.html
index 47e5e725..3ae8910f 100644
--- a/Resources/Plugins/edit-design/modal.html
+++ b/Resources/Plugins/edit-design/modal.html
@@ -102,10 +102,6 @@
<input data-td-key="themeColorTweaks" class="js-theme-checkbox touch-larger-label" type="checkbox">
Theme color tweaks
</label>
- <label class="checkbox">
- <input data-td-key="roundedScrollBars" class="js-theme-checkbox touch-larger-label" type="checkbox">
- Rounded scroll bars
- </label>
<label class="checkbox">
<input data-td-key="revertIcons" class="js-theme-checkbox touch-larger-label" type="checkbox">
Revert icon design
diff --git a/Resources/Scripts/code.js b/Resources/Scripts/code.js
index 0a917d20..b0baf447 100644
--- a/Resources/Scripts/code.js
+++ b/Resources/Scripts/code.js
@@ -706,6 +706,13 @@
addRule(".dropdown-menu, .list-item-last { border-radius: 0 !important }"); // square-ify dropdowns
addRule(".prf-header { border-radius: 0 }"); // fix user account header border
+ addRule(".scroll-styled-v::-webkit-scrollbar-thumb, .scroll-styled-h::-webkit-scrollbar-thumb, .antiscroll-scrollbar { border-radius: 0 }"); // square-ify scroll bars
+ addRule(".antiscroll-scrollbar-vertical { margin-top: 0 }"); // square-ify scroll bars
+ addRule(".antiscroll-scrollbar-horizontal { margin-left: 0 }"); // square-ify scroll bars
+ addRule(".scroll-styled-v:not(.antiscroll-inner)::-webkit-scrollbar { width: 8px }"); // square-ify scroll bars
+ addRule(".scroll-styled-h:not(.antiscroll-inner)::-webkit-scrollbar { height: 8px }"); // square-ify scroll bars
+ addRule(".app-columns-container::-webkit-scrollbar { height: 9px !important }"); // square-ify scroll bars
+
addRule(".is-condensed .app-header-inner { padding-top: 10px !important; }"); // add extra padding to menu buttons when condensed
addRule(".is-condensed .btn-compose { padding: 8px !important; }"); // fix compose button icon when condensed
addRule(".app-header:not(.is-condensed) .nav-user-info { padding: 0 5px; }"); // add padding to user info