From cb5df5c2482dc679b841664089265f2aa069b811 Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Sat, 27 May 2017 13:28:03 +0200
Subject: [PATCH] The country flags are all managed using the super
 flag-icons-rails gem.

The Quebec flag is a simple css declaration!
---
 Gemfile                                 |   1 +
 Gemfile.lock                            |   3 +++
 app/assets/images/regions/BE.png        | Bin 187 -> 0 bytes
 app/assets/images/regions/BR.png        | Bin 660 -> 0 bytes
 app/assets/images/regions/CH.png        | Bin 299 -> 0 bytes
 app/assets/images/regions/FR.png        | Bin 276 -> 0 bytes
 app/assets/stylesheets/application.sass |   1 +
 app/assets/stylesheets/orgas.sass       |   7 ++++---
 app/assets/stylesheets/region.sass      |   5 +++++
 app/views/regions/_region.haml          |   2 +-
 10 files changed, 15 insertions(+), 4 deletions(-)
 delete mode 100644 app/assets/images/regions/BE.png
 delete mode 100644 app/assets/images/regions/BR.png
 delete mode 100644 app/assets/images/regions/CH.png
 delete mode 100644 app/assets/images/regions/FR.png

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 2906bd0e68f7754be7f9dc5ce7b2f4bc82f74156..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^A|N&g8<1QX;1>s^7>k44ofy`glX(f`uqAoByD<C*
z!3BGlPX>x`7I;J!Gca%qgD@k*tT_@uLG}_)Usv{<+%jCc+M>TDIDkUdo-U3d7N?U_
z5)yu#Z(u#r+W9BKBC>OCV`HPB>m&Qa^=*gz?Iq3rK1oP8c;)yJhg5^C2P+yEv+;E_
ZG8BE`^04|GU<5RV!PC{xWt~$(697=}IPL%d

diff --git a/app/assets/images/regions/BR.png b/app/assets/images/regions/BR.png
deleted file mode 100644
index fc6f93787d62c23d660b6570018cba9955f4c69e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 660
zcmV;F0&D$=P)<h;3K|Lk000e1NJLTq000yK000dL1^@s6sZdT{00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;ROT~1~E$I*02Bo0wGC6
zK~y-)t&>YgRB;r>fB$>uUYQxanv*!j3_YgQ7#oU0#4-{rS``sdNG@t)R*PCh5VWsV
zZKPs?wjs2MS`<NrxzJE>w1)^f7UMKI>CNYOXYT#Cm?)!Eiq7&J&UYT)_X(o)lK&XW
zid88<3hIkz*lEmyqvUfdglpM~qp+sH;(GNcr-Kt%5<13xTzDJ8%;=yxf3cwy9Pv*u
zSQ~@Bb=0@Du<vXOX4eKr_V#izkXm+A*HREwaoFO?aHBHLLEkhN?;YaigI&0_3=8u)
zdSXEycZYa-t%DQ(G*^b#GdSnLk$(UTc@}65q&OE$;&D0j$18dL=`f8Av*^lN9Bizt
z&8r@ZTMxI<c6@-{#nVI+exiwThUeTMWFD|w&vJX~2u)=s*nou2euJ)OqZD|vc-<QA
zLKj7aI?c@ygb|1A03|M)OPdljmYVGE4P$1t{0~!>#?e?6cRrM}C<RE^5&Dc?<i@rg
z=H@M?CNsPr`ofb(Lj;Y<{8<9p<9_OTBA7WB2>Fwg>72@$fhrF4h3Pa6YC=hl)pdbT
zv8BdBMo?mSXb8vIQ~iRMX@lDC2<P8z#$G~@_)XZ3f~MLuSEM=ROEcCN<oTNbQV5!A
z5^UT)#@(q>?vIy|$*G|H+AdadN|~OeHIU+RU>uL)aCIy|`^O5t=G0~7D^|6hqYyD>
uNiJ$kSUL##k52g^eTUeL_xt$OZT}6dv&`|3Q@K|F0000<MNUMnLSTYp+$y^O

diff --git a/app/assets/images/regions/CH.png b/app/assets/images/regions/CH.png
deleted file mode 100644
index 187121e03e60e0946141f57f634a04d6b3e3cc57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 299
zcmeAS@N?(olHy`uVBq!ia0vp^A|N&gGmxCuw=V}sF%}28J29*~C-V}>;VkfoEM{Qf
z76xHPhFNnYfP(BLp1!W^H@RiF^vq%}s0#swECYN(T!Hj8QHE<`4A;aNuFJAqmt(yy
z&vrwW<%S&V4LP<?yEc8^z4`mqi$AVi`uX6_&j)w^{`&dv-@pI=|96G5ngKO4mIV0)
zGdMiEkp|)<dAqv^Rqp{gi6PF@#W6(Ua&7-<zGedfW^;iLEH9k?{+GYa-K4biYhlVy
zK|#g_6^2J53#_Ire8rhqsq4RdMwHd<mb{3}VyowFdlwulJ%8B!-Rl+H)6Rao{VnXv
l^_yqkY%eeWSM%lXUuGRf);C;YuW~_FdAj<!taD0e0stbDaP$BG

diff --git a/app/assets/images/regions/FR.png b/app/assets/images/regions/FR.png
deleted file mode 100644
index a79ab94c9af9569700048816825d073441871ba4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^A|N&g8<1QX;1>s^*pj^6U4S$Y{B+)352QE?JR*yM
zv<Dcwoy@ia36>Q&rUPlPeg+Hc=955<t*47)h{fsTlz@4^<}=Fv`FUJGcFDmFJFd4j
zP89Tg_rJbP|7kDJezTnPgoMOn7fu~<NHxfMu%dA>8(&8w179ak#!HoWHK0MNC9V-A
z$wjG&C8@e8K!U-@z`#=1&`{UNBE-<p%GlJ(&{EsL(8|Ezxz2krn1<Z^l+3hB0vdMA
Sov8%Wz~JfX=d#Wzp$P!uwM}^d

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