Skip to content

/ ghostery-extension

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.

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

Jump to bottom

Translation fixes for 8.5.0 #544

Merged
merged 6 commits into from May 5, 2020
+17 −34
Merged

Translation fixes for 8.5.0 #544

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84fe973
Vertically align description in spring promo modal. Change links to 1…
benstrumeyer May 5, 2020
1b876e8
Remove unused css class
benstrumeyer May 5, 2020
7813a07
Spring promo modal text links use space-around
benstrumeyer May 5, 2020
fa69d80
Change caret orientation
benstrumeyer May 5, 2020
8ebad49
Remove more unused css
benstrumeyer May 5, 2020
792e3c3
Fix caret
benstrumeyer May 5, 2020
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

2 app/images/panel/caret-down.svg
View file
Open in desktop
@@ -1,3 +1,3 @@
<svg width="11" height="7" viewBox="0 0 11 7" xmlns="http://www.w3.org/2000/svg">
<path d="M1.21.02L-.02 1.25l5.27 5.27 5.27-5.27L9.29.02 5.25 4.06" fill="#4A4A4A" fill-rule="evenodd"/>
<path d="M1.283 7L0 5.676 5.5 0 11 5.676 9.717 7 5.5 2.649z" fill="#4A4A4A" fill-rule="evenodd"/>
</svg>
2 app/images/panel/caret-up.svg
View file
Open in desktop
@@ -1,3 +1,3 @@
<svg width="11" height="7" viewBox="0 0 11 7" xmlns="http://www.w3.org/2000/svg">
<path d="M1.283 7L0 5.676 5.5 0 11 5.676 9.717 7 5.5 2.649z" fill="#4A4A4A" fill-rule="evenodd"/>
<path d="M1.21.02L-.02 1.25l5.27 5.27 5.27-5.27L9.29.02 5.25 4.06" fill="#4A4A4A" fill-rule="evenodd"/>
</svg>
6 app/panel/components/Blocking/Category.jsx
View file
Open in desktop
@@ -161,13 +161,13 @@ class Category extends React.Component {
const { isExpanded } = this.state;
const { isUnknown } = this.props;
const caretClasses = ClassNames(this.context, {
'caret-down': isExpanded,
'caret-up': !isExpanded,
'caret-down': !isExpanded,
'caret-up': isExpanded,
Category__antiTrackingCaret: isUnknown
});
return (
<svg className={caretClasses} onClick={this.toggleCategoryTrackers} width="11" height="7" viewBox="0 0 11 7" xmlns="http://www.w3.org/2000/svg">
<path d={isExpanded ? 'M1.21.02L-.02 1.25l5.27 5.27 5.27-5.27L9.29.02 5.25 4.06' : 'M1.283 7L0 5.676 5.5 0 11 5.676 9.717 7 5.5 2.649z'} fillRule="evenodd" />
<path d={isExpanded ? 'M1.283 7L0 5.676 5.5 0 11 5.676 9.717 7 5.5 2.649z' : 'M1.21.02L-.02 1.25l5.27 5.27 5.27-5.27L9.29.02 5.25 4.06'} fillRule="evenodd" />
</svg>
);
}
16 app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx
View file
Open in desktop
@@ -30,14 +30,12 @@ const PlusPromoModalContent = (props) => {
return (
<div className="flex-container flex-dir-column align-middle">
<div className="PlusPromoModal__plus-logo" />
<div className="PlusPromoModal__main-content-container">
<div className="PlusPromoModal__header">
<div className="title">
<div>{t('spring_is_here')}</div>
</div>
<div className="description">
<div dangerouslySetInnerHTML={{ __html: t('subscribe_pitch_spring') }} />
</div>
<div className="PlusPromoModal__header">
<div className="title">
<div>{t('spring_is_here')}</div>
</div>
<div className="description">
<div dangerouslySetInnerHTML={{ __html: t('subscribe_pitch_spring') }} />
</div>
</div>
<div className="PlusPromoModal__call-to-action-container">
@@ -46,7 +44,7 @@ const PlusPromoModalContent = (props) => {
<span>{t('upgrade_to_plus').toUpperCase()}</span>
</button>
</div>
<div>
<div className="PlusPromoModal__text-link-container">
{!loggedIn &&
<span className="PlusPromoModal__link sign-in" onClick={handleSignInClick}>{t('subscribe_pitch_sign_in_plus')}</span>
}
25 app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss
View file
Open in desktop
@@ -31,11 +31,6 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti
background-image: url('/app/images/panel/spring-plus-logo.svg');
}

.PlusPromoModal__main-content-container {
height: 210px;
display: flex;
justify-content: center;
}
.PlusPromoModal__header {
text-align: center;
font-weight: bold;
@@ -45,8 +40,10 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti
margin-top: 8px;
}
.description {
font-size: 18px;
margin-top: 16px;
height: 131px;
display: flex;
align-items: center;
font-size: 15px;
font-weight: 500;
color: $tundora;
width: 350px;
@@ -162,22 +159,10 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti
}

.PlusPromoModal__link {
margin-left: 10px;
margin-right: 10px;
font-size: 15px;
font-size: 12px;
font-family: $standard-font-family;
color: #4a4a4a;
text-decoration: underline;
text-align: center;
cursor: pointer;

&.sign-in {
float: left;
left: 10px;
}

&.turn-promos-off {
float: right;
right: 10px;
}
}
ProTip! Use n and p to navigate between commits in a pull request.