diff --git a/app/assets/images/fizzy-logo.png b/app/assets/images/fizzy-logo.png new file mode 100644 index 000000000..84edfd23c Binary files /dev/null and b/app/assets/images/fizzy-logo.png differ diff --git a/app/assets/images/fizzy-logo.svg b/app/assets/images/fizzy-logo.svg deleted file mode 100644 index a586017f2..000000000 --- a/app/assets/images/fizzy-logo.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/assets/images/marker.svg b/app/assets/images/marker.svg new file mode 100644 index 000000000..473d91904 --- /dev/null +++ b/app/assets/images/marker.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/stylesheets/fizzy-menu.css b/app/assets/stylesheets/fizzy-menu.css index 77fa263ed..1835cb758 100644 --- a/app/assets/stylesheets/fizzy-menu.css +++ b/app/assets/stylesheets/fizzy-menu.css @@ -2,7 +2,7 @@ .input:is(.fizzy-menu-trigger) { --input-background: var(--color-canvas); --input-border-color: transparent; - --input-padding: 0.2em 2em 0.2em 0.9em; + --input-padding: 0.3em 2em 0.3em 1em; inline-size: auto; margin-block-start: 0.1em; @@ -21,6 +21,12 @@ } } + img { + block-size: auto; + inline-size: 1.5em; + margin-inline-end: 0.8ch; + } + svg { block-size: auto; inline-size: 1.1em; diff --git a/app/assets/stylesheets/icons.css b/app/assets/stylesheets/icons.css index c3eac00fd..305aa2087 100644 --- a/app/assets/stylesheets/icons.css +++ b/app/assets/stylesheets/icons.css @@ -57,7 +57,7 @@ .icon--lifebuoy { --svg: url("lifebuoy.svg "); } .icon--lock { --svg: url("lock.svg "); } .icon--logout { --svg: url("logout.svg "); } - .icon--logo-color { --svg: url("logo-color.svg "); mask-size: contain; } + .icon--marker { --svg: url("marker.svg "); } .icon--menu { --svg: url("menu.svg "); } .icon--menu-dots-horizontal { --svg: url("menu-dots-horizontal.svg "); } .icon--menu-dots-vertical { --svg: url("menu-dots-vertical.svg "); } diff --git a/app/views/filters/menu/_accounts.html.erb b/app/views/filters/menu/_accounts.html.erb index 001211a67..8d182ed3e 100644 --- a/app/views/filters/menu/_accounts.html.erb +++ b/app/views/filters/menu/_accounts.html.erb @@ -1,5 +1,5 @@ <%= collapsible_nav_section "Accounts" do %> <% Current.user.identity.memberships.where.not(user_tenant: Current.user.tenant).each do |membership| %> - <%= filter_place_menu_item root_url(script_name: "/#{membership.user_tenant}"), "#{membership.account_name}", "logo-color", new_window: true %> + <%= filter_place_menu_item root_url(script_name: "/#{membership.user_tenant}"), "#{membership.account_name}", "marker", new_window: true %> <% end %> <% end %> diff --git a/app/views/filters/menu/_button.html.erb b/app/views/filters/menu/_button.html.erb index c1bec55fa..b92421955 100644 --- a/app/views/filters/menu/_button.html.erb +++ b/app/views/filters/menu/_button.html.erb @@ -2,6 +2,6 @@ data: { action: "click->dialog#open:stop keydown.j@document->hotkey#click keydown.meta+j@document->hotkey#click keydown.ctrl+j@document->hotkey#click", controller: "hotkey" } do %> - <%= inline_svg "fizzy-logo" %> + <%= image_tag "fizzy-logo.png" %> <%= Current.user.identity.memberships.many? ? Account.sole.name : "Fizzy" %> <% end %> diff --git a/app/views/layouts/error.html.erb b/app/views/layouts/error.html.erb index a8775c64f..3e49681bb 100644 --- a/app/views/layouts/error.html.erb +++ b/app/views/layouts/error.html.erb @@ -156,7 +156,7 @@ <%= yield %> diff --git a/app/views/layouts/public.html.erb b/app/views/layouts/public.html.erb index de0638e15..0df344476 100644 --- a/app/views/layouts/public.html.erb +++ b/app/views/layouts/public.html.erb @@ -13,20 +13,8 @@ diff --git a/app/views/layouts/shared/_head.html.erb b/app/views/layouts/shared/_head.html.erb index 4c88b0190..8e96ff3bf 100644 --- a/app/views/layouts/shared/_head.html.erb +++ b/app/views/layouts/shared/_head.html.erb @@ -25,7 +25,6 @@ <% if ApplicationRecord.current_tenant %> <% end %> - diff --git a/public/app-icon-192-maskable.png b/public/app-icon-192-maskable.png index 2f886f08d..f04b8732a 100644 Binary files a/public/app-icon-192-maskable.png and b/public/app-icon-192-maskable.png differ diff --git a/public/app-icon-192.png b/public/app-icon-192.png index 897e8b9cd..f04b8732a 100644 Binary files a/public/app-icon-192.png and b/public/app-icon-192.png differ diff --git a/public/app-icon.png b/public/app-icon.png index eea1febe0..e4f1e432d 100644 Binary files a/public/app-icon.png and b/public/app-icon.png differ diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png index 1b90abee0..0a9a3590a 100644 Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ diff --git a/public/favicon.ico b/public/favicon.ico index 10fc9cd18..490847dbc 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/favicon.png b/public/favicon.png index 24eb87134..29e681c8d 100644 Binary files a/public/favicon.png and b/public/favicon.png differ diff --git a/public/favicon.svg b/public/favicon.svg deleted file mode 100644 index 463aaaebd..000000000 --- a/public/favicon.svg +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file