Bundle update, including a big upgrade to font awesome 5

remotes/origin/master
echarp 5 years ago
parent e624bcf375
commit 3d338b3018
  1. 49
      Gemfile.lock
  2. 61
      app/assets/stylesheets/form.sass
  3. 2
      app/views/events/_form.html.haml
  4. 2
      app/views/events/show.html.haml
  5. 4
      app/views/layouts/application.html.haml
  6. 2
      app/views/pages/filter.haml
  7. 4
      app/views/regions/_filter_region.haml
  8. 2
      app/views/stats/index.html.haml
  9. 6
      config/locales/views/en.yml
  10. 6
      config/locales/views/fr.yml
  11. 6
      config/locales/views/pt-BR.yml

@ -60,7 +60,7 @@ GEM
arbre (1.1.1)
activesupport (>= 3.0.0)
arel (8.0.0)
ast (2.3.0)
ast (2.4.0)
bcrypt (3.1.11)
bindex (0.5.0)
brakeman (4.1.1)
@ -69,7 +69,7 @@ GEM
bundler-audit (0.6.0)
bundler (~> 1.2)
thor (~> 0.18)
byebug (9.1.0)
byebug (10.0.0)
capybara (2.17.0)
addressable
mini_mime (>= 0.1.3)
@ -89,13 +89,13 @@ GEM
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
crass (1.0.3)
devise (4.4.0)
devise (4.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.2)
responders
warden (~> 1.2.3)
devise-i18n (1.5.0)
devise-i18n (1.5.1)
devise (>= 3.4)
differ (0.1.2)
domain_name (0.5.20170404)
@ -110,10 +110,10 @@ GEM
erubis (2.7.0)
eventmachine (1.2.5)
execjs (2.7.0)
ffi (1.9.18)
ffi (1.9.21)
flag-icons-rails (2.5.0)
sass (~> 3.2)
font-awesome-sass (4.7.0)
font-awesome-sass (5.0.6.2)
sass (>= 3.2)
formatador (0.2.5)
formtastic (3.1.5)
@ -191,7 +191,7 @@ GEM
http-form_data (2.0.0)
http_accept_language (2.1.1)
http_parser.rb (0.6.0)
i18n (0.9.1)
i18n (0.9.4)
concurrent-ruby (~> 1.0)
i18n-active_record (0.2.2)
i18n (>= 0.5.0)
@ -210,7 +210,6 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (1.8.6)
kaminari (1.1.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.1.1)
@ -237,12 +236,12 @@ GEM
mini_mime (>= 0.1.1)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
meta-tags (2.7.0)
meta-tags (2.7.1)
actionpack (>= 3.2.0, < 5.3)
method_source (0.9.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.1)
minitest (5.11.3)
modernizr-rails (2.7.1)
multi_json (1.13.1)
multipart-post (2.0.0)
@ -250,7 +249,8 @@ GEM
naught (1.1.0)
nenv (0.3.0)
nio4r (2.2.0)
nokogiri (1.8.1)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
notiffany (0.1.1)
nenv (~> 0.1)
shellany (~> 0.0)
@ -265,7 +265,7 @@ GEM
actionpack
activesupport
rails (>= 3.0.0)
polyamorous (1.3.2)
polyamorous (1.3.3)
activerecord (>= 3.0)
powerpack (0.1.1)
pry (0.11.3)
@ -273,7 +273,7 @@ GEM
method_source (~> 0.9.0)
public_suffix (3.0.1)
puma (3.11.2)
rack (2.0.3)
rack (2.0.4)
rack-livereload (0.3.16)
rack
rack-test (0.8.2)
@ -314,16 +314,16 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (12.3.0)
ransack (1.8.4)
ransack (1.8.7)
actionpack (>= 3.0)
activerecord (>= 3.0)
activesupport (>= 3.0)
i18n
polyamorous (~> 1.3)
polyamorous (~> 1.3.2)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdoc (4.3.0)
rdoc (6.0.1)
ref (2.0.0)
request_store (1.4.0)
rack (>= 1.4)
@ -353,12 +353,11 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
selenium-webdriver (3.8.0)
sdoc (1.0.0)
rdoc (>= 5.0)
selenium-webdriver (3.9.0)
childprocess (~> 0.5)
rubyzip (~> 1.0)
rubyzip (~> 1.2)
sexp_processor (4.10.0)
shellany (0.0.1)
simple_calendar (2.2.7)
@ -389,7 +388,7 @@ GEM
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
tinymce-rails (4.7.4)
tinymce-rails (4.7.6)
railties (>= 3.1.1)
tinymce-rails-langs (4.20180103)
tinymce-rails (~> 4.1, >= 4.1.10)
@ -407,13 +406,13 @@ GEM
multipart-post (~> 2.0)
naught (~> 1.0)
simple_oauth (~> 0.3.0)
tzinfo (1.2.4)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.3)
uglifier (4.1.6)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.4)
unf_ext (0.0.7.5)
unicode-display_width (1.3.0)
warden (1.2.7)
rack (>= 1.0)

