From 683e32c7f66a1d3238a3899f6bbc4caefd9dd291 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Sun, 3 Sep 2017 19:15:43 +0200 Subject: [PATCH 1/2] Fixed new team view still having old country_code_select --- app/views/teams/new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/teams/new.html.erb b/app/views/teams/new.html.erb index 463fa5f..b4d2150 100644 --- a/app/views/teams/new.html.erb +++ b/app/views/teams/new.html.erb @@ -21,7 +21,7 @@
<%= f.label :country %> - <%= country_code_select :team, :country, [['EU', 'EU']] %> + <%= country_select :user, :country, include_blank: true %>
<%= f.label :comment %> From 62fe368b13262de27bd4f4f2a7b4cffde53eb235 Mon Sep 17 00:00:00 2001 From: Absurdon Date: Tue, 19 Sep 2017 20:37:18 +0200 Subject: [PATCH 2/2] Fixing flags not showing correctly for brackets and in flat theme --- app/assets/stylesheets/themes/default/components/_flags.scss | 2 +- app/assets/stylesheets/themes/default/pages/_contests.scss | 5 ++--- app/assets/stylesheets/themes/flat/components/_flags.scss | 4 ++-- app/assets/stylesheets/themes/flat/pages/_contests.scss | 5 ++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/themes/default/components/_flags.scss b/app/assets/stylesheets/themes/default/components/_flags.scss index 4b96619..6337c00 100644 --- a/app/assets/stylesheets/themes/default/components/_flags.scss +++ b/app/assets/stylesheets/themes/default/components/_flags.scss @@ -1,4 +1,4 @@ -.flag { +img.flag { width: 16px; height: 11px; background: image_url('shared/flags.png') no-repeat; diff --git a/app/assets/stylesheets/themes/default/pages/_contests.scss b/app/assets/stylesheets/themes/default/pages/_contests.scss index 5be59fd..7799ac9 100644 --- a/app/assets/stylesheets/themes/default/pages/_contests.scss +++ b/app/assets/stylesheets/themes/default/pages/_contests.scss @@ -111,11 +111,10 @@ table.brackets { padding: 0; } - .flag { - width: 44px; + td.flag { + width: 34px; img { - width: 24px; margin-left: 10px; } } diff --git a/app/assets/stylesheets/themes/flat/components/_flags.scss b/app/assets/stylesheets/themes/flat/components/_flags.scss index 330fe2d..6337c00 100644 --- a/app/assets/stylesheets/themes/flat/components/_flags.scss +++ b/app/assets/stylesheets/themes/flat/components/_flags.scss @@ -1,7 +1,7 @@ -.flag { +img.flag { width: 16px; height: 11px; - background: url(shared/flags.png) no-repeat; + background: image_url('shared/flags.png') no-repeat; display: inline-block; } diff --git a/app/assets/stylesheets/themes/flat/pages/_contests.scss b/app/assets/stylesheets/themes/flat/pages/_contests.scss index 5be59fd..7799ac9 100644 --- a/app/assets/stylesheets/themes/flat/pages/_contests.scss +++ b/app/assets/stylesheets/themes/flat/pages/_contests.scss @@ -111,11 +111,10 @@ table.brackets { padding: 0; } - .flag { - width: 44px; + td.flag { + width: 34px; img { - width: 24px; margin-left: 10px; } }