From b17ceec3a546a0be39aa63d611a78a6f79698d07 Mon Sep 17 00:00:00 2001
From: Bs_zombie <68990356+BS-zombie@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:26:06 +1300
Subject: [PATCH 1/2] make contribute less obtrusive
---
src/html/style.css | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/html/style.css b/src/html/style.css
index f1b1f0fa1..7ccd93a90 100644
--- a/src/html/style.css
+++ b/src/html/style.css
@@ -395,17 +395,22 @@ a .link-preview:hover {
#contribute {
position: absolute;
/* display: none; */
- width: calc(100vw - 6px);
+ width: 60%;
background-image: linear-gradient(135deg, var(--ff-aqua) 0%, var(--ff-blue) 50%, var(--ff-purple) 100%);
padding: 3px;
padding-left: 6px;
+ margin: auto;
margin-top: 5px;
z-index: 1;
+ left: 50%;
+ transform: translateX(-50%);
+ border-radius: 10px;
}
#contribute p {
width: fit-content;
display: inline-block;
+ margin-left: 20px;
}
#contribute a {
@@ -416,9 +421,9 @@ a .link-preview:hover {
cursor: pointer;
width: fit-content;
float: right;
- vertical-align: top;
- margin-right: 6px;
- font-size: 20px;
+ vertical-align: middle;
+ margin-right: 20px;
+ font-size: 40px;
}
#close:after {
From 3c727fea94cd51acf50734c2434915d32a4677c5 Mon Sep 17 00:00:00 2001
From: Bs_zombie <68990356+BS-zombie@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:27:09 +1300
Subject: [PATCH 2/2] Better options page formatting
descriptions for each option, indentation, and separators
---
src/_locales/en/messages.json | 44 ++++++++++++++-----
src/html/options.html | 83 +++++++++++++++++++++++++++--------
src/html/style.css | 11 ++++-
3 files changed, 108 insertions(+), 30 deletions(-)
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index b7927e91c..44bdae8fb 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -36,25 +36,49 @@
"message": "Enable website bypasses."
},
"optionsNavigationDelay": {
- "message": "Take me to destinations after % second(s)."
+ "message": "Bypass Link Shorteners after % second(s)."
},
"optionsTrackerBypass": {
- "message": "Bypass trackers (such as bit.ly and goo.gl) using Unshorten.me."
+ "message": "Bypass trackers"
},
"optionsInstantNavigationTrackers": {
- "message": "Instantly take me to destinations of trackers."
+ "message": "Bypass Trackers immediately."
},
"optionsBlockIPLoggers": {
- "message": "Block IP loggers if they can't be bypassed."
+ "message": "Block IP loggers."
},
"optionsCrowdBypass": {
- "message": "Crowd Bypass: Give and take the destinations of unbypassable shorteners."
+ "message": "Crowd Bypass."
},
"optionsCrowdAutoOpen": {
- "message": "Open crowd-sourced destinations in a new tab after % second(s)."
+ "message": "Open Crowd destinations after % second(s)."
},
"optionsCrowdAutoClose": {
- "message": "Close tab containing the crowd-sourced destination after % second(s) of visiting it."
+ "message": "Close Crowd destination after % second(s)."
+ },
+ "optionsNavigationDelayDescription": {
+ "message": "Automatically bypass link shorteners such as Adf.ly, sub2unlock.com, after a certain amount of seconds. Recommended: On, 0 seconds."
+ },
+ "optionsTrackerBypassDescription": {
+ "message": "Automatically bypass trackers such as t.co and goo.gl using the Unshorten.me API. Recommended: On."
+ },
+ "optionsInstantNavigationTrackersDescription": {
+ "message": "Bypass trackers immediately and automatically, instead of providing a link to the destination. Recommended: On."
+ },
+ "optionsBlockIPLoggersDescription": {
+ "message": "If FastForward can't bypass a link that will log your IP, we will block it instead. Recommended: On."
+ },
+ "optionsCrowdBypassDescription": {
+ "message": "Crowd Bypass: Use FastForward's online database of bypassed links to instantly bypass popular sites. Recommended: On."
+ },
+ "optionsCrowdAutoOpenDescription": {
+ "message": "Open Crowd Bypass destinations in a new tab rather than the current one, so you don't lose your place. Recommended: Off"
+ },
+ "optionsCrowdAutoCloseDescription": {
+ "message": "Close Crowd Bypass destination after a few seconds. Useful if most of the sites you visit have a direct download link. Recommended: Off"
+ },
+ "crowdBypassTempDisabledDescription": {
+ "message": "Crowd bypass has been temporarily disabled when FastForward was updated. Please re-enable it."
},
"privacyPolicy": {
"message": "Privacy Policy"
@@ -134,8 +158,8 @@
"optionsWhitelist": {
"message": "Whitelist"
},
- "optionsWhitelistDescription": {
- "message": "A list of sites formatted as domain.tld or subdomain.domain.tld separated with a newline that will not be bypassed by FastForward. You can use * as a wildcard."
+ "optionsWhitelistDescription": {
+ "message": "A list of sites formatted as domain.tld or subdomain.domain.tld that won't be bypassed by FastForward. Seperate domains with new lines. Use * as a wildcard."
},
"tempDisableCrowdBypassButton": {
"message": "Temporarily disable crowd bypass"
@@ -152,5 +176,5 @@
"trackerBypassedError": {
"message": "Oops! Something went wrong. Redirecting to the original link..."
}
-
+
}
diff --git a/src/html/options.html b/src/html/options.html
index b99cf942c..d528517ea 100644
--- a/src/html/options.html
+++ b/src/html/options.html
@@ -29,30 +29,75 @@
+
diff --git a/src/html/style.css b/src/html/style.css
index 7ccd93a90..786364b0b 100644
--- a/src/html/style.css
+++ b/src/html/style.css
@@ -434,4 +434,13 @@ a .link-preview:hover {
#whitelistDesc {
margin-left: 27.055px;
margin-right: 27.055px;
-}
\ No newline at end of file
+}
+.option p {
+ color: #7a7a7a;
+}
+.indentedOption {
+ margin-left: 54.11px;
+}
+.indentedOption p {
+ color: #7a7a7a;
+}