From 15a9198b0f5a0a97db8d64c9c992ef25f8151a40 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 28 Apr 2017 11:47:34 +0200 Subject: [PATCH 1/5] fixes telegram icon and show it only on mobile size --- app/assets/stylesheets/layout.scss | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 7c204bced..b1aa65c90 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1371,6 +1371,13 @@ table { } } +@include breakpoint(medium) { + + .button.button-telegram, .ssb-telegram { + display: none !important; + } +} + .social { a { @@ -1471,7 +1478,7 @@ table { width: $line-height*2; &:before { - content: "A"; + content: "1"; font-family: "icons" !important; font-size: rem-calc(24); left: 50%; From 2e649d78ff1374cf9894fb48c4ef52eaba61daf7 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 28 Apr 2017 12:20:19 +0200 Subject: [PATCH 2/5] fixes geozone tag style on proposals show --- app/assets/stylesheets/admin.scss | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index fac6d35ed..e864d9781 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -497,18 +497,21 @@ table.investment-projects-summary { } } -.geozone { - background: #ececec; - border-radius: rem-calc(6); - color: $text; - display: inline-block; - font-size: $small-font-size; - margin-bottom: $line-height/3; - padding: $line-height/4 $line-height/3; - text-decoration: none; +body.admin { - &:hover { - background: #e0e0e0; + .geozone { + background: #ececec; + border-radius: rem-calc(6); + color: $text; + display: inline-block; + font-size: $small-font-size; + margin-bottom: $line-height/3; + padding: $line-height/4 $line-height/3; + text-decoration: none; + + &:hover { + background: #e0e0e0; + } } } From 80279ca638b9edf7ba23d19ee9385806b7f379c7 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 28 Apr 2017 12:44:38 +0200 Subject: [PATCH 3/5] improves admin banners index page --- app/views/admin/banners/index.html.erb | 72 +++++++++++++++----------- config/locales/admin.en.yml | 1 + config/locales/admin.es.yml | 1 + 3 files changed, 44 insertions(+), 30 deletions(-) diff --git a/app/views/admin/banners/index.html.erb b/app/views/admin/banners/index.html.erb index db58c1303..11f2ef6ab 100644 --- a/app/views/admin/banners/index.html.erb +++ b/app/views/admin/banners/index.html.erb @@ -7,36 +7,48 @@

<%= page_entries_info @banners %>

- - <% @banners.each do |banner| %> - - + + + + + + + + +
- - <%= t("admin.banners.banner.post_started_at")%> <%= banner.post_started_at %> -  |  - <%= t("admin.banners.banner.post_ended_at")%> <%= banner.post_ended_at%> - - -
-
- <%= link_to banner.target_url do %> -

<%= banner.title %>

-

<%= banner.description %>

- <% end %> +<% @banners.each do |banner| %> + + + + + + + + + + + + + - - - - <% end %> -
<%= t("admin.banners.banner.post_started_at")%><%= t("admin.banners.banner.post_ended_at")%><%= t("admin.actions.actions")%>
<%= banner.post_started_at %><%= banner.post_ended_at %> +
+ <%= link_to t("admin.banners.index.edit"), edit_admin_banner_path(banner), + class: 'button hollow expanded' %>
- - 		- <%= link_to t("admin.banners.index.edit"), edit_admin_banner_path(banner), - class: 'edit-banner button hollow' %> - - <%= link_to t("admin.banners.index.delete"), admin_banner_path(banner), - method: :delete, - class: 'button hollow alert' %> -
+
+ <%= link_to t("admin.banners.index.delete"), admin_banner_path(banner), + method: :delete, + class: 'button hollow alert expanded' %> +
+
<%= t("admin.banners.index.preview") %>
+
+
+ <%= link_to banner.target_url do %> +

<%= banner.title %>

+

<%= banner.description %>

+ <% end %> +
+
+
+<% end %> <%= paginate @banners %> \ No newline at end of file diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index f99ef1780..f6b796b1c 100755 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -24,6 +24,7 @@ en: all: All with_active: Active with_inactive: Inactive + preview: Preview banner: title: Title description: Description diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index 817576494..951b34a2b 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -24,6 +24,7 @@ es: all: Todos with_active: Activos with_inactive: Inactivos + preview: Vista previa banner: title: Título description: Descripción From 73e46bf3f1bd4699f7846e1a858d0f91198d582c Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 28 Apr 2017 13:04:23 +0200 Subject: [PATCH 4/5] removes old back links --- app/views/admin/banners/edit.html.erb | 5 +---- app/views/admin/banners/new.html.erb | 5 +---- config/locales/admin.en.yml | 2 -- config/locales/admin.es.yml | 2 -- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/app/views/admin/banners/edit.html.erb b/app/views/admin/banners/edit.html.erb index 9f2ad0ac0..17cb11405 100644 --- a/app/views/admin/banners/edit.html.erb +++ b/app/views/admin/banners/edit.html.erb @@ -1,10 +1,7 @@