Skip to content

Design update for effective_cpd #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danajanssen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Design update for effective_cpd #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions app/helpers/effective_bootstrap_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down