Merge branch 'develop' into nord_dark_theme

This commit is contained in:
Alexandar Mechev 2020-10-26 17:20:44 +01:00 committed by GitHub
commit a6728a415a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 11 deletions

View File

@ -73,10 +73,6 @@ class Filter:
theme_colors = self.parse_theme_colors() theme_colors = self.parse_theme_colors()
page = page.replace('fff', theme_colors['background-color'].replace("#","")) page = page.replace('fff', theme_colors['background-color'].replace("#",""))
if self.dark:
page = page.replace('202124', 'ddd').replace('1967D2', '3b85ea')
page = page.replace('<footer>', '<footer class="dark">')
return page return page
def encrypt_path(self, msg, is_element=False): def encrypt_path(self, msg, is_element=False):
@ -96,6 +92,7 @@ class Filter:
self.fix_question_section() self.fix_question_section()
self.update_styling(soup) self.update_styling(soup)
for img in [_ for _ in soup.find_all('img') if 'src' in _.attrs]: for img in [_ for _ in soup.find_all('img') if 'src' in _.attrs]:
self.update_element_src(img, 'image/png') self.update_element_src(img, 'image/png')
@ -187,7 +184,9 @@ class Filter:
def update_link(self, link): def update_link(self, link):
# Replace href with only the intended destination (no "utm" type tags) # Replace href with only the intended destination (no "utm" type tags)
href = link['href'].replace('https://www.google.com', '') href = link['href'].replace('https://www.google.com', '')
if '/advanced_search' in href: if '/advanced_search' in href or 'tbm=shop' in href:
# TODO: The "Shopping" tab requires further filtering (see #136)
# Temporarily removing all links to that tab for now.
link.decompose() link.decompose()
return return
elif self.new_tab: elif self.new_tab:

View File

@ -5,9 +5,7 @@
<a class="logo-link mobile-logo" <a class="logo-link mobile-logo"
href="/" href="/"
style="display:flex; justify-content:center; align-items:center; color:#685e79; font-size:18px; "> style="display:flex; justify-content:center; align-items:center; color:#685e79; font-size:18px; ">
<span class="V6gwVd">Wh</span><span class="iWkuvd">o</span><span class="cDrQ7">o</span><span <span style="color: #685e79">Whoogle</span>
class="V6gwVd">g</span><span class="ntlR9">l</span><span
class="iWkuvd tJ3Myc">e</span>
</a> </a>
<div class="H0PQec" style="width: 100%;"> <div class="H0PQec" style="width: 100%;">
<div class="sbc esbc autocomplete"> <div class="sbc esbc autocomplete">
@ -25,9 +23,7 @@
<header> <header>
<div class="logo-div"> <div class="logo-div">
<a class="logo-link" href="/"> <a class="logo-link" href="/">
<span class="V6gwVd logo-letter">Wh</span><span class="iWkuvd logo-letter">o</span><span <span style="color: #685e79">Whoogle</span>
class="cDrQ7 logo-letter">o</span><span class="V6gwVd logo-letter">g</span><span
class="ntlR9 logo-letter">l</span><span class="iWkuvd tJ3Myc logo-letter">e</span>
</a> </a>
</div> </div>
<div class="search-div"> <div class="search-div">