Skip to content

Commit

Permalink
Remove noatb.css.
Browse files Browse the repository at this point in the history
We're not using this CSS rule for extension detection anymore. Removing
it fixes a race condition on extension install in Firefox.
  • Loading branch information
sammacbeth committed Oct 31, 2023
1 parent c681671 commit 6750c61
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 33 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ BUILD_TARGETS += $(BUILD_DIR)/public/js/inject.js
## SASS
SASS = node_modules/.bin/sass
SCSS_SOURCE = $(shell find shared/scss/ -type f)
OUTPUT_CSS_FILES = $(BUILD_DIR)/public/css/noatb.css $(BUILD_DIR)/public/css/options.css $(BUILD_DIR)/public/css/feedback.css
OUTPUT_CSS_FILES = $(BUILD_DIR)/public/css/options.css $(BUILD_DIR)/public/css/feedback.css
$(BUILD_DIR)/public/css/base.css: shared/scss/base/base.scss $(SCSS_SOURCE)
$(SASS) $< $@
$(BUILD_DIR)/public/css/%.css: shared/scss/%.scss $(SCSS_SOURCE)
Expand Down
15 changes: 0 additions & 15 deletions browsers/chrome-mv3/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,6 @@
"extension_pages": "script-src 'self'; object-src 'self'; frame-ancestors https://duckduckgo.com https://*.duckduckgo.com"
},
"content_scripts": [
{
"matches": [
"<all_urls>"
],
"exclude_matches": [
"*://localhost/*",
"*://*.localhost/*"
],
"match_about_blank": true,
"all_frames": true,
"css": [
"public/css/noatb.css"
],
"run_at": "document_start"
},
{
"js": [
"public/js/content-scripts/autofill.js"
Expand Down
3 changes: 0 additions & 3 deletions browsers/chrome/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
],
"match_about_blank": true,
"all_frames": true,
"css": [
"public/css/noatb.css"
],
"js": [
"public/js/inject.js"
],
Expand Down
3 changes: 0 additions & 3 deletions browsers/firefox/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@
],
"match_about_blank": true,
"all_frames": true,
"css": [
"public/css/noatb.css"
],
"js": [
"public/js/inject.js"
],
Expand Down
8 changes: 0 additions & 8 deletions shared/js/background/wrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,6 @@ export function mergeSavedSettings (settings, results) {

export async function getDDGTabUrls () {
const tabs = await browser.tabs.query({ url: 'https://*.duckduckgo.com/*' }) || []

tabs.forEach(tab => {
insertCSS({
target: { tabId: tab.id },
files: ['/public/css/noatb.css']
})
})

return tabs.map(tab => tab.url)
}

Expand Down
3 changes: 0 additions & 3 deletions shared/scss/noatb.scss

This file was deleted.

0 comments on commit 6750c61

Please sign in to comment.