From 510667f154a92b40840cb3e54d61a62040e7f430 Mon Sep 17 00:00:00 2001 From: yan Date: Sat, 8 Apr 2017 17:36:00 +0000 Subject: [PATCH] add sync beta message fix #8121 test plan: 1. go to about:preferences#sync 2. you should see text saying that sync is still being completed --- app/extensions/brave/locales/en-US/preferences.properties | 1 + app/renderer/components/preferences/syncTab.js | 1 + less/about/preferences.less | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties index d3782e0946f..e94d3993f0d 100644 --- a/app/extensions/brave/locales/en-US/preferences.properties +++ b/app/extensions/brave/locales/en-US/preferences.properties @@ -29,6 +29,7 @@ paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership wi paymentsSidebarText4=Your contributions in the form of credit cards and bank cards are handled by: syncTitle=Brave Sync syncTitleMessage=Sync encrypted browser data between your devices securely and privately using Brave Sync. +syncBetaMessage=Note: Sync for iOS and Android is still being completed and will be released soon. syncEnable=Sync this device syncData=Sync Data syncDataMessage=Sync the following data from this device: diff --git a/app/renderer/components/preferences/syncTab.js b/app/renderer/components/preferences/syncTab.js index 3c423d1c632..4755c73829c 100644 --- a/app/renderer/components/preferences/syncTab.js +++ b/app/renderer/components/preferences/syncTab.js @@ -290,6 +290,7 @@ class SyncTab extends ImmutableComponent { +
{ this.setupError ? this.errorContent diff --git a/less/about/preferences.less b/less/about/preferences.less index 815e8310083..28ae0c05d1d 100644 --- a/less/about/preferences.less +++ b/less/about/preferences.less @@ -642,6 +642,10 @@ table.sortableTable { .deviceNameInput { width: 50%; } + .syncBetaMessage { + color: grey; + margin-top: 8px; + } .device { background-color: @lightGray; border-radius: @borderRadiusUIbox;