diff --git a/Gemfile b/Gemfile index 1e97ee8d..f04ce847 100644 --- a/Gemfile +++ b/Gemfile @@ -52,6 +52,7 @@ gem 'activeadmin', github: 'activeadmin' # Markdown display gem 'redcarpet' +gem 'flag-icons-rails' gem 'geocoder' # Tiny MCE integration diff --git a/Gemfile.lock b/Gemfile.lock index 7bfb8382..6ab63774 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,6 +124,8 @@ GEM faraday (0.11.0) multipart-post (>= 1.2, < 3) ffi (1.9.18) + flag-icons-rails (1.1.2) + sass (~> 3.2) font-awesome-sass (4.7.0) sass (>= 3.2) formatador (0.2.5) @@ -439,6 +441,7 @@ DEPENDENCIES devise-i18n differ email_validator + flag-icons-rails font-awesome-sass geocoder guard-brakeman diff --git a/app/assets/images/regions/BE.png b/app/assets/images/regions/BE.png deleted file mode 100644 index 2906bd0e..00000000 Binary files a/app/assets/images/regions/BE.png and /dev/null differ diff --git a/app/assets/images/regions/BR.png b/app/assets/images/regions/BR.png deleted file mode 100644 index fc6f9378..00000000 Binary files a/app/assets/images/regions/BR.png and /dev/null differ diff --git a/app/assets/images/regions/CH.png b/app/assets/images/regions/CH.png deleted file mode 100644 index 187121e0..00000000 Binary files a/app/assets/images/regions/CH.png and /dev/null differ diff --git a/app/assets/images/regions/FR.png b/app/assets/images/regions/FR.png deleted file mode 100644 index a79ab94c..00000000 Binary files a/app/assets/images/regions/FR.png and /dev/null differ diff --git a/app/assets/stylesheets/application.sass b/app/assets/stylesheets/application.sass index e2648588..30b1167d 100644 --- a/app/assets/stylesheets/application.sass +++ b/app/assets/stylesheets/application.sass @@ -12,6 +12,7 @@ * *= require jquery-ui *= require jquery.tagsinput + *= require flag-icon *= require frTypo *= require_tree . */ diff --git a/app/assets/stylesheets/orgas.sass b/app/assets/stylesheets/orgas.sass index 6a1080fe..4f7cab83 100644 --- a/app/assets/stylesheets/orgas.sass +++ b/app/assets/stylesheets/orgas.sass @@ -15,18 +15,19 @@ form#orga_search em.fa color: #258 input + width: 14em border: solid thin #258 + padding: 0 margin-left: -1.5em - margin-right: -1.6em + margin-right: -1.3em padding-left: 1.5em padding-right: 1.2em - background-color: transparent - width: 14em button.search color: #258 border: none padding: 0 + font-size: large box-shadow: none margin-top: -0.1em margin-left: 0 diff --git a/app/assets/stylesheets/region.sass b/app/assets/stylesheets/region.sass index 8b828dca..d2d34f6e 100644 --- a/app/assets/stylesheets/region.sass +++ b/app/assets/stylesheets/region.sass @@ -1,5 +1,6 @@ .region_selector float: right + font-size: smaller & > ul > li float: left ul @@ -26,6 +27,10 @@ &:hover ul box-shadow: 0 4px 4px gray +// Override for the missing quebec flag! +.flag-icon-ca-qc + background-image: url(regions/CA-QC.png) + body.stats h3 text-align: center diff --git a/app/views/regions/_region.haml b/app/views/regions/_region.haml index 995a6dcb..aee885bc 100644 --- a/app/views/regions/_region.haml +++ b/app/views/regions/_region.haml @@ -5,7 +5,7 @@ %li{ class: selected ? 'selected' : '' } - if region.url.present? = link_to region.url do - = image_tag "regions/#{region.code}.png" if region.code.present? + = flag_icon region.code.try :downcase = region.name - if regions.present? %em.fa.fa-chevron-down