this fixes gorhill#211

Noxgrim · May 17, 2015 · 5a9f839 · 5a9f839
1 parent 32cb2f6
commit 5a9f839
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/src/css/popup.css b/src/css/popup.css
@@ -85,12 +85,6 @@ body.tScopeSite .scopeRel:not(.disabled) {
     color: #a00;
     }
 
-body[dir="ltr"] #buttonMtxSwitches + .dropdown-menu {
-    left: -80%;
-    }
-body[dir="rtl"] #buttonMtxSwitches + .dropdown-menu {
-    right: -80%;
-    }
 #mtxSwitches > li  {
     color: #888;
     }
@@ -113,15 +107,21 @@ body[dir="rtl"] #mtxSwitches > li:before {
     color: #000;
     content: '\f205';
     }
-#buttonRevertAll:before {
-    content: '\f122';
+
+#extras + .dropdown-menu .dropdown-menu-entry:before {
     font: 110% FontAwesome;
+    } 
+body[dir="ltr"] #extras + .dropdown-menu .dropdown-menu-entry:before {
     padding-right: 0.5em;
+    } 
+body[dir="rtl"] #extras + .dropdown-menu .dropdown-menu-entry:before {
+    padding-left: 0.5em;
+    } 
+#buttonRevertAll:before {
+    content: '\f122';
     }
 [data-i18n="matrixDashboardMenuEntry"]:before {
     content: '\f085';
-    font: 110% FontAwesome;
-    padding-right: 0.5em;
     }
 
 .dropdown-menu {
@@ -158,11 +158,6 @@ body[dir="rtl"] #mtxSwitches > li:before {
     border-top: 1px solid #ccc;
     margin: 0.5em 0;
     }
-.dropdown-menu > ul > li.dropdown-menu-entry > .fa {
-    color: #aaa;
-    font-size: 110%;
-    margin-right: 0.5em;
-    }
 .dropdown-menu.show {
     display: block;
     }
@@ -333,9 +328,15 @@ body.tScopeSite #scopeCell {
     font-weight: normal;
     }
 
+/* RFC 3987 Internationalized Resource Identifiers (IRIs) -- 4.4 */
 .matrix .matRow > .matCell:first-child {
-    width: 16em;
+    direction: ltr;
     text-align: right;
+    unicode-bidi: embed;
+    width: 16em;
+    }
+.matrix .matGroup.g4 .matRow.ro > .matCell:first-child {
+    direction: inherit;
     }
 .matrix .matRow.l2 > .matCell:first-child {
     margin-left: 1px;

diff --git a/src/js/popup.js b/src/js/popup.js
@@ -658,7 +658,10 @@ function makeMatrixMetaRow(totals) {
     var contents = cells.at(0).addClass('t81').contents();
     cells.at(0).prop('reqType', '*').prop('hostname', '');
     contents.nodeAt(0).textContent = ' ';
-    contents.nodeAt(1).textContent = blacklistedHostnamesLabel.replace('{{count}}', totals[typeOffsets['*']]);
+    contents.nodeAt(1).textContent = blacklistedHostnamesLabel.replace(
+        '{{count}}',
+        totals[typeOffsets['*']].toLocaleString()
+    );
     renderMatrixMetaCellType(cells.at(1), totals[typeOffsets.cookie]);
     renderMatrixMetaCellType(cells.at(2), totals[typeOffsets.css]);
     renderMatrixMetaCellType(cells.at(3), totals[typeOffsets.image]);

diff --git a/src/popup.html b/src/popup.html
@@ -49,7 +49,7 @@
     <!-- Yandex: float works correctly only if it is the first child -->
     <div class="toolbar alignRight">
         <button type="button" class="fa extensionURL tip-anchor-right" data-extension-url="logger-ui.html" data-i18n-tip="matrixLoggerMenuEntry">&#xf022;</button>
-        <button type="button" class="dropdown-menu-button fa tip-anchor-right">&#xf067;</button>
+        <button type="button" id="extras" class="dropdown-menu-button fa tip-anchor-right">&#xf067;</button>
         <div class="dropdown-menu">
             <ul>
                 <li id="buttonRevertAll" class="dropdown-menu-entry" data-i18n="matrixRevertAllEntry">