Merge branch 'master' of https://github.com/gorhill/uMatrix

gorhill · Nov 23, 2017 · 06d7612 · 06d7612
2 parents ca9229e + f2a2068
commit 06d7612
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/css/user-rules.css b/src/css/user-rules.css
@@ -139,7 +139,6 @@ body[dir="rtl"] #commitButton:before {
     text-decoration: line-through;
     }
 #diff textarea {
-    background-color: #f8f8ff;
     border: 0;
     border-top: 1px solid #eee;
     direction: ltr;

diff --git a/src/js/contentscript-end.js b/src/js/contentscript-end.js
@@ -102,11 +102,11 @@ vAPI.shutdown.add(function() {
         //}
 
         // TODO: Web SQL
-        if ( window.openDatabase ) {
+       // if ( window.openDatabase ) {
             // Sad:
             // "There is no way to enumerate or delete the databases available for an origin from this API."
             // Ref.: http://www.w3.org/TR/webdatabase/#databases
-        }
+       // }
     }
     catch (e) {
     }

diff --git a/src/popup.html b/src/popup.html
@@ -19,7 +19,7 @@
 </div>
 
 <div class="paneHead">
-    <a id="gotoDashboard" class="extensionURL" href="#" data-extension-url="dashboard.html" title="popupTipDashboard">uMatrix <span id="version"> </span><span class="fa">&#xf013;</span></a>
+    <a id="gotoDashboard" class="extensionURL" href="#" data-extension-url="dashboard.html">uMatrix <span id="version"> </span><span class="fa">&#xf013;</span></a>
     <div id="toolbarContainer">
         <div class="toolbar">
             <span class="scope" id="specificScope"><span>&nbsp;</span></span><!--