diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 513975a382a..f33e0a3d565 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -2245,76 +2245,6 @@ table {
// 18. Banners
// -----------
-.banner-style-one {
- background-color: $brand;
-}
-
-.banner-style-two {
- background-color: $budget;
-}
-
-.banner-style-three {
- background-color: #33dadf;
-}
-
-@include breakpoint(large) {
-
- .banner-img-one {
- background-image: image-url("banners/banner1.png");
- }
-
- .banner-img-two {
- background-image: image-url("banners/banner2.png");
- }
-
- .banner-img-three {
- background-image: image-url("banners/banner3.png");
- }
-}
-
-.banner-img-one,
-.banner-img-two,
-.banner-img-three {
- background-position: bottom right;
- background-repeat: no-repeat;
-}
-
-.banner-style-one,
-.banner-style-two,
-.banner-style-three,
-.banner {
- margin: 0;
- margin-bottom: $line-height;
-
- @include breakpoint(large) {
-
- h3 {
- width: 80%;
- }
- }
-
- h2,
- h3,
- a {
- color: #eaeaf2;
- }
-
- h2 {
- padding: $line-height / 2;
- padding-bottom: 0;
- }
-
- h3 {
- padding: $line-height / 2;
- padding-top: 0;
- }
-
- a:hover h2,
- a:hover h3 {
- color: #eaeaf2 !important;
- text-decoration: none;
- }
-}
// 19. Recommendations
// -------------------
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 5b714702682..0e2cbfc26fc 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -4,8 +4,6 @@ def index
all_settings = Setting.all.group_by { |s| s.type }
@settings = all_settings['common']
@feature_flags = all_settings['feature']
- @banner_styles = all_settings['banner-style']
- @banner_imgs = all_settings['banner-img']
end
def update
@@ -27,4 +25,4 @@ def settings_params
params.require(:setting).permit(:value)
end
-end
\ No newline at end of file
+end
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 34c45aeede5..c3d9768e6a3 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -2,16 +2,10 @@ class Setting < ActiveRecord::Base
validates :key, presence: true, uniqueness: true
default_scope { order(id: :asc) }
- scope :banner_style, -> { where("key ilike ?", "banner-style.%")}
- scope :banner_img, -> { where("key ilike ?", "banner-img.%")}
def type
if feature_flag?
'feature'
- elsif banner_style?
- 'banner-style'
- elsif banner_img?
- 'banner-img'
else
'common'
end
@@ -25,14 +19,6 @@ def enabled?
feature_flag? && value.present?
end
- def banner_style?
- key.start_with?('banner-style.')
- end
-
- def banner_img?
- key.start_with?('banner-img.')
- end
-
class << self
def [](key)
where(key: key).pluck(:value).first.presence
diff --git a/app/views/admin/settings/_banner_images.html.erb b/app/views/admin/settings/_banner_images.html.erb
deleted file mode 100644
index a852f20b162..00000000000
--- a/app/views/admin/settings/_banner_images.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% if @banner_imgs.present?%>
-
<%= t("admin.settings.index.banner_imgs") %>
-
-
-
- <% @banner_imgs.each do |setting| %>
-
-
- <%= t("settings.#{setting.key}") %>
- |
-
-
- <%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %>
- <%= f.text_area :value, label: false, id: dom_id(setting), lines: 1 %>
- <%= f.submit(t('admin.settings.index.update_setting'), class: "button small success") %>
- <% end %>
- |
-
- <% end %>
-
-
-<% else %>
- <%= t("admin.settings.index.no_banners_images") %>
-<% end %>
diff --git a/app/views/admin/settings/_banner_styles.html.erb b/app/views/admin/settings/_banner_styles.html.erb
deleted file mode 100644
index 5477ce438c1..00000000000
--- a/app/views/admin/settings/_banner_styles.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<% if @banner_styles.present? %>
- <%= t("admin.settings.index.banners") %>
-
-
-
- <% @banner_styles.each do |setting| %>
-
-
- <%= t("settings.#{setting.key}") %>
- |
-
-
- <%= form_for(setting, url: admin_setting_path(setting), html: { id: "edit_#{dom_id(setting)}"}) do |f| %>
- <%= f.text_area :value, label: false, id: dom_id(setting), lines: 1 %>
- <%= f.submit(t('admin.settings.index.update_setting'), class: "button hollow") %>
- <% end %>
- |
-
- <% end %>
-
-
-<% else %>
- <%= t("admin.settings.index.no_banners_styles") %>
-<% end %>
diff --git a/app/views/admin/settings/_filter_subnav.html.erb b/app/views/admin/settings/_filter_subnav.html.erb
index 635a8075859..71894ec4302 100644
--- a/app/views/admin/settings/_filter_subnav.html.erb
+++ b/app/views/admin/settings/_filter_subnav.html.erb
@@ -17,18 +17,6 @@
<% end %>
-
- <%= link_to "#tab-banner-styles" do %>
- <%= t("admin.settings.index.banners") %>
- <% end %>
-
-
-
- <%= link_to "#tab-banner-images" do %>
- <%= t("admin.settings.index.banner_imgs") %>
- <% end %>
-
-
<%= link_to "#tab-map-configuration" do %>
<%= t("admin.settings.index.map.title") %>
diff --git a/app/views/admin/settings/index.html.erb b/app/views/admin/settings/index.html.erb
index 7c03d77a577..4316bdce282 100644
--- a/app/views/admin/settings/index.html.erb
+++ b/app/views/admin/settings/index.html.erb
@@ -10,14 +10,6 @@
<%= render "feature_flags" %>
-
- <%= render "banner_styles" %>
-
-
-
- <%= render "banner_images" %>
-
-
<%= render "map_configuration" %>
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 21fa2981f95..011be44fc26 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -1126,10 +1126,6 @@ en:
flash:
updated: Value updated
index:
- banners: Banner styles
- banner_imgs: Banner images
- no_banners_images: No banner images
- no_banners_styles: No banner styles
title: Configuration settings
update_setting: Update
feature_flags: Features
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index 9d22c369771..998e0f39722 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -1125,10 +1125,6 @@ es:
flash:
updated: Valor actualizado
index:
- banners: Estilo del banner
- banner_imgs: Imagenes del banner
- no_banners_images: No hay imagenes de banner
- no_banners_styles: No hay estilos de banner
title: ConfiguraciĆ³n global
update_setting: Actualizar
feature_flags: Funcionalidades
diff --git a/db/seeds.rb b/db/seeds.rb
index 76a92a4ca60..c406325f87f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -88,16 +88,6 @@
# Spending proposals feature flags
Setting['feature.spending_proposal_features.voting_allowed'] = nil
-# Banner styles
-Setting['banner-style.banner-style-one'] = "Banner style 1"
-Setting['banner-style.banner-style-two'] = "Banner style 2"
-Setting['banner-style.banner-style-three'] = "Banner style 3"
-
-# Banner images
-Setting['banner-img.banner-img-one'] = "Banner image 1"
-Setting['banner-img.banner-img-two'] = "Banner image 2"
-Setting['banner-img.banner-img-three'] = "Banner image 3"
-
# Proposal notifications
Setting['proposal_notification_minimum_interval_in_days'] = 3
Setting['direct_message_max_per_day'] = 3
diff --git a/lib/tasks/banners.rake b/lib/tasks/banners.rake
deleted file mode 100644
index eb2cc7d9c39..00000000000
--- a/lib/tasks/banners.rake
+++ /dev/null
@@ -1,20 +0,0 @@
-namespace :banners do
-
- desc "Migrate styles to background_color and font_color"
- task migrate_style: :environment do
-
- Banner.all.each do |banner|
- banner.font_color = '#FFFFFF'
- case banner.style
- when "banner-style banner-style-one"
- banner.background_color = '#004a83'
- when "banner-style banner-style-two"
- banner.background_color = '#7e328a'
- when "banner-style banner-style-three"
- banner.background_color = '#33dadf'
- end
- banner.save
- end
- end
-
-end
diff --git a/spec/models/setting_spec.rb b/spec/models/setting_spec.rb
index 244e25bf14b..77f2d3daf1e 100644
--- a/spec/models/setting_spec.rb
+++ b/spec/models/setting_spec.rb
@@ -54,28 +54,4 @@
expect(setting.enabled?).to eq false
end
end
-
- describe "#banner_style?" do
- it "is true if key starts with 'banner-style.'" do
- setting = described_class.create(key: "banner-style.whatever")
- expect(setting.banner_style?).to eq true
- end
-
- it "is false if key does not start with 'banner-style.'" do
- setting = described_class.create(key: "whatever")
- expect(setting.banner_style?).to eq false
- end
- end
-
- describe "#banner_img?" do
- it "is true if key starts with 'banner-img.'" do
- setting = described_class.create(key: "banner-img.whatever")
- expect(setting.banner_img?).to eq true
- end
-
- it "is false if key does not start with 'banner-img.'" do
- setting = described_class.create(key: "whatever")
- expect(setting.banner_img?).to eq false
- end
- end
end