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

[CHEF-6090 CHEF-6096 CHEF-6105] Privacy policy, Cookie policy, Logo and Favicon changes #3186

Merged
merged 9 commits into from
Dec 6, 2023
Merged

[CHEF-6090 CHEF-6096 CHEF-6105] Privacy policy, Cookie policy, Logo and Favicon changes #3186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
99275ab
add cookie policy in application layout
ayush-billore Nov 3, 2023
6aa17a3
add onetrust and gtm script
ayush-billore Nov 8, 2023
d87e909
remove gtag changes for testing
ayush-billore Nov 8, 2023
663600f
keep gtag and gtm both, pass GTM id from env
ayush-billore Nov 9, 2023
d546562
update supermarket logo
ayush-billore Nov 9, 2023
45a97bb
add favicon
ayush-billore Nov 9, 2023
b184da0
update conditional for google tag manager script insertion
ayush-billore Nov 10, 2023
2b8af23
add feature flag changes
ayush-billore Nov 14, 2023
d1a9a32
add cookie policy, privacy policy, logo and favicon changes
ayush-billore Nov 15, 2023
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
Binary file modified src/supermarket/app/assets/images/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file removed src/supermarket/app/assets/images/logo-supermarket.png
View file
Open in desktop
Binary file not shown.
39 changes: 0 additions & 39 deletions src/supermarket/app/assets/images/logo-supermarket.svg
View file
Open in desktop

This file was deleted.

Binary file added src/supermarket/app/assets/images/supermarket-chef-logo.png
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.
80 changes: 80 additions & 0 deletions src/supermarket/app/assets/images/supermarket-chef-logo.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: 2 additions & 2 deletions src/supermarket/app/assets/stylesheets/default_branding.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import "variables";
$search_bar_background: $primary_blue;
$appheader_logo_svg: 'logo-supermarket.svg';
$appheader_logo_png: 'logo-supermarket.png';
$appheader_logo_svg: 'supermarket-chef-logo.svg';
$appheader_logo_png: 'supermarket-chef-logo.png';
$search_input_bg_color: darken($primary_blue, 7%);
1 change: 1 addition & 0 deletions src/supermarket/app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
<br><br><%= link_to 'Code of Conduct', chef_docs_url('community_guidelines') %>
<%= link_to 'Terms and Conditions of Use', progress_www_url('legal/terms-of-use') %>
<%= link_to 'Privacy Policy', progress_www_url('legal/privacy-policy') %>
<%= link_to 'Cookie Policy', progress_www_url('legal/cookie-policy') %>
<%= link_to 'Trademark Policy', progress_www_url('legal/trademarks') %>
<%= link_to 'Status', chef_status_url %>
</footer>
Expand Down
Loading