Merge pull request #1647 from AyuntamientoMadrid/custom-images

AyuntamientoMadrid · Sep 21, 2018 · 0a9f20d · 0a9f20d
2 parents 9fb5cdb + e7ace96
commit 0a9f20d
Show file tree

Hide file tree

Showing 48 changed files with 1 addition and 59 deletions.
diff --git a/app/assets/images/apple-touch-icon-200.png b/app/assets/images/apple-touch-icon-200.png
diff --git a/app/assets/images/avatar_admin.png b/app/assets/images/avatar_admin.png
diff --git a/app/assets/images/avatar_moderator.png b/app/assets/images/avatar_moderator.png
diff --git a/app/assets/images/custom/apple-touch-icon-200.png b/app/assets/images/custom/apple-touch-icon-200.png
diff --git a/app/assets/images/custom/avatar_admin.png b/app/assets/images/custom/avatar_admin.png
diff --git a/app/assets/images/custom/avatar_moderator.png b/app/assets/images/custom/avatar_moderator.png
diff --git a/app/assets/images/budgets/stats/gender.png → ...ts/images/custom/budgets/stats/gender.png b/app/assets/images/budgets/stats/gender.png → ...ts/images/custom/budgets/stats/gender.png
diff --git a/app/assets/images/custom/favicon.ico b/app/assets/images/custom/favicon.ico
diff --git a/app/assets/images/featured_open_plenary.jpg → ...s/images/custom/featured_open_plenary.jpg b/app/assets/images/featured_open_plenary.jpg → ...s/images/custom/featured_open_plenary.jpg
diff --git a/...ts/images/featured_spending_proposals.png → ...es/custom/featured_spending_proposals.png b/...ts/images/featured_spending_proposals.png → ...es/custom/featured_spending_proposals.png
diff --git a/app/assets/images/custom/header_print_proposals.jpg b/app/assets/images/custom/header_print_proposals.jpg
diff --git a/app/assets/images/help/vota.jpg → app/assets/images/custom/help/vota.jpg b/app/assets/images/help/vota.jpg → app/assets/images/custom/help/vota.jpg
diff --git a/...assets/images/investment_project_city.jpg → ...images/custom/investment_project_city.jpg b/...assets/images/investment_project_city.jpg → ...images/custom/investment_project_city.jpg
diff --git a/.../images/investment_project_delegation.jpg → .../custom/investment_project_delegation.jpg b/.../images/investment_project_delegation.jpg → .../custom/investment_project_delegation.jpg
diff --git a/...s/images/investment_project_districts.jpg → ...s/custom/investment_project_districts.jpg b/...s/images/investment_project_districts.jpg → ...s/custom/investment_project_districts.jpg
diff --git a/...ets/images/investment_project_welcome.png → ...ges/custom/investment_project_welcome.png b/...ets/images/investment_project_welcome.png → ...ges/custom/investment_project_welcome.png
diff --git a/...sets/images/custom/logo_header_madrid.png → app/assets/images/custom/logo_header.png b/...sets/images/custom/logo_header_madrid.png → app/assets/images/custom/logo_header.png
diff --git a/app/assets/images/custom/map.jpg b/app/assets/images/custom/map.jpg
diff --git a/app/assets/images/news_page_banner.jpg → ...assets/images/custom/news_page_banner.jpg b/app/assets/images/news_page_banner.jpg → ...assets/images/custom/news_page_banner.jpg
diff --git a/app/assets/images/news_page_photos.png → ...assets/images/custom/news_page_photos.png b/app/assets/images/news_page_photos.png → ...assets/images/custom/news_page_photos.png
diff --git a/...images/participatory_budget_stats/sex.png → ...custom/participatory_budget_stats/sex.png b/...images/participatory_budget_stats/sex.png → ...custom/participatory_budget_stats/sex.png
diff --git a/app/assets/images/plaza_banner.jpg → app/assets/images/custom/plaza_banner.jpg b/app/assets/images/plaza_banner.jpg → app/assets/images/custom/plaza_banner.jpg
diff --git a/app/assets/images/plaza_banner_small.jpg → ...sets/images/custom/plaza_banner_small.jpg b/app/assets/images/plaza_banner_small.jpg → ...sets/images/custom/plaza_banner_small.jpg
diff --git a/app/assets/images/pleno_abierto_cartel.gif → ...ts/images/custom/pleno_abierto_cartel.gif b/app/assets/images/pleno_abierto_cartel.gif → ...ts/images/custom/pleno_abierto_cartel.gif
diff --git a/app/assets/images/processes_human_rights.png → .../images/custom/processes_human_rights.png b/app/assets/images/processes_human_rights.png → .../images/custom/processes_human_rights.png
diff --git a/app/assets/images/processes_ordinance.png → ...ets/images/custom/processes_ordinance.png b/app/assets/images/processes_ordinance.png → ...ets/images/custom/processes_ordinance.png
diff --git a/...images/processes_plaza_espana_debates.png → ...custom/processes_plaza_espana_debates.png b/...images/processes_plaza_espana_debates.png → ...custom/processes_plaza_espana_debates.png
diff --git a/...s/images/processes_plaza_espana_small.gif → ...s/custom/processes_plaza_espana_small.gif b/...s/images/processes_plaza_espana_small.gif → ...s/custom/processes_plaza_espana_small.gif
diff --git a/app/assets/images/custom/social-media-icon.png b/app/assets/images/custom/social-media-icon.png
diff --git a/app/assets/images/spending_proposals_bg.jpg → ...s/images/custom/spending_proposals_bg.jpg b/app/assets/images/spending_proposals_bg.jpg → ...s/images/custom/spending_proposals_bg.jpg
diff --git a/...s/images/survey_results/channel_paper.png → ...s/custom/survey_results/channel_paper.png b/...s/images/survey_results/channel_paper.png → ...s/custom/survey_results/channel_paper.png
diff --git a/...s/images/survey_results/channel_phone.png → ...s/custom/survey_results/channel_phone.png b/...s/images/survey_results/channel_phone.png → ...s/custom/survey_results/channel_phone.png
diff --git a/...ets/images/survey_results/channel_web.png → ...ges/custom/survey_results/channel_web.png b/...ets/images/survey_results/channel_web.png → ...ges/custom/survey_results/channel_web.png
diff --git a/...ages/survey_results/plaza_espana_logo.gif → ...stom/survey_results/plaza_espana_logo.gif b/...ages/survey_results/plaza_espana_logo.gif → ...stom/survey_results/plaza_espana_logo.gif
diff --git a/app/assets/images/survey_results/sex.png → ...sets/images/custom/survey_results/sex.png b/app/assets/images/survey_results/sex.png → ...sets/images/custom/survey_results/sex.png
diff --git a/...mages/survey_results/sex_preselection.png → ...ustom/survey_results/sex_preselection.png b/...mages/survey_results/sex_preselection.png → ...ustom/survey_results/sex_preselection.png
diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico
diff --git a/app/assets/images/featured_open_plenary_small.jpg b/app/assets/images/featured_open_plenary_small.jpg
diff --git a/app/assets/images/header_print_proposals.jpg b/app/assets/images/header_print_proposals.jpg
diff --git a/app/assets/images/logo_email.png b/app/assets/images/logo_email.png
diff --git a/app/assets/images/logo_header.png b/app/assets/images/logo_header.png
diff --git a/app/assets/images/map.jpg b/app/assets/images/map.jpg
diff --git a/app/assets/images/social-media-icon.png b/app/assets/images/social-media-icon.png
diff --git a/app/assets/images/spending_proposals_1.png b/app/assets/images/spending_proposals_1.png
diff --git a/app/assets/images/spending_proposals_2.png b/app/assets/images/spending_proposals_2.png
diff --git a/app/assets/images/spending_proposals_3.png b/app/assets/images/spending_proposals_3.png
diff --git a/app/views/custom/layouts/_header.html.erb b/app/views/custom/layouts/_header.html.erb
diff --git a/app/views/custom/layouts/devise.html.erb b/app/views/custom/layouts/devise.html.erb
@@ -29,7 +29,7 @@
       <div class="auth-image small-12 medium-4 column">
         <h1 class="margin">
           <%= link_to root_path do %>
-            <%= image_tag(image_path_for('logo_header_madrid.png'), alt: setting['org_name']) %>
+            <%= image_tag(image_path_for('logo_header.png'), alt: setting['org_name']) %>
           <% end %>
         </h1>