diff options
| author | Stephen Blott | 2014-11-12 09:52:14 +0000 |
|---|---|---|
| committer | Stephen Blott | 2014-11-12 09:52:14 +0000 |
| commit | 7b9c1017d8742b280774184e99743f4ae15e2777 (patch) | |
| tree | 13d40a405a3859386aa14611b44261ad7e818858 | |
| parent | 2687fbe835e447beb875f399c4c150dfe919535e (diff) | |
| parent | 95cb81eb90b4c78b253f30a61d819f069b199572 (diff) | |
| download | vimium-7b9c1017d8742b280774184e99743f4ae15e2777.tar.bz2 | |
Merge pull request #1239 from smblott-github/favicons-revert
Favicons in the vomnibar; remove support.
| -rw-r--r-- | background_scripts/completion.coffee | 5 | ||||
| -rw-r--r-- | content_scripts/vimium.css | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/background_scripts/completion.coffee b/background_scripts/completion.coffee index b6a52a15..b411bcba 100644 --- a/background_scripts/completion.coffee +++ b/background_scripts/completion.coffee @@ -26,7 +26,6 @@ class Suggestion generateHtml: -> return @html if @html - favIconUrl = @tabFavIconUrl or "#{@getUrlRoot(@url)}/favicon.ico" relevancyHtml = if @showRelevancy then "<span class='relevancy'>#{@computeRelevancy()}</span>" else "" # NOTE(philc): We're using these vimium-specific class names so we don't collide with the page's CSS. @html = @@ -35,8 +34,7 @@ class Suggestion <span class="vimiumReset vomnibarSource">#{@type}</span> <span class="vimiumReset vomnibarTitle">#{@highlightTerms(Utils.escapeHtml(@title))}</span> </div> - <div class="vimiumReset vomnibarBottomHalf vomnibarIcon" - style="background-image: url(#{favIconUrl});"> + <div class="vimiumReset vomnibarBottomHalf"> <span class="vimiumReset vomnibarUrl">#{@shortenUrl(@highlightTerms(Utils.escapeHtml(@url)))}</span> #{relevancyHtml} </div> @@ -294,7 +292,6 @@ class TabCompleter suggestions = results.map (tab) => suggestion = new Suggestion(queryTerms, "tab", tab.url, tab.title, @computeRelevancy) suggestion.tabId = tab.id - suggestion.tabFavIconUrl = tab.favIconUrl suggestion onComplete(suggestions) diff --git a/content_scripts/vimium.css b/content_scripts/vimium.css index 24f229f3..7998fe5c 100644 --- a/content_scripts/vimium.css +++ b/content_scripts/vimium.css @@ -352,13 +352,6 @@ body.vimiumFindMode ::selection { padding: 2px 0; } -#vomnibar li .vomnibarIcon { - background-position-y: center; - background-size: 16px; - background-repeat: no-repeat; - padding-left: 20px; -} - #vomnibar li .vomnibarSource { color: #777; margin-right: 4px; |