diff --git a/app/assets/stylesheets/bioportal.scss b/app/assets/stylesheets/bioportal.scss index 453ca30a01..c3ccdf04f0 100644 --- a/app/assets/stylesheets/bioportal.scss +++ b/app/assets/stylesheets/bioportal.scss @@ -1162,3 +1162,7 @@ turbo-frame[busy] .hide-if-loading, .show-if-loading { turbo-frame[busy] ~ .show-if-loading { display: inline-block; } + +.hide{ + display:none; +} \ No newline at end of file diff --git a/app/assets/stylesheets/components/progress_pages.scss b/app/assets/stylesheets/components/progress_pages.scss index 83e4300106..6e3f6cff5c 100644 --- a/app/assets/stylesheets/components/progress_pages.scss +++ b/app/assets/stylesheets/components/progress_pages.scss @@ -31,12 +31,14 @@ .progress-pages-container .progress-item:first-of-type { & > div { align-items: start; + left: 0; } } .progress-pages-container .progress-item:last-of-type { & > div { align-items: end; + left: -23px; } } @@ -69,7 +71,7 @@ .outlined-checked-circle { border: 2px solid var(--primary-color) !important; - background-color: var(--primary-color); + background-color: var(--primary-color) !important; display: flex; align-items: center; justify-content: center; diff --git a/app/components/buttons/regular_button_component.rb b/app/components/buttons/regular_button_component.rb index 32c451baeb..c40a9f67b0 100644 --- a/app/components/buttons/regular_button_component.rb +++ b/app/components/buttons/regular_button_component.rb @@ -14,7 +14,9 @@ def initialize(id: , value:, variant: "primary", color: "normal", href: "", size end def button_label - content_tag(:span, icon_left, class: "#{@variant}-button-icon left-button-icon") + @value + content_tag(:span, icon_right, class: "#{@variant}-button-icon right-button-icon") + hide_icon_left = icon_left == nil ? "hide" : " " + hide_icon_right = icon_right == nil ? "hide" : " " + content_tag(:span, icon_left, class: "#{@variant}-button-icon left-button-icon #{hide_icon_left}") + @value + content_tag(:span, icon_right, class: "#{@variant}-button-icon right-button-icon #{hide_icon_right}") end def button_elem diff --git a/app/components/buttons/regular_button_component/regular_button_component.html.haml b/app/components/buttons/regular_button_component/regular_button_component.html.haml index fc07f4446b..17c8f3c422 100644 --- a/app/components/buttons/regular_button_component/regular_button_component.html.haml +++ b/app/components/buttons/regular_button_component/regular_button_component.html.haml @@ -1,7 +1,3 @@ -- slim_class = @size == "slim" ? "slim " : " " -- danger_class = @color == "danger" ? "danger-button " : " " -- warning_class = @color == "warning" ? "warning-button " : " " -- disabled_class = @state == "disabled" ? "disabled-button " : " " .button-container = button_elem diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bf89869410..396f688839 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -34,7 +34,7 @@ def omniauth_providers_info end def omniauth_provider_info(strategy) - omniauth_providers_info.select {|k,v| v[:strategy].eql?(strategy.to_sym)} + omniauth_providers_info.select {|k,v| v[:strategy].eql?(strategy.to_sym) || k.eql?(strategy)} end def omniauth_token_provider(strategy) diff --git a/test/components/previews/buttons/regular_button_component_preview.rb b/test/components/previews/buttons/regular_button_component_preview.rb index 0b17bfa9e5..a5bc14d771 100644 --- a/test/components/previews/buttons/regular_button_component_preview.rb +++ b/test/components/previews/buttons/regular_button_component_preview.rb @@ -36,37 +36,7 @@ def disabled def no_animation render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", variant: "primary", state: "regular") end - - def slim - def slim() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", size: "slim") - end - end - - def danger - def danger() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", color: "danger") - end - end - - def warning - def warning() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", color: "warning") - end - end - - def disabled - def disabled() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", state: "disabled") - end - end - - def no_animation - def no_animation() - render Buttons::RegularButtonComponent.new(value: "Login", name: "login", type: "regular", variant: "primary", state: "regular") - end - end - + def icon_left render Buttons::RegularButtonComponent.new(id:'regular-button', value: "Login", variant: "primary") do |btn| btn.icon_left do diff --git a/test/components/previews/layout/progress_pages_component_preview.rb b/test/components/previews/layout/progress_pages_component_preview.rb index f961e85e9f..afb6596de1 100644 --- a/test/components/previews/layout/progress_pages_component_preview.rb +++ b/test/components/previews/layout/progress_pages_component_preview.rb @@ -5,7 +5,7 @@ class Layout::ProgressPagesComponentPreview < ViewComponent::Preview # @param pages_count number def default(pages_count: 5) render Layout::ProgressPagesComponent.new(pages_title: (pages_count || 0).times.map { |x| "page #{x}" }) do |c| - 5.times.each { |i| c.page { content_tag(:div, "page #{i}", class: "p-5 mx-5") } } + 5.times.each { |i| c.page { content_tag(:div, "page #{i}", class: "p-5 mx-5 text-center", style: 'width: 500px') } } end end end