Skip to content

Privacy shield #4

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Privacy shield #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
151b516
added new green circle check for pricing page table
dmalkin Feb 5, 2019
a991e10
fixed incorrect button styles for all green ctas
dmalkin Feb 5, 2019
2f8ab71
Merge branch 'hotfix/green-button'
dmalkin Feb 5, 2019
1a51b01
added privacy shield certification image to feature columns block
dmalkin Feb 8, 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
11 changes: 8 additions & 3 deletions bridge-child/f1-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@
.features-columns img {
width: 80px;
margin-bottom: 25px; }
.features-columns .privacy-shield img {
width: 80%;
max-width: 400px;
margin-bottom: 0;
margin-top: 35px; }

.page-template-features .section3-desk #btnSignupIntegrate,
#btnSignupIntegrate,
Expand All @@ -123,15 +128,15 @@
#btnsignup,
#btnSignUpCenter .qbutton {
background: #7fe34a;
background: linear-gradient(#9be970, #33b700); }
background: linear-gradient(#7fe34a, #33b700); }
.page-template-features .section3-desk #btnSignupIntegrate:hover,
#btnSignupIntegrate:hover,
#btnSignup:hover,
#btnSignUp a:not(.requestDemo):hover,
#btnSignUp1 a:not(.requestDemo):hover,
#btnsignup:hover,
#btnSignUpCenter .qbutton:hover {
background: linear-gradient(#9be070, #51cc0a); }
background: linear-gradient(#9be970, #51cc0a); }

.page-template-features #btnSignupIntegrate {
height: 58px !important;
Expand All @@ -142,7 +147,7 @@
border: none !important;
padding: 6px !important; }
#btnsignup:hover {
background: linear-gradient(#51CC0A, #9BE970); }
background: linear-gradient(#9be970, #51cc0a); }

#btnlogin {
padding: 4px; }
Expand Down
2 changes: 1 addition & 1 deletion bridge-child/f1-styles.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 12 additions & 3 deletions bridge-child/f1-styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,15 @@
width: 80px;
margin-bottom: 25px;
}

.privacy-shield {
img {
width: 80%;
max-width: 400px;
margin-bottom: 0;
margin-top: 35px;
}
}
}

.page-template-features .section3-desk #btnSignupIntegrate,
Expand All @@ -185,9 +194,9 @@
#btnsignup,
#btnSignUpCenter .qbutton {
background: #7fe34a;
background: linear-gradient(#9be970, #33b700);
background: linear-gradient(#7fe34a, #33b700);
&:hover {
background: linear-gradient(#9be070, #51cc0a);
background: linear-gradient(#9be970, #51cc0a);
}
}

Expand All @@ -201,7 +210,7 @@
border: none !important;
padding: 6px !important;
&:hover {
background: linear-gradient(#51CC0A, #9BE970);
background: linear-gradient(#9be970, #51cc0a);
}
}

Expand Down
3 changes: 2 additions & 1 deletion bridge-child/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function enqueue_parent_styles() {
wp_enqueue_style( 'child-style', get_stylesheet_directory_uri(). '/style.css', array(), '1.1', 'all' );
wp_enqueue_style( 'custom-style', get_stylesheet_directory_uri(). '/custom.css', array(), '1.4', 'all' );
wp_enqueue_style( 'ginger-grid', get_stylesheet_directory_uri() . '/f1-assets/ginger.min.css', array(), '2.2.0' );
wp_enqueue_style( 'f1-styles', get_stylesheet_directory_uri() . '/f1-styles.min.css', array(), '1.2.1' );
wp_enqueue_style( 'f1-styles', get_stylesheet_directory_uri() . '/f1-styles.min.css', array(), '1.2.5' );
wp_enqueue_script( 'js-cookie-js', get_stylesheet_directory_uri(). '/js.cookie.js', array( 'jquery' ), '1.1', true ); //https://github.com/js-cookie/js-cookie
wp_enqueue_script( 'custom-js', get_stylesheet_directory_uri(). '/custom.js', array( 'jquery' ), '1.1', true );
wp_enqueue_script( 'f1-js', get_stylesheet_directory_uri() . '/f1-assets/f1-scripts.js', array('jquery'), '1.1', true );
Expand Down Expand Up @@ -141,3 +141,4 @@ function defer_parsing_of_js ( $url ) {
add_image_size('features_icon', 80, 50, false );
add_image_size('features_checklist', 1400, 540, array('center', 'center') );
add_image_size('column_icon', 80, 80, false );
add_image_size('features_privacy_shield', 900, 600, false );
30 changes: 30 additions & 0 deletions bridge-child/images/checkmark-green--full.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.
17 changes: 8 additions & 9 deletions bridge-child/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions bridge-child/parts/feature-columns.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

// Custom Fields
$headline = get_field('three_column_headline');
$privacy_shield = wp_get_attachment_image_src(get_field('privacy_shield'), 'features_privacy_shield');

if( have_rows('columns') ) : ?>

Expand Down Expand Up @@ -34,6 +35,15 @@
<?php endwhile; ?>

</div>

<?php if($privacy_shield) : ?>
<div class="g-row privacy-shield">
<div class="g-col-12 text-center">
<img src="<?php echo $privacy_shield[0]; ?>" alt="Privacy Shield Certified">
</div>
</div>
<?php endif; ?>

</section>

<?php endif; ?>