Skip to content

Commit

Permalink
[CHEF-6090 CHEF-6096 CHEF-6105] Privacy policy, Cookie policy, Logo a…
Browse files Browse the repository at this point in the history
…nd Favicon changes (#3186)

* add cookie policy in application layout

Signed-off-by: ayush-billore <ayush.billore@progress.com>

* add onetrust and gtm script

Signed-off-by: ayush-billore <ayush.billore@progress.com>

* remove gtag changes for testing

Signed-off-by: ayush-billore <ayush.billore@progress.com>

* keep gtag and gtm both, pass GTM id from env

Signed-off-by: ayush-billore <ayush.billore@progress.com>

* update supermarket logo

Signed-off-by: ayush-billore <ayush.billore@progress.com>

* add favicon

Signed-off-by: ayush-billore <ayush.billore@progress.com>

* update conditional for google tag manager script insertion

Signed-off-by: ayush-billore <ayush.billore@progress.com>

* add feature flag changes

Signed-off-by: ayush-billore <ayush.billore@progress.com>

* add cookie policy, privacy policy, logo and favicon changes

Signed-off-by: ayush-billore <ayush.billore@progress.com>

---------

Signed-off-by: ayush-billore <ayush.billore@progress.com>
  • Loading branch information
ayush-billore authored Dec 6, 2023
1 parent 7ada2c5 commit 1874cac
Show file tree
Hide file tree
Showing 7 changed files with 83 additions and 41 deletions.
Binary file modified src/supermarket/app/assets/images/favicon.ico
Binary file not shown.
Binary file not shown.
39 changes: 0 additions & 39 deletions src/supermarket/app/assets/images/logo-supermarket.svg

This file was deleted.

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
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
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
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

0 comments on commit 1874cac

Please sign in to comment.