From e26da7dfa57da77144b22b4f2df20c95185678c8 Mon Sep 17 00:00:00 2001 From: karemarsy Date: Wed, 15 Apr 2020 13:05:21 +0200 Subject: [PATCH 1/5] Add some styling classes in the table --- app/views/forms/show.html.erb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/views/forms/show.html.erb b/app/views/forms/show.html.erb index 5842b30..cd0d10a 100644 --- a/app/views/forms/show.html.erb +++ b/app/views/forms/show.html.erb @@ -5,7 +5,11 @@

<%= link_to 'Google spreadsheet', @form.spreadsheet_url %>

- +
+
+
+ +
<% @form.spreadsheet_headers.each do |value| %> @@ -23,3 +27,6 @@ <% end %>
+ + + \ No newline at end of file From 3b71f6b00f6f5ae716277b16ef46341b3a2efba2 Mon Sep 17 00:00:00 2001 From: Yannick Date: Thu, 16 Apr 2020 18:20:06 +0200 Subject: [PATCH 2/5] Fix table styling --- app/assets/stylesheets/application.css.scss | 4 ++ app/views/forms/show.html.erb | 56 ++++++++++----------- 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 71872c4..7955a05 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -52,4 +52,8 @@ body { .button.google { background: rgb(225, 98, 89); color: white; +} + +.table-wrapper{ + box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06); } \ No newline at end of file diff --git a/app/views/forms/show.html.erb b/app/views/forms/show.html.erb index cd0d10a..64a82d1 100644 --- a/app/views/forms/show.html.erb +++ b/app/views/forms/show.html.erb @@ -1,32 +1,32 @@ -

<%= @form.title %>

-

- <%= submission_url(@form) %> -

-

- <%= link_to 'Google spreadsheet', @form.spreadsheet_url %> -

-
-
-
+
+
+

<%= @form.title %>

+

+ <%= submission_url(@form) %> +

+

+ <%= link_to 'Google spreadsheet', @form.spreadsheet_url %> +

+
- - - - <% @form.spreadsheet_headers.each do |value| %> - - <% end %> - - - - <% @submissions.each do |submission| %> - - <% @form.spreadsheet_headers.each do |column| %> +
+
<%= value %>
+ + + <% @form.spreadsheet_headers.each do |value| %> + + <% end %> + + + + <% @submissions.each do |submission| %> + + <% @form.spreadsheet_headers.each do |column| %> + <% end %> + <% end %> - - <% end %> - -
<%= value %>
<%= submission.data[column] %>
-
-
+ + +
\ No newline at end of file From 5ce78138d2d991108d9b661804498f8347a6c1c3 Mon Sep 17 00:00:00 2001 From: Yannick Date: Thu, 16 Apr 2020 18:44:31 +0200 Subject: [PATCH 3/5] Add link styling --- app/assets/stylesheets/application.css.scss | 6 ++++- app/views/forms/show.html.erb | 30 ++++++++++++++++----- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 7955a05..8405ae7 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -54,6 +54,10 @@ body { color: white; } -.table-wrapper{ +.button { + vertical-align: middle; +} + +.table-wrapper { box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06); } \ No newline at end of file diff --git a/app/views/forms/show.html.erb b/app/views/forms/show.html.erb index 64a82d1..666faac 100644 --- a/app/views/forms/show.html.erb +++ b/app/views/forms/show.html.erb @@ -1,12 +1,28 @@
-

<%= @form.title %>

-

- <%= submission_url(@form) %> -

-

- <%= link_to 'Google spreadsheet', @form.spreadsheet_url %> -

+

<%= @form.title %>

+
+
+

+ + <%= submission_url(@form) %> +

+
+
+

+ + <%= link_to 'Google spreadsheet', @form.spreadsheet_url %> +

+
+
From d3f6ff9ce34ab060cbe836b5abc0b49e78536cb0 Mon Sep 17 00:00:00 2001 From: karemarsy Date: Mon, 20 Apr 2020 10:44:33 +0200 Subject: [PATCH 4/5] Redesign the table --- app/views/forms/show.html.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/forms/show.html.erb b/app/views/forms/show.html.erb index 666faac..0d6af67 100644 --- a/app/views/forms/show.html.erb +++ b/app/views/forms/show.html.erb @@ -1,3 +1,4 @@ +

<%= @form.title %>

@@ -14,12 +15,12 @@

- - <%= link_to 'Google spreadsheet', @form.spreadsheet_url %> + <%= link_to 'Google spreadsheet', @form.spreadsheet_url, { :class => "has-text-dark"} %>

@@ -45,4 +46,5 @@
+
\ No newline at end of file From 0b33a5d981b9e1076b78789e18798f9523e355c3 Mon Sep 17 00:00:00 2001 From: Michael Bumann Date: Mon, 20 Apr 2020 11:35:31 +0200 Subject: [PATCH 5/5] Update app/views/forms/show.html.erb --- app/views/forms/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/forms/show.html.erb b/app/views/forms/show.html.erb index 0d6af67..7c103b4 100644 --- a/app/views/forms/show.html.erb +++ b/app/views/forms/show.html.erb @@ -27,7 +27,7 @@
- +
<% @form.spreadsheet_headers.each do |value| %> @@ -47,4 +47,4 @@
- \ No newline at end of file +