diff --git a/app/helpers/effective_bootstrap_helper.rb b/app/helpers/effective_bootstrap_helper.rb index 2566684..3c6c791 100644 --- a/app/helpers/effective_bootstrap_helper.rb +++ b/app/helpers/effective_bootstrap_helper.rb @@ -98,11 +98,11 @@ def clipboard_copy(text, opts = {}) label = (icon('clipboard', class: 'small-1') + ' ' + opts[:label]).html_safe content_tag( - :button, - label, - class: ['btn-clipboard-copy', opts[:class]].compact.join(' '), - type: 'button', - 'data-clipboard': text, + :button, + label, + class: ['btn-clipboard-copy', opts[:class]].compact.join(' '), + type: 'button', + 'data-clipboard': text, 'data-clipboard-label': label ) end @@ -163,13 +163,13 @@ def collapse(label, opts = {}, &block) link_class += ' collapsed' unless show # Figure out all the button / link options - link_opts = { - 'data-toggle': 'collapse', - role: 'button', - href: "##{id}", - 'aria-controls': "##{id}", - 'aria-expanded': show, - class: link_class + link_opts = { + 'data-toggle': 'collapse', + role: 'button', + href: "##{id}", + 'aria-controls': "##{id}", + 'aria-expanded': show, + class: link_class }.merge(opts) # Normal collapse @@ -697,14 +697,14 @@ def vertical_tabs(active: nil, unique: false, list: {}, content: {}, &block) @_tab_active = (active || :first) @_tab_unique = effective_bootstrap_unique_id if unique - content_tag(:div, class: 'row border') do - content_tag(:div, class: 'col-3 border-right') do + content_tag(:div, class: 'row') do + content_tag(:div, class: 'col-3') do content_tag(:div, {class: 'nav flex-column nav-pills my-2', role: 'tablist', 'aria-orientation': :vertical}.merge(list)) do yield # Yield to tab the first time end end + content_tag(:div, class: 'col-9') do - content_tag(:div, {class: 'tab-content my-2'}.merge(content)) do + content_tag(:div, {class: 'tab-content border'}.merge(content)) do @_tab_mode = :content @_tab_active = (active || :first) yield # Yield to tab the second time