Merge branch 'fix-extension-ui' into 'development-rebl'

UI updates and fixes See merge request ibriz-internal/blockstack-notes-sample!13
Vaultilo · Jan 31, 2020 · 0ab005a · 0ab005a
2 parents 5be9150 + 4661f0a
commit 0ab005a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/public/index.html b/public/index.html
@@ -18,9 +18,9 @@
       _paq.push(['trackPageView']);
       _paq.push(['enableLinkTracking']);
       (function() {
-        var u = '//18.236.91.26/';
+        var u = '//matomo.vaultilo.com/';
         _paq.push(['setTrackerUrl', u + 'matomo.php']);
-        _paq.push(['setSiteId', '1']);
+        _paq.push(['setSiteId', '2']);
         var d = document,
           g = d.createElement('script'),
           s = d.getElementsByTagName('script')[0];

diff --git a/src/components/Extension/Extension_files/index.html b/src/components/Extension/Extension_files/index.html
@@ -9,6 +9,7 @@
       background:#abcdef;
       height: 510px;
       width: 320px;
+      display: block;
     }
   </style>  
   </head>

diff --git a/src/components/Extension/List Views/ExtNftShow.js b/src/components/Extension/List Views/ExtNftShow.js
@@ -11,7 +11,7 @@ export default function ExtNftShow(props) {
             <i className="fa fa-angle-left"></i>
           </span>
         </Link>
-        <div className="title">NFT</div>
+        <div className="title">Vaultilo</div>
       </div>
       <div className="ext-content">
         <div className="title">NFT</div>

diff --git a/src/components/Extension/List Views/ExtNoteShow.js b/src/components/Extension/List Views/ExtNoteShow.js
@@ -12,9 +12,10 @@ export default function ExNoteShow(props) {
             <i className="fa fa-angle-left"></i>
           </span>
         </Link>
-        <div className="title">Notes</div>
+        <div className="title">Vaultilo</div>
       </div>
       <div className="ext-content">
+        <div className="title">Notes</div>
         <div className="content-list">
           {notes.map(item => {
             const { id, noteTitle } = item;

diff --git a/src/components/Extension/List Views/ExtPwShow.js b/src/components/Extension/List Views/ExtPwShow.js
@@ -13,9 +13,10 @@ export default function ExPwShow(props) {
             <i className="fa fa-angle-left"></i>
           </span>
         </Link>
-        <div className="title">Passwords</div>
+        <div className="title">Vaultilo</div>
       </div>
       <div className="ext-content">
+        <div className="title">Passwords</div>
         <div className="content-list">
           {passwords.map(item => {
             const { id, domainName, domainAddress } = item;

diff --git a/src/components/Extension/extension.css b/src/components/Extension/extension.css
@@ -5,6 +5,7 @@
 
 .ext-header {
   padding: 14px;
+  height: 55px;
   box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.09);
 }
 
@@ -78,7 +79,8 @@
 }
 
 .list-header {
-  padding: 14px;
+  height: 55px;
+  padding: 16px;
   box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.09);
   text-align: center;
 }
@@ -96,7 +98,7 @@
 .list-header .nav-back {
   position: absolute;
   left: 15px;
-  top: 10px;
+  top: 12px;
 }
 
 .list-header .nav-back i {

diff --git a/src/components/MainContent.js b/src/components/MainContent.js
@@ -426,7 +426,7 @@ export default function MainContent(props) {
     if (type === 'notes') {
       return renderNotesItem(notes);
     }
-    return [renderPasswordItem(passwords), renderCryptoItem(credentials), renderNotesItem(notes)];
+    return [renderCryptoItem(credentials), renderPasswordItem(passwords), renderNotesItem(notes)];
   };
 
   return (