diff --git a/src/supermarket/app/assets/images/favicon.ico b/src/supermarket/app/assets/images/favicon.ico index 58ea3b2631..fa56c2d403 100644 Binary files a/src/supermarket/app/assets/images/favicon.ico and b/src/supermarket/app/assets/images/favicon.ico differ diff --git a/src/supermarket/app/assets/images/logo-supermarket.png b/src/supermarket/app/assets/images/logo-supermarket.png deleted file mode 100644 index 39e6155a38..0000000000 Binary files a/src/supermarket/app/assets/images/logo-supermarket.png and /dev/null differ diff --git a/src/supermarket/app/assets/images/logo-supermarket.svg b/src/supermarket/app/assets/images/logo-supermarket.svg deleted file mode 100644 index ba87005bf5..0000000000 --- a/src/supermarket/app/assets/images/logo-supermarket.svg +++ /dev/null @@ -1,39 +0,0 @@ - - logo-supermarket - Created with Sketch (http://www.bohemiancoding.com/sketch) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/supermarket/app/assets/images/supermarket-chef-logo.png b/src/supermarket/app/assets/images/supermarket-chef-logo.png new file mode 100644 index 0000000000..fb75b39510 Binary files /dev/null and b/src/supermarket/app/assets/images/supermarket-chef-logo.png differ diff --git a/src/supermarket/app/assets/images/supermarket-chef-logo.svg b/src/supermarket/app/assets/images/supermarket-chef-logo.svg new file mode 100644 index 0000000000..86a721d8c7 --- /dev/null +++ b/src/supermarket/app/assets/images/supermarket-chef-logo.svg @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/supermarket/app/assets/stylesheets/default_branding.scss b/src/supermarket/app/assets/stylesheets/default_branding.scss index 6e271756e5..bed61f98e3 100644 --- a/src/supermarket/app/assets/stylesheets/default_branding.scss +++ b/src/supermarket/app/assets/stylesheets/default_branding.scss @@ -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%); \ No newline at end of file diff --git a/src/supermarket/app/views/layouts/application.html.erb b/src/supermarket/app/views/layouts/application.html.erb index 792c3d7e5f..e66280ce96 100644 --- a/src/supermarket/app/views/layouts/application.html.erb +++ b/src/supermarket/app/views/layouts/application.html.erb @@ -70,6 +70,7 @@

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