@ -115,66 +115,67 @@ input, textarea, select, a.button, .actions > button, .mce-tinymce, div.tagsinpu
color: darkred
content: '*'
font-size: smaller
margin-left: 0.4em
& > label:before, & .field_with_errors > label:before, th:before, th a:before
margin-right: 0.4em
+fa-icon()
@extend .fa
&.login label:before
content: $fa-var-sign-in
content: fa-content($fa-var-sign-in-alt)
&.password label:before
content: $fa-var-unlock
content: fa-content($fa-var-unlock)
&.title label:before
content: $fa-var-newspaper-o
content: fa-content($fa-var-newspaper)
&.start_time label:before
content: $fa-var-toggle-on
content: fa-content($fa-var-toggle-on)
&.end_time label:before
content: $fa-var-toggle-off
content: fa-content($fa-var-toggle-off)
&.repeat label:before
content: $fa-var-repeat
content: fa-content($fa-var-redo)
&.rule > label:before
content: $fa-var-calculator
content: fa-content($fa-var-calculator)
&.description label:before
content: $fa-var-pencil-square-o
content: fa-content($fa-var-edit)
&.place_name label:before
content: $fa-var-map-pin
content: fa-content($fa-var-map-pin)
&.address label:before
content: $fa-var-map-marker
content: fa-content($fa-var-map-marker)
&.city label:before, th.city a:before
content: $fa-var-building-o
content: fa-content($fa-var-building)
&.department label:before, th.department a:before
content: $fa-var-puzzle-piece
content: fa-content($fa-var-puzzle-piece)
&.region > label:before, th.region a:before
content: $fa-var-shield
content: fa-content($fa-var-shield-alt)
&.locality > label:before
content: $fa-var-expand
content: fa-content($fa-var-expand)
&.contact label:before
content: $fa-var-envelope
content: fa-content($fa-var-envelope)
&.submitter label:before
content: $fa-var-envelope-o
content: fa-content($fa-var-envelope)
&.url label:before, th.url:before
content: $fa-var-external-link
content: fa-content($fa-var-external-link-alt)
&.diaspora label:before, th.diaspora:before
content: $fa-var-bullhorn
content: fa-content($fa-var-bullhorn)
&.tags label:before, th.tags a:before
content: $fa-var-tags
content: fa-content($fa-var-tags)
&.active label:before
content: $fa-var-heartbeat
content: fa-content($fa-var-heartbeat)
&.reason label:before
content: $fa-var-comment
content: fa-content($fa-var-comment)
&.kind > label:before, th.kind:before
content: $fa-var-cubes
content: fa-content($fa-var-cubes)
&.feed label:before, th.feed:before
content: $fa-var-rss
content: fa-content($fa-var-rss)
&.future label:before
content: $fa-var-backward
content: fa-content($fa-var-backward)
&.period_year label:before
content: $fa-var-fast-backward
content: fa-content($fa-var-fast-backward)
&.period_week label:before
content: $fa-var-step-backward
content: fa-content($fa-var-step-backward)
&.near_location label:before
content: $fa-var-dot-circle-o
content: fa-content($fa-var-dot-circle)
&.near_distance label:before
content: $fa-var-arrows-h
content: fa-content($fa-var-arrows-alt-h)
&.iframe label:before
content: $fa-var-arrows-alt
content: fa-content($fa-var-arrows-alt)

@ -46,7 +46,7 @@
%span.radios
= f.radio_button :locality, 0
= f.label 'locality_0' do
%em.fa.fa-shield
%em.fa.fa-shield-alt
= t 'attributes.locality_0'
= f.radio_button :locality, 1
= f.label 'locality_1' do

