diff --git a/app/assets/images/lightning.svg b/app/assets/images/lightning.svg index 69436102c..65331aea7 100644 --- a/app/assets/images/lightning.svg +++ b/app/assets/images/lightning.svg @@ -1,3 +1 @@ - - - + diff --git a/app/assets/images/stack.svg b/app/assets/images/stack.svg index 419b82bc1..fb610b093 100644 --- a/app/assets/images/stack.svg +++ b/app/assets/images/stack.svg @@ -1,3 +1 @@ - - - + diff --git a/app/assets/stylesheets/articles.scss b/app/assets/stylesheets/articles.scss index 97bc50af0..48bb986b6 100644 --- a/app/assets/stylesheets/articles.scss +++ b/app/assets/stylesheets/articles.scss @@ -331,6 +331,11 @@ } } +.nav-icon { + width: 24px; + height: 24px; +} + // Loading // TODO .loading { padding: calc(3vw + 15px) 0px 60px; diff --git a/app/controllers/internal/configs_controller.rb b/app/controllers/internal/configs_controller.rb index af2eb9094..05b2d1cce 100644 --- a/app/controllers/internal/configs_controller.rb +++ b/app/controllers/internal/configs_controller.rb @@ -131,6 +131,8 @@ class Internal::ConfigsController < Internal::ApplicationController logo_svg main_social_image secondary_logo_url + left_navbar_svg_icon + right_navbar_svg_icon ] end diff --git a/app/models/site_config.rb b/app/models/site_config.rb index bdd744e19..1bdf45550 100644 --- a/app/models/site_config.rb +++ b/app/models/site_config.rb @@ -11,6 +11,9 @@ class SiteConfig < RailsSettings::Base # the cache, or call SiteConfig.clear_cache cache_prefix { "v1" } + STACK_ICON = File.read(Rails.root.join("app/assets/images/stack.svg")).freeze + LIGHTNING_ICON = File.read(Rails.root.join("app/assets/images/lightning.svg")).freeze + # API Tokens field :health_check_token, type: :string @@ -59,6 +62,9 @@ class SiteConfig < RailsSettings::Base field :logo_svg, type: :string field :secondary_logo_url, type: :string + field :left_navbar_svg_icon, type: :string, default: STACK_ICON + field :right_navbar_svg_icon, type: :string, default: LIGHTNING_ICON + # Mascot field :mascot_user_id, type: :integer, default: 1 field :mascot_image_url, type: :string diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb index aa00bffde..e5b84f56c 100644 --- a/app/views/articles/index.html.erb +++ b/app/views/articles/index.html.erb @@ -42,7 +42,9 @@

Posts

@@ -68,7 +70,9 @@
diff --git a/app/views/articles/tag_index.html.erb b/app/views/articles/tag_index.html.erb index db2ce1cc3..f2c7b9402 100644 --- a/app/views/articles/tag_index.html.erb +++ b/app/views/articles/tag_index.html.erb @@ -39,7 +39,9 @@
<% if user_signed_in? %>
@@ -71,7 +73,9 @@ <% end %>
diff --git a/app/views/internal/configs/show.html.erb b/app/views/internal/configs/show.html.erb index 6dc49c656..2bc0086f5 100644 --- a/app/views/internal/configs/show.html.erb +++ b/app/views/internal/configs/show.html.erb @@ -324,6 +324,7 @@
Used as the site favicon
favicon
+
<%= internal_config_label :logo_png %> <%= f.text_field :logo_png, @@ -335,6 +336,7 @@ <% end %>
+
<%= internal_config_label :logo_svg %> <%= f.text_area :logo_svg, @@ -348,15 +350,39 @@ <% end %>
- <%= internal_config_label :secondary_logo_url %> - <%= f.text_field :secondary_logo_url, - class: "form-control", - value: SiteConfig.secondary_logo_url, - placeholder: "https://image.url" %> -
Used as the primary sticker image
- <% if SiteConfig.secondary_logo_url.present? %> - secondary logo image - <% end %> +
+ <%= internal_config_label :secondary_logo_url %> + <%= f.text_field :secondary_logo_url, + class: "form-control", + value: SiteConfig.secondary_logo_url, + placeholder: "https://image.url" %> +
Used as the secondary logo
+ <% if SiteConfig.secondary_logo_url.present? %> + secondary logo image + <% end %> +
+ +
+ <%= internal_config_label :left_navbar_svg_icon %> + <%= f.text_area :left_navbar_svg_icon, + class: "form-control", + value: SiteConfig.left_navbar_svg_icon, + rows: 6, + placeholder: "" %> +
The SVG icon used to expand the left navbar navigation menu. Should be a max of 24x24px.
+ <%= SiteConfig.left_navbar_svg_icon.html_safe %> +
+ +
+ <%= internal_config_label :right_navbar_svg_icon %> + <%= f.text_area :right_navbar_svg_icon, + class: "form-control", + value: SiteConfig.right_navbar_svg_icon, + rows: 6, + placeholder: "" %> +
The SVG icon used to expand the right navbar navigation menu. Should be a max of 24x24px.
+ <%= SiteConfig.right_navbar_svg_icon.html_safe %> +
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index ef30526fe..a939c7d83 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -185,7 +185,9 @@