From 733f0b1562f78c7d9346309b4746e49dd85ef2f4 Mon Sep 17 00:00:00 2001 From: Sparsha Lamichhane Date: Sat, 20 Jan 2024 06:03:13 +0545 Subject: [PATCH] Add environment label to navbar (#1206) * Add environment label in secondary navbar * Move environment label to primary nav and fix its design * Use a globe and ensure visible regardless of viewport --------- Co-authored-by: Ben Sheldon [he/him] --- app/helpers/good_job/application_helper.rb | 5 ++-- app/views/good_job/shared/_navbar.erb | 24 ++++++++++++++++--- .../good_job/shared/icons/_globe.html.erb | 3 +++ 3 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 app/views/good_job/shared/icons/_globe.html.erb diff --git a/app/helpers/good_job/application_helper.rb b/app/helpers/good_job/application_helper.rb index 091b5bca8..fc65c1094 100644 --- a/app/helpers/good_job/application_helper.rb +++ b/app/helpers/good_job/application_helper.rb @@ -53,10 +53,11 @@ def status_icon(status, **options) content_tag :span, icon, **options end - def render_icon(name) + def render_icon(name, **options) # workaround to render svg icons without all of the log messages partial = lookup_context.find_template("good_job/shared/icons/#{name}", [], true) - partial.render(self, {}) + options[:class] = Array(options[:class]).join(" ") + partial.render(self, { class: options[:class] }) end def translate_hash(key, **options) diff --git a/app/views/good_job/shared/_navbar.erb b/app/views/good_job/shared/_navbar.erb index 447db2643..baf73d6ff 100644 --- a/app/views/good_job/shared/_navbar.erb +++ b/app/views/good_job/shared/_navbar.erb @@ -1,7 +1,15 @@