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.

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

SVG images #2995

Merged
merged 3 commits into from
Dec 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ combine it with your own custom frontend, admin interface, and API.

Try out Solidus with one-click on Heroku:

[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/solidusio/solidus)
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/solidusio/solidus)

## Getting started

Expand Down
18 changes: 18 additions & 0 deletions core/app/assets/images/logo/solidus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Spree.config do |config|
# Frontend:

# Custom logo for the frontend
# config.logo = "logo/solidus_logo.png"
# config.logo = "logo/solidus.svg"

# Template to use when rendering layout
# config.layout = "spree/layouts/spree_application"
Expand All @@ -31,7 +31,7 @@ Spree.config do |config|
# Admin:

# Custom logo for the admin
# config.admin_interface_logo = "logo/solidus_logo.png"
# config.admin_interface_logo = "logo/solidus.svg"

# Gateway credentials can be configured statically here and referenced from
# the admin. They can also be fully configured from the admin.
Expand Down
8 changes: 4 additions & 4 deletions core/lib/spree/app_configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ class AppConfiguration < Preferences::Configuration
preference :address_requires_state, :boolean, default: true

# @!attribute [rw] admin_interface_logo
# @return [String] URL of logo used in admin (default: +'logo/solidus_logo.png'+)
preference :admin_interface_logo, :string, default: 'logo/solidus_logo.png'
# @return [String] URL of logo used in admin (default: +'logo/solidus.svg'+)
preference :admin_interface_logo, :string, default: 'logo/solidus.svg'

# @!attribute [rw] admin_products_per_page
# @return [Integer] Number of products to display in admin (default: +10+)
Expand Down Expand Up @@ -142,8 +142,8 @@ class AppConfiguration < Preferences::Configuration
preference :layout, :string, default: 'spree/layouts/spree_application'

# @!attribute [rw] logo
# @return [String] URL of logo used on frontend (default: +'logo/solidus_logo.png'+)
preference :logo, :string, default: 'logo/solidus_logo.png'
# @return [String] URL of logo used on frontend (default: +'logo/solidus.svg'+)
preference :logo, :string, default: 'logo/solidus.svg'

# @!attribute [rw] order_bill_address_used
# @return [Boolean] Use the order's bill address, as opposed to storing
Expand Down
Binary file modified frontend/app/assets/images/favicon.ico
Binary file not shown.
2 changes: 1 addition & 1 deletion guides/source/developers/views/custom-frontend.html.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ initialize your own values for the following `Spree::Config` settings:
`solidus_frontend` gem.
- `:logo`: Specifies a file in your `/app/assets/images` to be used as the logo
on the storefront. You can access the logo from any view using the `<%= logo
%>` variable. The default value is `logo/solidus_logo.png`
%>` variable. The default value is `logo/solidus.svg`
- `:products_per_page`: Sets the amount of products that should be displayed on
a single page. The default value is `12`.

Expand Down