From f84add8bec40545b160bf2da7a5b5922ab66708e Mon Sep 17 00:00:00 2001
From: Guilherme Baptista <guilhermebaptistasilva@gmail.com>
Date: Sat, 3 Feb 2018 10:27:21 -0200
Subject: [PATCH] settings pages issues

---
 html/settings/stored-data/local.html |  2 +-
 html/settings/stored-data/sync.html  |  2 +-
 js/settings/stored-data/local.js     | 10 +++++++---
 js/settings/stored-data/sync.js      | 10 +++++++---
 manifest.json                        |  5 +++++
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/html/settings/stored-data/local.html b/html/settings/stored-data/local.html
index d4d74f9..3b51433 100644
--- a/html/settings/stored-data/local.html
+++ b/html/settings/stored-data/local.html
@@ -21,7 +21,7 @@ <h2 class="locale" data-locale="settingsStoredDataLocalTitle"></h2>
 
     <br><br>
 
-    <span id="used"></span> | <button id="clear" class="locale" data-locale="settingsClearAllButtonText"></button>
+    <span id="used"></span><button id="clear" class="locale" data-locale="settingsClearAllButtonText"></button>
 
     <div class="tabs"></div>
   </body>
diff --git a/html/settings/stored-data/sync.html b/html/settings/stored-data/sync.html
index 9a1b74f..1bd161d 100644
--- a/html/settings/stored-data/sync.html
+++ b/html/settings/stored-data/sync.html
@@ -21,7 +21,7 @@ <h2 class="locale" data-locale="settingsStoredDataSyncTitle"></h2>
 
     <br><br>
 
-    <span id="used"></span> | <button id="clear" class="locale" data-locale="settingsClearAllButtonText"></button>
+    <span id="used"></span><button id="clear" class="locale" data-locale="settingsClearAllButtonText"></button>
 
     <div class="options"></div>
   </body>
diff --git a/js/settings/stored-data/local.js b/js/settings/stored-data/local.js
index 71b3bc9..d994e3e 100644
--- a/js/settings/stored-data/local.js
+++ b/js/settings/stored-data/local.js
@@ -3,9 +3,13 @@ $(document).ready(function() {
     $('#loading').fadeOut(200);
   };
 
-  chrome.storage.local.getBytesInUse(null, function(bytesUsed) {
-    $('#used').html((bytesUsed/1000000).toFixed(2) + ' MB');
-  });
+  try {
+    chrome.storage.local.getBytesInUse(null, function(bytesUsed) {
+      $('#used').html((bytesUsed/1000000).toFixed(2) + ' MB | ');
+    });
+  } catch (_) {
+    $('#used').remove();
+  }
 
   $('#clear').click(function() {
     if(confirm(chrome.i18n.getMessage('settingsConfirmWindowText'))) {
diff --git a/js/settings/stored-data/sync.js b/js/settings/stored-data/sync.js
index 82a61b1..36a2926 100644
--- a/js/settings/stored-data/sync.js
+++ b/js/settings/stored-data/sync.js
@@ -7,9 +7,13 @@ $(document).ready(function() {
     $('#loading').fadeIn(200);
   }
 
-  chrome.storage.sync.getBytesInUse(null, function(bytesUsed) {
-    $('#used').html((bytesUsed/1000000).toFixed(2) + ' MB');
-  });
+  try {
+    chrome.storage.sync.getBytesInUse(null, function(bytesUsed) {
+      $('#used').html((bytesUsed/1000000).toFixed(2) + ' MB | ');
+    });
+  } catch (_) {
+    $('#used').remove();
+  }
 
   $('#clear').click(function() {
     if(confirm(chrome.i18n.getMessage('settingsConfirmWindowText'))) {
diff --git a/manifest.json b/manifest.json
index 2abca3d..a3a356d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -36,6 +36,11 @@
     "default_popup": "html/popup/popup.html"
   },
   "options_page": "html/settings/advanced.html",
+  "options_ui": {
+    "page": "html/settings/advanced.html",
+    "open_in_tab": true,
+    "browser_style": false
+  },
   "content_scripts": [
     {
       "matches": ["<all_urls>"],