Commit 50a3866b authored by Chrysanthi Lagodimou's avatar Chrysanthi Lagodimou

Merge branch 'Fixes/Missing-excel-icon' into 'develop'

Fixes/missing excel icon

See merge request !893
parents 89d059d5 fefa9e0b
Pipeline #32894 passed with stage
in 35 minutes and 27 seconds
......@@ -27,7 +27,6 @@ gem 'country_select'
gem 'devise'
gem 'devise-i18n'
gem 'devise_invitable'
gem 'font-awesome-sass'
gem 'i18n_data'
gem 'i18n_rails_helpers'
gem 'jbuilder'
......
......@@ -183,8 +183,6 @@ GEM
railties (>= 3.0.0)
ffaker (2.9.0)
ffi (1.9.25)
font-awesome-sass (5.3.1)
sassc (>= 1.11)
globalid (0.4.1)
activesupport (>= 4.2.0)
hashery (2.1.2)
......@@ -471,7 +469,6 @@ DEPENDENCIES
devise_invitable
factory_bot_rails
ffaker
font-awesome-sass
i18n_data
i18n_rails_helpers
i18n_yaml_sorter
......
......@@ -3,8 +3,6 @@
@import 'inplace_fields';
@import 'bootstrap-datepicker3';
@import 'font-awesome-sprockets';
@import 'font-awesome';
@import 'jquery-ui/core';
@import 'jquery-ui/autocomplete';
@import 'jquery-ui/theme';
......
......@@ -17,7 +17,7 @@ module NavigationAndButtonHelper
billing_expenses: { text: 'Spesen', icon_type: 'usd' },
assignment: { text: 'Begleitung', icon_type: 'user' },
certificate: { text: 'Nachweis', icon_type: 'education' },
xlsx: { text: 'Excel herunterladen', type: :fa, icon_type: 'file-excel-o' },
xlsx: { text: 'Excel herunterladen', icon_type: 'file' },
truthy: { text: 'true', icon_type: :ok, extra_class: 'text-success' },
falsy: { text: 'false', icon_type: :remove, extra_class: 'text-danger' }
}.freeze
......
......@@ -12,7 +12,7 @@ nav.navbar.section-navigation
- if policy(Volunteer).superadmin_privileges?
li= button_link t('seeking_clients'), seeking_clients_volunteers_url, dimension: 'sm'
= boolean_toggler_filter_dropdown(:intro_course, 'Einführungskurs', 'Besucht', 'Ausstehend')
li= button_link t_attr(:waive_alternative), url_for(format: :xlsx, q: search_parameters), dimension: 'sm'
li= button_link icon_span(:xlsx), url_for(format: :xlsx, q: search_parameters), dimension: 'sm'
hr
......@@ -30,4 +30,3 @@ nav.navbar.section-navigation
hr
= render 'columns', volunteers: @volunteers
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment