diff options
| author | Scott Hampton <shampton@gitlab.com> | 2019-07-11 10:06:09 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-07-11 10:06:09 +0000 |
| commit | d97032ca0aa52caba9f436a14eaae57b6ef41379 (patch) | |
| tree | 964c12c8c9384528eda7851c094a2f6e2bb1bb36 /app/views | |
| parent | 2d5b47a708172f5f048f84c6d27f87f860423206 (diff) | |
| download | gitlab-ce-d97032ca0aa52caba9f436a14eaae57b6ef41379.tar.gz | |
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/views')
| -rw-r--r-- | app/views/projects/issues/import_csv/_button.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_feed_buttons.html.haml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/projects/issues/import_csv/_button.html.haml b/app/views/projects/issues/import_csv/_button.html.haml index acc2c50294f..8442a53ed61 100644 --- a/app/views/projects/issues/import_csv/_button.html.haml +++ b/app/views/projects/issues/import_csv/_button.html.haml @@ -1,6 +1,6 @@ - type = local_assigns.fetch(:type, :icon) -%button.csv-import-button.btn{ title: _('Import CSV'), class: ('has-tooltip' if type == :icon), +%button.csv-import-button.btn.btn-svg{ title: _('Import CSV'), class: ('has-tooltip' if type == :icon), data: { toggle: 'modal', target: '.issues-import-modal' } } - if type == :icon = sprite_icon('upload') diff --git a/app/views/shared/issuable/_feed_buttons.html.haml b/app/views/shared/issuable/_feed_buttons.html.haml index 83f60fa6fe2..c9506a3295c 100644 --- a/app/views/shared/issuable/_feed_buttons.html.haml +++ b/app/views/shared/issuable/_feed_buttons.html.haml @@ -1,4 +1,4 @@ -= link_to safe_params.merge(rss_url_options), class: 'btn has-tooltip', data: { container: 'body' }, title: _('Subscribe to RSS feed') do - = icon('rss') -= link_to safe_params.merge(calendar_url_options), class: 'btn has-tooltip', data: { container: 'body' }, title: _('Subscribe to calendar') do - = custom_icon('icon_calendar') += link_to safe_params.merge(rss_url_options), class: 'btn btn-svg has-tooltip js-rss-button', data: { container: 'body' }, title: _('Subscribe to RSS feed') do + = sprite_icon('rss') += link_to safe_params.merge(calendar_url_options), class: 'btn btn-svg has-tooltip', data: { container: 'body' }, title: _('Subscribe to calendar') do + = sprite_icon('calendar') |