From 63b2e29afbc8b9b1665476f53372e660eec899b4 Mon Sep 17 00:00:00 2001 From: Mariam Date: Mon, 18 Dec 2023 18:41:58 -0600 Subject: [PATCH] 1.1 updated table style --- app/assets/stylesheets/scaffolds.scss | 65 --------------------------- app/views/friends/_form.html.erb | 3 ++ app/views/friends/index.html.erb | 8 ++-- app/views/friends/new.html.erb | 6 +-- app/views/friends/show.html.erb | 4 +- app/views/home/_header.html.erb | 9 ++++ 6 files changed, 20 insertions(+), 75 deletions(-) delete mode 100644 app/assets/stylesheets/scaffolds.scss diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss deleted file mode 100644 index bb2597f..0000000 --- a/app/assets/stylesheets/scaffolds.scss +++ /dev/null @@ -1,65 +0,0 @@ -body { - background-color: #fff; - color: #333; - margin: 33px; } - -body, p, ol, ul, td { - font-family: verdana, arial, helvetica, sans-serif; - font-size: 13px; - line-height: 18px; } - -pre { - background-color: #eee; - padding: 10px; - font-size: 11px; } - -a { - color: #000; } - -a:visited { - color: #666; } - -a:hover { - color: #fff; - background-color: #000; } - -th { - padding-bottom: 5px; } - -td { - padding: 0 5px 7px; } - -div.field, -div.actions { - margin-bottom: 10px; } - -#notice { - color: green; } - -.field_with_errors { - padding: 2px; - background-color: red; - display: table; } - -#error_explanation { - width: 450px; - border: 2px solid red; - padding: 7px 7px 0; - margin-bottom: 20px; - background-color: #f0f0f0; } - -#error_explanation h2 { - text-align: left; - font-weight: bold; - padding: 5px 5px 5px 15px; - font-size: 12px; - margin: -7px -7px 0; - background-color: #c00; - color: #fff; } - -#error_explanation ul li { - font-size: 12px; - list-style: square; } - -label { - display: block; } diff --git a/app/views/friends/_form.html.erb b/app/views/friends/_form.html.erb index d7dd541..e8f4f97 100644 --- a/app/views/friends/_form.html.erb +++ b/app/views/friends/_form.html.erb @@ -36,7 +36,10 @@ <%= form.text_field :twitter %> +
+
<%= form.submit %> +
<% end %> diff --git a/app/views/friends/index.html.erb b/app/views/friends/index.html.erb index a48cf26..f52dd4a 100644 --- a/app/views/friends/index.html.erb +++ b/app/views/friends/index.html.erb @@ -1,9 +1,7 @@

<%= notice %>

-

Friends

- - - +
+ @@ -32,4 +30,4 @@
-<%= link_to 'New Friend', new_friend_path %> +<%= link_to 'New Friend', new_friend_path, class:"btn btn-secondary" %> \ No newline at end of file diff --git a/app/views/friends/new.html.erb b/app/views/friends/new.html.erb index e64dcd1..5857391 100644 --- a/app/views/friends/new.html.erb +++ b/app/views/friends/new.html.erb @@ -1,5 +1,5 @@ -

New Friend

+

Add New Friend

<%= render 'form', friend: @friend %> - -<%= link_to 'Back', friends_path %> +
+<%= link_to 'Go Back', friends_path %> diff --git a/app/views/friends/show.html.erb b/app/views/friends/show.html.erb index 1a31de4..2679f87 100644 --- a/app/views/friends/show.html.erb +++ b/app/views/friends/show.html.erb @@ -25,5 +25,5 @@ <%= @friend.twitter %>

-<%= link_to 'Edit', edit_friend_path(@friend) %> | -<%= link_to 'Back', friends_path %> +<%= link_to 'Edit', edit_friend_path(@friend), class:"btn btn-secondary" %> | +<%= link_to 'Back', friends_path, class:"btn btn-secondary" %> diff --git a/app/views/home/_header.html.erb b/app/views/home/_header.html.erb index f793912..04b88ec 100644 --- a/app/views/home/_header.html.erb +++ b/app/views/home/_header.html.erb @@ -9,6 +9,15 @@ + + + + +
First name Last name