Skip to content

Commit

Permalink
Revert to a hybrid/intermediate design
Browse files Browse the repository at this point in the history
  • Loading branch information
@ghostwords
ghostwords committed Nov 12, 2024
1 parent 260cc03 commit d0cc79c
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 110 deletions.
72 changes: 40 additions & 32 deletions src/_locales/en_US/messages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@
"message": "Options",
"description": ""
},
"popup_first_run_header": {
"message": "Great job opening the popup!",
"description": "Heading for popup_first_run_header, shown in the popup on the first run page."
},
"popup_first_run_paragraph": {
"message": "On a regular page, you'll see a list of trackers that Privacy Badger blocked and be able to click the buttons below.",
"description": "Shown in the popup on the first run page."
},
"popup_special_page_header": {
"message": "Nothing to do on this page",
"description": "Heading for popup_special_page_paragraph"
Expand All @@ -39,6 +31,14 @@
"message": "Privacy Badger doesn't work on special pages like this one. Try browsing somewhere else.",
"description": "Shown in the popup for special browser pages such as the New Tab page and 'about:' pages."
},
"popup_first_run_header": {
"message": "Great job opening the popup!",
"description": "Heading for popup_first_run_paragraph"
},
"popup_first_run_paragraph": {
"message": "On a regular page, you'll see what Privacy Badger blocked, and be able to click the buttons below.",
"description": "Shown in the popup when opened from the intro page."
},
"popup_disabled_site_header": {
"message": "Privacy Badger is disabled on this site",
"description": "Shown in the popup on disabled sites."
Expand Down Expand Up @@ -193,6 +193,10 @@
"message": "Your Badger hasn't decided yet if these domains should get blocked",
"description": "Popup domain slider list header text. Separates blocked domains from domains that haven't yet been seen perform tracking on enough sites."
},
"intro_not_an_adblocker_paragraph": {
"message": "Privacy Badger starts blocking once it sees the same tracker on three different websites. Three strikes and it's out!",
"description": "Tooltip for the 'not_yet_blocked_header' message"
},
"non_tracker": {
"message": "The domains below don't appear to be tracking you",
"description": "Popup domain slider list header text. Separates domains with detected tracking from domains where no tracking has yet been detected."
Expand Down Expand Up @@ -288,32 +292,20 @@
"description": "Shown in the popup when there is an extension error we want to encourage the user to tell us about."
},
"firstRun_title": {
"message": "Thank you for installing!",
"message": "Thank you for installing Privacy Badger!",
"description": "Title and header of the intro page."
},
"intro_by_eff": {
"message": "A project of the Electronic Frontier Foundation",
"description": "Message in the header of the intro page."
},
"intro_open_popup": {
"message": "Now, try opening Privacy Badger's popup",
"description": "Shown above an image of the Privacy Badger icon circled on the browser toolbar."
},
"intro_open_popup_alt": {
"message": "Browser toolbar with the Privacy Badger icon circled",
"description": "Alt text for toolbar icon image, which is shown below the intro_open_popup header."
"intro_welcome": {
"message": "Privacy Badger automatically learns to block invisible trackers. Take a minute to see how.",
"description": "Intro page welcome paragraph."
},
"intro_disable_button": {
"message": "If you think Privacy Badger is breaking a page (a video doesn't play, for example), you can click the 'Disable' button to turn off Privacy Badger for that site.",
"description": "Intro page paragraph. The quoted string ('Disable') should match the verb used for the 'popup_disable_for_site' message."
},
"next_section": {
"message": "next section",
"description": "Image alt. text on a couple of \"scroll down\" arrow buttons on the intro page."
},
"intro_features_heading": {
"message": "Privacy Badger is ready to protect your privacy!",
"description": "Intro page heading"
"intro_next_button": {
"message": "Take the tour",
"description": "Intro page welcome button."
},
"intro_beyond_ads": {
"message": "Catches sneaky trackers",
Expand All @@ -324,21 +316,37 @@
"description": "Intro page paragraph"
},
"intro_beyond_ads_paragraph2": {
"message": "If they ignore your wishes, Privacy Badger will learn to block them—whether they are advertisers or trackers of other kinds.",
"message": "If they ignore these signals, Privacy Badger will learn to block them—whether they are advertisers or trackers of other kinds.",
"description": "Intro page paragraph"
},
"intro_not_an_adblocker": {
"message": "Not an ad blocker",
"description": "Intro page paragraph heading."
},
"intro_not_an_adblocker_paragraph": {
"message": "Invisible tracking happens in all sorts of ways; ads are just the visible tip of the iceberg. Privacy Badger doesn't block ads unless they happen to be tracking you.",
"description": "Intro page paragraph. Also a tooltip for the 'not_yet_blocked_header' message."
},
"intro_learns_paragraph": {
"message": "Instead of keeping lists of what to block, Privacy Badger automatically discovers trackers based on their behavior.",
"description": "Intro page paragraph."
},
"intro_not_an_adblocker_paragraph2": {
"message": "Invisible tracking happens in all sorts of ways; ads are just the visible tip of the iceberg. Privacy Badger doesn't block ads unless they happen to be tracking you.",
"description": "Intro page paragraph"
},
"next_section": {
"message": "next section",
"description": "Image alt. text on a couple of \"scroll down\" arrow buttons on the intro page."
},
"intro_open_popup": {
"message": "Try opening Privacy Badger's popup",
"description": "Shown above an image of the Privacy Badger icon circled on the browser toolbar."
},
"intro_open_popup_alt": {
"message": "Browser toolbar with the Privacy Badger icon circled",
"description": "Alt text for toolbar icon image, which is shown below the intro_open_popup header."
},
"intro_disable_button": {
"message": "If you think Privacy Badger is breaking a page (a video doesn't play, for example), you can click the 'Disable' button to turn off Privacy Badger for that site.",
"description": "Intro page paragraph. The quoted string ('Disable') should match the verb used for the 'popup_disable_for_site' message."
},
"intro_donate_heading": {
"message": "Privacy is a team sport!",
"description": "Part of the 'donate' section on the intro page."
Expand Down
81 changes: 20 additions & 61 deletions src/skin/css/firstRun.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ h3 {

@media print, screen and (min-width: 40em) {
h1 {
font-size:2.75rem;
font-size:3.5rem;
}
h2 {
font-size:2.5rem;
Expand Down Expand Up @@ -293,15 +293,13 @@ ul,ol,dl {
}
li {
font-size:inherit;
padding-bottom: 1rem;
}
ul {
margin-left:1.25rem;
list-style-type:disc;
}
ol {
margin-left:1.25rem;
text-align:left;
}
ul ul,ol ul,ul ol,ol ol {
margin-left:1.25rem;
Expand Down Expand Up @@ -407,41 +405,19 @@ header {
}
header img {
margin:1rem 0 0;
width:3rem;
width:7rem;
}
@media print, screen and (min-width: 40em) {
header img {
margin:1rem 0 0;
width:5rem;
width:12rem;
}
}
header .title-bar h1 {
color:white;
font-family:"ChunkFive",serif;
}

#header-bar {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
gap: 15px;
padding: 2rem 0rem;
}
@media print, screen and (max-width: 28em) {
#header-bar {
flex-direction: column;
padding: 1rem 0rem;
}
header img {
width: 7rem;
}
}

#header-bar img, h1 {
margin: 0;
}

/* visibility classes */
.hide {
display:none !important;
Expand Down Expand Up @@ -679,7 +655,6 @@ header .title-bar h1 {
src:url("../fonts/Chunk.ttf") format("truetype");
font-weight:900;
font-style:normal;
ascent-override: 105%;
}
@font-face {
font-family:'OpenSans-Light';
Expand Down Expand Up @@ -708,7 +683,7 @@ body {
display:flex;
-ms-flex-flow:row wrap;
flex-flow:row wrap;
padding:1rem 0 5rem;
padding:3rem 0 5rem;
}
.caret-down img {
width:5rem;
Expand All @@ -719,78 +694,66 @@ body {
#intro {
padding:2rem 0rem 4rem;
}
#intro-wrapper {
#pb-settings div {
display: flex;
flex-direction: column;
align-items: center;
gap: 1.5rem;
background-color: #DFDFE6;
border-radius: 10px;
background-image:linear-gradient(#DFDFE6, #DFDFE6 45%, #fff 45%);
font-size: 17px;
padding: 1rem;
max-width: 80%;
margin-top: 1rem;
}
#disable_instructions_header {
max-width: 650px;
margin: 2rem 0 3rem;
width: 100%;
}
@media print, screen and (min-width: 40em) {
#intro {
padding:4rem 0rem 4rem;
padding:4rem 0rem 14rem;
}
}
#toolbar-icon, #disable_instructions {
#toolbar-icon, #disable-instructions {
max-width: 550px;
width: 90%;
}
#intro-pb-features {
padding-top: 1rem;
}
[id*="pb-features-"],#pb-settings {
[id*="pb-features-"] {
display:-ms-flexbox;
display:flex;
-ms-flex-flow:row wrap;
flex-flow:row wrap;
padding:3rem 0 2rem;
}
[id*="pb-features-"] img {
max-width: min(100%, 425px);
}
@media print, screen and (min-width: 40em) {
[id*="pb-features-"],#pb-settings {
[id*="pb-features-"] {
padding:3rem 0 5rem;
}
}
[id*="pb-features-"] div,#pb-settings div {
[id*="pb-features-"] div {
width:calc(100% - 1.875rem);
margin-right:.9375rem;
margin-left:.9375rem;
text-align:center;
}
@media print, screen and (min-width: 40em) {
[id*="pb-features-"] div,#pb-settings div {
[id*="pb-features-"] div {
width:calc(33.33333% - 1.875rem);
margin-right:.9375rem;
margin-left:.9375rem;
}

}
[id*="pb-features-"] h3,#pb-settings h3 {
[id*="pb-features-"] h3 {
font-size:1.5rem;
text-align:center;
margin-top:1rem;
}
@media print, screen and (min-width: 40em) {
[id*="pb-features-"] h3, #pb-settings h3 {
[id*="pb-features-"] h3 {
text-align: start;
font-size: 1.9375rem;
}
}
[id*="pb-features-"] .text, [id*="pb-features-"] p, #pb-settings .text, #pb-settings p {
[id*="pb-features-"] .text, [id*="pb-features-"] p {
text-align: start;
}
#pb-settings {
background-image:linear-gradient(#EC9329, #EC9329 30%, #fff 30%);
}
[id*="pb-donate"] {
display:-ms-flexbox;
display:flex;
Expand Down Expand Up @@ -944,11 +907,7 @@ body {
color: #000;
}

#pb-settings {
background-image: linear-gradient(#EC9329, #EC9329 30%, #222 30%);
}

#pb-donate {
#pb-settings div, #pb-donate {
background-image: linear-gradient(#333, #333 45%, #222 45%);
}

Expand All @@ -958,7 +917,7 @@ body {
color: #fff;
}

#pin-nudge, #intro-wrapper {
#pin-nudge {
background-color: #555;
}

Expand Down
Loading

0 comments on commit d0cc79c

Please sign in to comment.