mirror of
https://github.com/zen-browser/desktop.git
synced 2025-10-06 09:56:36 +00:00
feat(sync): Removed patch files, placed the logic in zen files
This commit is contained in:
@@ -1,12 +0,0 @@
|
|||||||
diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.js b/browser/components/preferences/dialogs/syncChooseWhatToSync.js
|
|
||||||
index 2cc965b4e1b20e1ae422bfb5c90a237dcd31fcf6..cfed9dfa67c7c34cd812885a72d66dd37ba414fc 100644
|
|
||||||
--- a/browser/components/preferences/dialogs/syncChooseWhatToSync.js
|
|
||||||
+++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.js
|
|
||||||
@@ -13,6 +13,7 @@ Preferences.addAll([
|
|
||||||
{ id: "services.sync.engine.passwords", type: "bool" },
|
|
||||||
{ id: "services.sync.engine.addresses", type: "bool" },
|
|
||||||
{ id: "services.sync.engine.creditcards", type: "bool" },
|
|
||||||
+ { id: "services.sync.engine.workspaces", type: "bool" },
|
|
||||||
]);
|
|
||||||
|
|
||||||
let gSyncChooseWhatToSync = {
|
|
@@ -995,5 +995,10 @@ Preferences.addAll([
|
|||||||
id: 'zen.view.show-bottom-border',
|
id: 'zen.view.show-bottom-border',
|
||||||
type: 'bool',
|
type: 'bool',
|
||||||
default: false,
|
default: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'services.sync.engine.workspaces',
|
||||||
|
type: 'bool',
|
||||||
|
default: true,
|
||||||
}
|
}
|
||||||
]);
|
]);
|
||||||
|
@@ -1,24 +0,0 @@
|
|||||||
diff --git a/browser/locales/en-US/browser/preferences/preferences.ftl b/browser/locales/en-US/browser/preferences/preferences.ftl
|
|
||||||
index d197d876dac5e9024c944d33454525123775ea02..59fa0a7921f337dc01eac3364c1d01c71afc4f7a 100644
|
|
||||||
--- a/browser/locales/en-US/browser/preferences/preferences.ftl
|
|
||||||
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
|
|
||||||
@@ -925,6 +925,7 @@ sync-currently-syncing-addresses = Addresses
|
|
||||||
sync-currently-syncing-payment-methods = Payment methods
|
|
||||||
sync-currently-syncing-addons = Add-ons
|
|
||||||
sync-currently-syncing-settings = Settings
|
|
||||||
+sync-currently-syncing-workspaces = Workspaces
|
|
||||||
|
|
||||||
sync-change-options =
|
|
||||||
.label = Change…
|
|
||||||
@@ -980,6 +981,11 @@ sync-engine-settings =
|
|
||||||
.tooltiptext = General, Privacy, and Security settings you’ve changed
|
|
||||||
.accesskey = s
|
|
||||||
|
|
||||||
+sync-engine-workspaces =
|
|
||||||
+ .label = Workspaces
|
|
||||||
+ .tooltiptext = Workspace names, icons and associated containers
|
|
||||||
+ .accesskey = w
|
|
||||||
+
|
|
||||||
## The device name controls.
|
|
||||||
|
|
||||||
sync-device-name-header = Device Name
|
|
@@ -1,5 +1,5 @@
|
|||||||
diff --git a/browser/themes/shared/preferences/preferences.css b/browser/themes/shared/preferences/preferences.css
|
diff --git a/browser/themes/shared/preferences/preferences.css b/browser/themes/shared/preferences/preferences.css
|
||||||
index ddb6ea0e9ec0099f7c9513fe45f8151978137ac5..7dbb4ce25a681a1dca6c23c290a1ccebf9b8fff4 100644
|
index 8f2652f030b9990de83bbffb891f2a52731f478b..322d7e43a516f80de5964b0e25a455c8806fef1a 100644
|
||||||
--- a/browser/themes/shared/preferences/preferences.css
|
--- a/browser/themes/shared/preferences/preferences.css
|
||||||
+++ b/browser/themes/shared/preferences/preferences.css
|
+++ b/browser/themes/shared/preferences/preferences.css
|
||||||
@@ -33,7 +33,7 @@
|
@@ -33,7 +33,7 @@
|
||||||
@@ -11,15 +11,3 @@ index ddb6ea0e9ec0099f7c9513fe45f8151978137ac5..7dbb4ce25a681a1dca6c23c290a1cceb
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -911,6 +911,11 @@ dialog > .sync-engines-list + hbox {
|
|
||||||
list-style-image: url("chrome://formautofill/content/icon-credit-card-generic.svg");
|
|
||||||
}
|
|
||||||
|
|
||||||
+.sync-engine-workspaces .checkbox-icon,
|
|
||||||
+.sync-engine-workspaces.sync-engine-image {
|
|
||||||
+ list-style-image: url("chrome://devtools/skin/images/tool-storage.svg");
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
.fxaMobilePromo {
|
|
||||||
margin-top: 2px !important;
|
|
||||||
}
|
|
||||||
|
@@ -584,3 +584,8 @@ groupbox h2 {
|
|||||||
#websiteAdvertisingGroup {
|
#websiteAdvertisingGroup {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.sync-engine-workspaces .checkbox-icon,
|
||||||
|
.sync-engine-workspaces.sync-engine-image {
|
||||||
|
list-style-image: url("chrome://devtools/skin/images/tool-storage.svg");
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user