diff --git a/drivers/chrome/css/popup.css b/drivers/chrome/css/popup.css index f223ebcc2..0c2fbf65c 100644 --- a/drivers/chrome/css/popup.css +++ b/drivers/chrome/css/popup.css @@ -4,7 +4,9 @@ body { font-family: Helvetica, Arial, sans-serif; font-size: 13px; line-height: 16px; + margin: 0; min-width: 200px; + padding: 15px; } a:focus { @@ -38,12 +40,20 @@ img { text-decoration: none; } - .detected-app a:hover .label { - text-decoration: underline; + .detected-app a .label .name { + border-bottom: 1px dotted #999; } - .detected-app a:hover .category { - text-decoration: underline; + .detected-app a:hover .label .name { + border-bottom: 1px solid #333; + } + + .detected-app a .category .name { + border-bottom: 1px solid transparent; + } + + .detected-app a:hover .category .name { + border-bottom: 1px solid #999; } .label { @@ -64,9 +74,9 @@ img { #footer { border-top: 1px solid #ccc; - margin-top: 12px; + margin-top: 17px; overflow: hidden; - padding-top: 6px; + padding-top: 11px; } #footer a { diff --git a/drivers/chrome/js/popup.js b/drivers/chrome/js/popup.js index 399dd1bdb..15ed8bd2f 100644 --- a/drivers/chrome/js/popup.js +++ b/drivers/chrome/js/popup.js @@ -36,13 +36,13 @@ document.addEventListener('DOMContentLoaded', function() { '
' + '' + '' + - '' + appName + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ) + '' + + '' + appName + '' + ( version ? ' ' + version : '' ) + ( confidence < 100 ? ' (' + confidence + '% sure)' : '' ) + '' + ''; response.apps[appName].cats.forEach(function(cat) { html += '' + - '' + chrome.i18n.getMessage('categoryName' + cat) + '' + + '' + chrome.i18n.getMessage('categoryName' + cat) + '' + ''; }); diff --git a/drivers/firefox/data/panel.html b/drivers/firefox/data/panel.html index b1a10015c..83f1abe54 100644 --- a/drivers/firefox/data/panel.html +++ b/drivers/firefox/data/panel.html @@ -2,6 +2,8 @@ + + Panel diff --git a/share/apps.json b/share/apps.json index b377920fd..4fdbeb743 100644 --- a/share/apps.json +++ b/share/apps.json @@ -91,6 +91,12 @@ "script": "addthis\\.com/js/(\\d+)?\\;version:\\1", "env": "^addthis" }, + "AdInfinity": { + "website": "adinfinity.com.au", + "cats": [ 36 ], + "env": [ "" ], + "script": [ "adinfinity\\.com\\.au" ] + }, "Adobe ColdFusion": { "website": "adobe.com/products/coldfusion-family.html", "cats": [ 18 ], @@ -212,7 +218,7 @@ "AppNexus": { "website": "appnexus.com", "cats": [ 36 ], - "html": "<(?:iframe|img)[^>]+adnxs\\.net", + "html": "<(?:iframe|img)[^>]+adnxs\\.(?:net|com)", "script": "adnxs\\.(?:net|com)" }, "Arc Forum": { @@ -331,6 +337,11 @@ "meta": { "generator": "blogger" }, "url": "\\.blogspot\\.com" }, + "BlueKai": { + "website": "bluekai.com", + "cats": [ 32 ], + "env": [ "^BKTAG$", "^bk_doJSTag" ] + }, "Boa": { "website": "www.boa.org", "cats": [ 22 ], @@ -1048,7 +1059,7 @@ "website": "google.com/analytics", "cats": [ 10 ], "html": "_gaq\\.push\\(\\['_setAccount|i\\['GoogleAnalyticsObject'\\]|ga\\.async = true", - "script": "(?:\\.google-analytics\\.com\/ga\\.js|\/urchin\\.js|\\.google-analytics\\.com\/analytics\\.js)", + "script": "(?:\\.google-analytics\\.com\/ga\\.js|\/urchin\\.js|\\.google-analytics\\.com/analytics\\.js)", "headers": { "Set-Cookie": "__utma" }, "env": "^gaGlobal$" }, @@ -1056,7 +1067,7 @@ "website": "google.com/adsense", "cats": [ 36 ], "env": [ "^google_ad_", "^__google_ad_", "^Goog_AdSense_" ], - "script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad.ca.doubleclick.net" ] + "script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick\\.net", "2mdn\\.net" ] }, "Google App Engine": { "website": "code.google.com/appengine", @@ -1098,7 +1109,8 @@ "Google Tag Manager": { "website": "www.google.com/tagmanager", "cats": [ 19 ], - "html": "googletagmanager\\.com/ns\\.html[^>]+>" + "html": "googletagmanager\\.com/ns\\.html[^>]+>", + "env": "^googletag$" }, "Google Wallet": { "website": "wallet.google.com", @@ -1523,7 +1535,7 @@ "headers": { "Set-Cookie": "lep\\d+sessionid=" }, "implies": "PHP" }, - "LESS": { + "Less": { "website": "lesscss.org", "cats": [ 19 ], "html": "]+ rel=\"stylesheet/less\"" @@ -1576,8 +1588,9 @@ "Livefyre": { "website": "livefyre.com", "cats": [ 15 ], + "html": "<[^>]+(?:id|class)=\"livefyre", "script": "livefyre_init\\.js", - "env": "^fyre$" + "env": [ "^fyre$", "^FyreLoader$", "^LF$" ] }, "LiveJournal": { "website": "www.livejournal.com", @@ -2709,6 +2722,12 @@ "cats": [ 24 ], "env": "^tinyMCE$" }, + "Titan": { + "website": "titan360.com", + "cats": [ 36 ], + "env": [ "^titan$", "^titanEnabled$" ], + "html": "]+>var titan" + }, "Tealeaf": { "website": "www.tealeaf.com", "cats": [ 10 ], diff --git a/share/images/icons/Chartbeat.png b/share/images/icons/Chartbeat.png index d963a9716..db8c3c529 100644 Binary files a/share/images/icons/Chartbeat.png and b/share/images/icons/Chartbeat.png differ diff --git a/share/images/icons/Cufon.png b/share/images/icons/Cufon.png index efd29df05..4c8343e4e 100644 Binary files a/share/images/icons/Cufon.png and b/share/images/icons/Cufon.png differ diff --git a/share/images/icons/Disqus.png b/share/images/icons/Disqus.png index d0d67e07c..08bf7f1fc 100644 Binary files a/share/images/icons/Disqus.png and b/share/images/icons/Disqus.png differ diff --git a/share/images/icons/Less.png b/share/images/icons/Less.png index 0a2c19e7e..50df87ff4 100644 Binary files a/share/images/icons/Less.png and b/share/images/icons/Less.png differ diff --git a/share/images/icons/LiveJournal.png b/share/images/icons/LiveJournal.png index 62416e00e..5c4edf909 100644 Binary files a/share/images/icons/LiveJournal.png and b/share/images/icons/LiveJournal.png differ diff --git a/share/images/icons/Mixpanel.png b/share/images/icons/Mixpanel.png index ea1b74d04..c5b79250e 100644 Binary files a/share/images/icons/Mixpanel.png and b/share/images/icons/Mixpanel.png differ diff --git a/share/images/icons/MooTools.png b/share/images/icons/MooTools.png index dac800869..00b855b17 100644 Binary files a/share/images/icons/MooTools.png and b/share/images/icons/MooTools.png differ diff --git a/share/images/icons/Moodle.png b/share/images/icons/Moodle.png index 31b6616e3..4d20d6113 100644 Binary files a/share/images/icons/Moodle.png and b/share/images/icons/Moodle.png differ diff --git a/share/images/icons/Red Hat.png b/share/images/icons/Red Hat.png index da1a33353..2dc6a18aa 100644 Binary files a/share/images/icons/Red Hat.png and b/share/images/icons/Red Hat.png differ diff --git a/share/images/icons/SiteCatalyst.png b/share/images/icons/SiteCatalyst.png index 9c07b6eea..87a52cd2c 100644 Binary files a/share/images/icons/SiteCatalyst.png and b/share/images/icons/SiteCatalyst.png differ diff --git a/share/images/icons/TypePad.png b/share/images/icons/TypePad.png index 98456e528..234902dc6 100644 Binary files a/share/images/icons/TypePad.png and b/share/images/icons/TypePad.png differ diff --git a/share/images/icons/blip.tv.png b/share/images/icons/blip.tv.png deleted file mode 100644 index 34dd8b44f..000000000 Binary files a/share/images/icons/blip.tv.png and /dev/null differ