Merge pull request #8131 from brave/fix/8121

add sync beta message
brave · Apr 10, 2017 · 3c4b22c · 3c4b22c
2 parents f2f9e18 + 510667f
commit 3c4b22c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -290,6 +290,7 @@ class SyncTab extends ImmutableComponent {
         <a href='https://github.com/brave/sync/wiki/Design' target='_blank'>
           <span className='fa fa-question-circle fundsFAQ' />
         </a>
+        <div className='settingsListTitle syncBetaMessage' data-l10n-id='syncBetaMessage' />
         {
           this.setupError
           ? this.errorContent

diff --git 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;