diff --git a/app/assets/images/banners/banner2.png b/app/assets/images/banners/banner2.png index 5b31f5a3a..8ae0715e2 100644 Binary files a/app/assets/images/banners/banner2.png and b/app/assets/images/banners/banner2.png differ diff --git a/app/assets/images/banners/banner3.png b/app/assets/images/banners/banner3.png index dca89fe49..e4ff49093 100644 Binary files a/app/assets/images/banners/banner3.png and b/app/assets/images/banners/banner3.png differ diff --git a/app/assets/images/banners/banner4.png b/app/assets/images/banners/banner4.png deleted file mode 100644 index e3622b8f1..000000000 Binary files a/app/assets/images/banners/banner4.png and /dev/null differ diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index 0def1c8a5..d4aac416c 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -106,7 +106,7 @@ body.admin { a { color: white\9 !important; - color: red\9 !important; + color: red\9 !important; } ul { @@ -146,6 +146,7 @@ body.admin { li a:not(.button) { color: rgba(255,255,255,0.3); + display: block; line-height: rem-calc(48); padding-left: rem-calc(12); vertical-align: top; diff --git a/app/assets/stylesheets/mixins.scss b/app/assets/stylesheets/mixins.scss index b1947768b..d772b8ace 100644 --- a/app/assets/stylesheets/mixins.scss +++ b/app/assets/stylesheets/mixins.scss @@ -8,6 +8,7 @@ @mixin logo { color: white; + display: inline-block; font-family: 'Lato' !important; font-size: rem-calc(24); font-weight: lighter; diff --git a/app/views/admin/banners/index.html.erb b/app/views/admin/banners/index.html.erb index 84395f644..3dc337740 100644 --- a/app/views/admin/banners/index.html.erb +++ b/app/views/admin/banners/index.html.erb @@ -10,7 +10,7 @@ <% @banners.each do |banner| %> -
+
<%= link_to banner.target_url do %> @@ -19,13 +19,13 @@ <% end %>
- + <%= t("admin.banners.banner.post_started_at")%> <%= banner.post_started_at %>  |  <%= t("admin.banners.banner.post_ended_at")%> <%= banner.post_ended_at%>
- <%= link_to edit_admin_banner_path(banner), + <%= link_to edit_admin_banner_path(banner), class: 'edit-banner button' do %> <%= t("admin.banners.index.edit") %> diff --git a/db/seeds.rb b/db/seeds.rb index 72c071a3e..ebafd7b8c 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -65,13 +65,12 @@ Setting['feature.public_stats'] = true # Spending proposals feature flags Setting['feature.spending_proposal_features.voting_allowed'] = true - -# Banner styles +# Banner styles Setting['banner-style.banner-style-one'] = "Banner con estilo uno" Setting['banner-style.banner-style-two'] = "Banner con estilo dos" Setting['banner-style.banner-style-three'] = "Banner con estilo tres" -# Banner images +# Banner images Setting['banner-img.banner-img-one'] = "Banner con imagen uno" Setting['banner-img.banner-img-two'] = "Banner con imagen dos" Setting['banner-img.banner-img-three'] = "Banner con imagen tres"