Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make it more clear PB is an EFF project #2463

Merged
merged 13 commits into from
Oct 23, 2019
Merged

Make it more clear PB is an EFF project #2463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cb49dfc
added new assets and placed in popup, needs styling
ablanathtanalba Sep 6, 2019
cf5c0f8
black icons for help, settings, share
ablanathtanalba Sep 8, 2019
5778539
stacked logos in header, moved version number to right
ablanathtanalba Sep 17, 2019
84896cc
reposition version string, change hover color, bottom buttons now black
ablanathtanalba Sep 17, 2019
014bf42
new badger logo with non-beady eyes
ablanathtanalba Sep 30, 2019
310ea21
margin space on the left side of header image stack per design teams …
ablanathtanalba Sep 30, 2019
0c0fde2
rm files, change title to i18, closing tags
ablanathtanalba Oct 2, 2019
af9a823
removed br tag but kept format, shortened some vertical margin to red…
ablanathtanalba Oct 7, 2019
57609c6
restored site control section top margin
ablanathtanalba Oct 16, 2019
88fe57e
adjusted some spacing on header, chrm unused logo img
ablanathtanalba Oct 21, 2019
c24e3a4
fixed RTL locale header problems
ablanathtanalba Oct 22, 2019
45cb5d2
minor sizing adjustments to make icons even and eliminate scrollbar i…
ablanathtanalba Oct 22, 2019
3beb389
added float property to version number so it moves with rtl to ltr lo…
ablanathtanalba Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions src/icons/badger-bw-noborder.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 3 additions & 10 deletions src/icons/help.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 3 additions & 10 deletions src/icons/options.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/icons/share.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/lib/i18n.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ function setTextDirection() {
// popup page
if (document.location.pathname == "/skin/popup.html") {
// fix floats
['#privacyBadgerHeader h2', '#privacyBadgerHeader img', '#instruction img', '#version'].forEach((selector) => {
['#privacyBadgerHeader img', '#header-image-stack', '#instruction img', '#version'].forEach((selector) => {
toggle_css_value(selector, "float", "left", "right");
});
['#fittslaw', '#options', '#help', '#share', '.overlay_close'].forEach((selector) => {
Expand Down
7 changes: 7 additions & 0 deletions src/skin/images/EFF-red.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 23 additions & 16 deletions src/skin/popup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ body {
}
}

@font-face {
font-family: "Chunk-Five";
src: url("./fonts/Chunk.ttf");
}

a { text-decoration: none }
a:hover { color: #ec9329 }

Expand Down Expand Up @@ -136,17 +141,25 @@ a:hover { color: #ec9329 }
color: #505050;
font-size: 16px;
}

#header-image-stack {
display: table;
float: left;
padding: 0 10px 0 10px;
}

#privacyBadgerHeader h2{
margin: 5px;
padding-left: 5px;
float: left;
color: #707070;
display: table-row;
color: #000;
font-size: 24px;
font-weight: normal;
font-family: helvetica, arial, 'Lucida Grande', 'Segoe UI', Tahoma, 'DejaVu Sans', sans-serif;;
clear: initial;
font-family: "Chunk-Five", serif;
margin-top: 5px;
}
#privacyBadgerHeader img{
float: left;

#privacyBadgerHeader img {
float: left
}

#blockedResourcesContainer {
Expand Down Expand Up @@ -177,8 +190,6 @@ font-size: 16px;
}

#firstRun:hover {
/*color: #6ECD00;
border: 2px solid #6ECD00;*/
cursor: pointer;
text-decoration: underline;
background-color: #EC9329;
Expand Down Expand Up @@ -274,15 +285,13 @@ font-size: 16px;
cursor: pointer;
text-align: center;
margin-top: 8px;
border: 2px solid #707070;
border: 2px solid;
width: 100%;
color: #707070;
background-color: #fefefe;
}

.pbButton:hover {
color: #000;
border: 2px solid #000;
border: 2px solid #F06A0A;
}

#nonTrackers {
Expand Down Expand Up @@ -385,11 +394,9 @@ div.overlay.active {
}

#version{
float: left;
margin-top: -15px;
padding-left: 60px;
color: #707070;
font-size: 10px;
float: left;
}

.tooltipster-sidetip .tooltipster-box {
Expand Down
14 changes: 9 additions & 5 deletions src/skin/popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,17 @@ <h1 id="share_title" class="i18n_share_title overlay_title"></h1>
</div>

<div id='privacyBadgerHeader'>
<a id="options" title="i18n_popup_options_button" href='/skin/options.html' class="control-button grey-button tooltip" style="display:block" target="_blank"><img src="/icons/options.svg" alt="i18n_popup_options_button"></a>
<a id="share" title="i18n_popup_share_button" class="control-button grey-button tooltip" style="display:block" target="_blank"><img width="25" height="auto" src="/icons/share.svg" alt="i18n_popup_share_button"></a>
<a id="help" title="i18n_popup_help_button" href='/skin/firstRun.html' class="control-button grey-button tooltip" style="display:block" target="_blank"><img src="/icons/help.svg" alt="i18n_popup_help_button"></a>
<a id="options" title="i18n_popup_options_button" href='/skin/options.html' class="control-button tooltip" style="display:block" target="_blank"><img width="25" src="/icons/options.svg" alt="i18n_popup_options_button"></a>
<a id="share" title="i18n_popup_share_button" class="control-button tooltip" style="display:block" target="_blank"><img width="23" height="auto" src="/icons/share.svg" alt="i18n_popup_share_button"></a>
<a id="help" title="i18n_popup_help_button" href='/skin/firstRun.html' class="control-button tooltip" style="display:block" target="_blank"><img width="25" src="/icons/help.svg" alt="i18n_popup_help_button"></a>
<div id='title'>
<img src="/icons/badger-48.png" srcset="/icons/badger-128.png 2x" width="48" alt=""> <h2><span class="i18n_name"></span></h2>
<img src="../icons/badger-bw-noborder.svg" width="48" alt="" id="badger-header-logo">
<div id='header-image-stack'>
<img id='header-red-eff-logo' src="./images/EFF-red.svg" width="48" alt="">
<h2 id="title-name"><span class="i18n_name"></span></h2>
</div>
</div>
<div class='clear'></div>
<div id="subtitle"><span id="version" class="i18n_version"></span></div>
</div>

<div id="blockedResourcesContainer">
Expand All @@ -121,6 +124,7 @@ <h1 id="share_title" class="i18n_share_title overlay_title"></h1>
<button id="error" class="pbButton" target="blank"><span class="i18n_report_broken_site"></span></button>
<button id="donate" class="pbButton" target="blank"><span class="i18n_donate_to_eff"></span></button>
</div>
<span id="version" class="i18n_version"></span>
<div class='clear'></div>
</body>
</html>