diff options
| author | Scott Hampton <shampton@gitlab.com> | 2019-07-11 13:06:09 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-11 13:06:09 +0300 |
| commit | d97032ca0aa52caba9f436a14eaae57b6ef41379 (patch) | |
| tree | 964c12c8c9384528eda7851c094a2f6e2bb1bb36 /app/helpers/dropdowns_helper.rb | |
| parent | 2d5b47a708172f5f048f84c6d27f87f860423206 (diff) | |
Bring buttons style up to design spec
This is a CSS effort only.
Fixes the padding of the buttons to be `8px 12px`
(including border) so that the button height is
32px.
Also adjusts the border width for all buttons when
the state is `hover`, `focus`, or `active to be 2px
thick instead of 1px thick. This is accomplished
through an inset box-shadow as not to increase
the size of the button.
Fixes some colors for primary and tertiary buttons.
Diffstat (limited to 'app/helpers/dropdowns_helper.rb')
| -rw-r--r-- | app/helpers/dropdowns_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/dropdowns_helper.rb b/app/helpers/dropdowns_helper.rb index 64c5fae7d96..fd94f07cc2c 100644 --- a/app/helpers/dropdowns_helper.rb +++ b/app/helpers/dropdowns_helper.rb @@ -46,7 +46,7 @@ module DropdownsHelper def dropdown_toggle(toggle_text, data_attr, options = {}) default_label = data_attr[:default_label] - content_tag(:button, disabled: options[:disabled], class: "dropdown-menu-toggle #{options[:toggle_class] if options.key?(:toggle_class)}", id: (options[:id] if options.key?(:id)), type: "button", data: data_attr) do + content_tag(:button, disabled: options[:disabled], class: "dropdown-menu-toggle btn #{options[:toggle_class] if options.key?(:toggle_class)}", id: (options[:id] if options.key?(:id)), type: "button", data: data_attr) do output = content_tag(:span, toggle_text, class: "dropdown-toggle-text #{'is-default' if toggle_text == default_label}") output << icon('chevron-down') output.html_safe |