@ -10,7 +10,7 @@
- if @event.locality?
%em.locality.fa.fa-globe{ title: t('attributes.locality_1') }
- else
%em.locality.fa.fa-shield{ title: t('attributes.locality_0') }
%em.locality.fa.fa-shield-alt{ title: t('attributes.locality_0') }
%em.city{ title: @event.full_address }= @event.city
= title @event.title

@ -34,7 +34,7 @@
%footer.bottom
%nav
= link_to new_event_path do
%em.fa.fa-pencil
%em.fa.fa-pencil-alt
= t '.propose'
= link_to new_orga_path do
%em.fa.fa-users
@ -50,7 +50,7 @@
%em.fa.fa-users
= Orga.model_name.human.pluralize
= link_to versions_path do
%em.fa.fa-exchange
%em.fa.fa-history
= t 'versions.index.title'
= link_to page_path('infos') do
%em.fa.fa-info

@ -61,7 +61,7 @@
= t '.rss'
= button_tag formaction: events_url(format: :ics) do
%em.fa.fa-calendar-check-o
%em.fa.fa-calendar-check
= t '.ics'
= button_tag formaction: events_url(format: :xml) do

@ -14,10 +14,10 @@
- if filter_region.code.present?
= flag_icon filter_region.code.downcase
- else
%em.fa.fa-shield
%em.fa.fa-shield-alt
= filter_region.name
- if session[:region] == filter_region.id
%em.fa.fa-close
%em.fa.fa-times
- elsif filter_region.regions.present?
%small
%em.fa.fa-chevron-down

@ -49,7 +49,7 @@
%td.sparkline{ colspan: @years.size }
%h3
%em.fa.fa-shield
%em.fa.fa-shield-alt
= t '.regional'
%table.list.dates

@ -29,7 +29,7 @@ en:
title: Hello,
events:
index:
calendar_in: This calendar in <em class='fa fa-rss'></em> %{rss}, <em class='fa fa-calendar-o'></em> %{webcal}/%{ical}
calendar_in: This calendar in <em class='fa fa-rss'></em> %{rss}, <em class='fa fa-calendar'></em> %{webcal}/%{ical}
nb_events: "%{count} events"
map: Map
filter: Advanced filter
@ -449,8 +449,8 @@ reason:
index:
title: Versions
create_html: <em class='fa fa-plus-circle'></em>
update_html: <em class='fa fa-exchange'></em>
destroy_html: <em class='fa fa-trash'></em>
update_html: <em class='fa fa-exchange-alt'></em>
destroy_html: <em class='fa fa-trash-alt'></em>
feed: RSS feed
pages:

@ -29,7 +29,7 @@ fr:
title: Bonjour,
events:
index:
calendar_in: Ce calendrier en <em class='fa fa-rss'></em> %{rss}, <em class='fa fa-calendar-o'></em> %{webcal}/%{ical}
calendar_in: Ce calendrier en <em class='fa fa-rss'></em> %{rss}, <em class='fa fa-calendar'></em> %{webcal}/%{ical}
nb_events: "%{count} événements"
map: Carte
filter: Filtrage avancé
@ -466,8 +466,8 @@ pouvez éditer votre événement à l'adresse:"
index:
title: Versions
create_html: <em class='fa fa-plus-circle'></em>
update_html: <em class='fa fa-exchange'></em>
destroy_html: <em class='fa fa-trash'></em>
update_html: <em class='fa fa-exchange-alt'></em>
destroy_html: <em class='fa fa-trash-alt'></em>
feed: Flux RSS
pages:

@ -29,7 +29,7 @@ pt-BR:
title: Olá,
events:
index:
calendar_in: Este calendário em <em class='fa fa-rss'></em> %{rss}, <em class='fa fa-calendar-o'></em> %{webcal}/%{ical}
calendar_in: Este calendário em <em class='fa fa-rss'></em> %{rss}, <em class='fa fa-calendar'></em> %{webcal}/%{ical}
nb_events: "%{count} eventos"
map: Mapa
filter: Busca avançada
@ -450,8 +450,8 @@ do evento no seguinte endereço:"
index:
title: Versões
create_html: <em class='fa fa-plus-circle'></em>
update_html: <em class='fa fa-exchange'></em>
destroy_html: <em class='fa fa-trash'></em>
update_html: <em class='fa fa-exchange-alt'></em>
destroy_html: <em class='fa fa-trash-alt'></em>
feed: feed RSS
pages:

Loading…
Cancel
Save