From 1339db3567a189ed928809c59b55d6fca129da33 Mon Sep 17 00:00:00 2001 From: Arsene Karema Date: Wed, 8 Apr 2020 19:25:42 +0200 Subject: [PATCH 01/13] Implement the card design Implementation of the form cards --- app/views/forms/index.html.erb | 65 ++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/app/views/forms/index.html.erb b/app/views/forms/index.html.erb index d3877e7..3d12c10 100644 --- a/app/views/forms/index.html.erb +++ b/app/views/forms/index.html.erb @@ -1,5 +1,66 @@ + + + + + +
+
+
+
+
+
<%= link_to "new form", new_form_url %> +
+
+
+ + +
+
+
+
+
+

Form Title

+ +
+
+
+ Placeholder image +
+
+ +
+ +
+
+

Submissions

+

42

+ +
+
+

Form Title

+

06.04.2020

+
+ +
+
+
+
+ + +
+
+ +
+
+
+ + + +
+ +
<% @forms.each do |form| %> - <%= link_to form.title, form_url(form) %> -<% end %> +<%= link_to form.title, form_url(form) %> +<% end %> \ No newline at end of file From beabccbb79c8f21fa3a4cead4ba370776c936ab7 Mon Sep 17 00:00:00 2001 From: Yannick Date: Wed, 8 Apr 2020 20:40:06 +0200 Subject: [PATCH 02/13] Add fontawesome icons --- app/assets/stylesheets/application.css.scss | 6 +- app/views/forms/index.html.erb | 112 +++++++++----------- app/views/layouts/application.html.erb | 2 + 3 files changed, 56 insertions(+), 64 deletions(-) diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 0ac9955..4e958d3 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -28,4 +28,8 @@ $primary: $blue; $green: #007932; // hsl(141, 53%, 53%); $footer-background-color: $light; -@import 'bulma/bulma'; \ No newline at end of file +@import 'bulma/bulma'; + +.card-height{ + min-height: 200px; +} \ No newline at end of file diff --git a/app/views/forms/index.html.erb b/app/views/forms/index.html.erb index 3d12c10..71688b7 100644 --- a/app/views/forms/index.html.erb +++ b/app/views/forms/index.html.erb @@ -1,66 +1,52 @@ - - - - - -
-
-
-
-
-
-<%= link_to "new form", new_form_url %> -
-
-
- - -
-
-
-
-
-

Form Title

- +
+
+
+
+
+
+
+ <%= link_to new_form_url do %> + + <% end %> +
+
+
-
-
- Placeholder image -
+ + <% @forms.each do |form| %> +
+
+
+
+
+ +

<%= link_to form.title, form_url(form) %>

+ +
+
+
+ +
+
+ +
+ +
+
+
Submissions
+

42

+ +
+
+
Last Submission
+

06.04.2020

+
+ +
+
+
- + <% end %>
- -
-
-

Submissions

-

42

- -
-
-

Form Title

-

06.04.2020

-
- -
-
-
-
- - -
-
- -
-
-
- - - -
- -
-
-<% @forms.each do |form| %> -<%= link_to form.title, form_url(form) %> -<% end %> \ No newline at end of file +
+
\ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index d2e6710..a3f2f45 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,5 +11,7 @@ <%= yield %> + + From 2507ab60804f91172a6a8b35f36b5c390804793d Mon Sep 17 00:00:00 2001 From: Yannick Date: Thu, 9 Apr 2020 20:30:37 +0200 Subject: [PATCH 03/13] Fix merge issues --- app/views/layouts/application.html.erb | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3ef6a2f..7440d21 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,22 +1,5 @@ -<<<<<<< HEAD - - Tinyform - <%= csrf_meta_tags %> - <%= csp_meta_tag %> - - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> - - - - <%= yield %> - - - - -======= Tinyform @@ -76,4 +59,3 @@ ->>>>>>> master From 22f8db8f23ed67beff49d3ea3b2b242aabc22d6f Mon Sep 17 00:00:00 2001 From: Yannick Date: Fri, 10 Apr 2020 09:26:55 +0200 Subject: [PATCH 04/13] Add navbar background color --- app/views/layouts/application.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7440d21..393f4be 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -16,7 +16,7 @@
-
+