From ea47f9bc68652ffe10cf7b39c72b1009080c0d7c Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Mon, 15 Apr 2024 03:51:43 +0300 Subject: [PATCH 1/4] Test rows inside messages table body --- test/controllers/messages_controller_test.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index 40581993fc..5ef0233bf3 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -339,8 +339,8 @@ def test_inbox get inbox_messages_path assert_response :success assert_template "inbox" - assert_select ".content-inner > table", :count => 1 do - assert_select "tr", :count => 2 + assert_select ".content-inner > table.messages-table > tbody", :count => 1 do + assert_select "tr", :count => 1 assert_select "tr#inbox-#{read_message.id}.inbox-row", :count => 1 do assert_select "a[href='#{user_path read_message.sender}']", :text => read_message.sender.display_name assert_select "a[href='#{message_path read_message}']", :text => read_message.title @@ -365,8 +365,8 @@ def test_outbox get outbox_messages_path assert_response :success assert_template "outbox" - assert_select ".content-inner > table", :count => 1 do - assert_select "tr", :count => 2 + assert_select ".content-inner > table.messages-table > tbody", :count => 1 do + assert_select "tr", :count => 1 assert_select "tr.inbox-row", :count => 1 do assert_select "a[href='#{user_path message.recipient}']", :text => message.recipient.display_name assert_select "a[href='#{message_path message}']", :text => message.title From fdd596bd6024ccf6710fc922f996f7e30041652d Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Mon, 15 Apr 2024 04:04:30 +0300 Subject: [PATCH 2/4] Remove .inbox-row and use .table-success instead of .inbox-row-unread --- app/assets/stylesheets/common.scss | 8 -------- app/views/messages/_message_summary.html.erb | 4 ++-- app/views/messages/_sent_message_summary.html.erb | 4 ++-- test/controllers/messages_controller_test.rb | 4 ++-- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 549226f58d..b949e8ac16 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -810,14 +810,6 @@ tr.turn { } } -/* Rules for messages pages */ - -.messages { - .inbox-row-unread td { - background: #CBEEA7; - } -} - /* Rules for user images */ img.user_image { diff --git a/app/views/messages/_message_summary.html.erb b/app/views/messages/_message_summary.html.erb index 02c60a752a..1a7a0c839f 100644 --- a/app/views/messages/_message_summary.html.erb +++ b/app/views/messages/_message_summary.html.erb @@ -1,4 +1,4 @@ -"> +<%= tag.tr(:id => "inbox-#{message.id}", :class => { "message-summary" => true, "table-success" => !message.message_read? }) do %> <%= link_to message.sender.display_name, user_path(message.sender) %> <%= link_to message.title, message_path(message) %> <%= l message.sent_on, :format => :friendly %> @@ -12,4 +12,4 @@ <% end %> - +<% end %> diff --git a/app/views/messages/_sent_message_summary.html.erb b/app/views/messages/_sent_message_summary.html.erb index 82bbafc16c..cd156aa475 100644 --- a/app/views/messages/_sent_message_summary.html.erb +++ b/app/views/messages/_sent_message_summary.html.erb @@ -1,4 +1,4 @@ - +<%= tag.tr(:id => "outbox-#{message.id}", :class => { "message-summary" => true }) do %> <%= link_to message.recipient.display_name, user_path(message.recipient) %> <%= link_to message.title, message_path(message) %> <%= l message.sent_on, :format => :friendly %> @@ -7,4 +7,4 @@ <%= button_to t(".destroy_button"), message_path(message, :referer => request.fullpath), :method => :delete, :class => "btn btn-sm btn-danger", :form => { :data => { :turbo => true }, :class => "destroy-message" } %> - +<% end %> diff --git a/test/controllers/messages_controller_test.rb b/test/controllers/messages_controller_test.rb index 5ef0233bf3..dfec6346f1 100644 --- a/test/controllers/messages_controller_test.rb +++ b/test/controllers/messages_controller_test.rb @@ -341,7 +341,7 @@ def test_inbox assert_template "inbox" assert_select ".content-inner > table.messages-table > tbody", :count => 1 do assert_select "tr", :count => 1 - assert_select "tr#inbox-#{read_message.id}.inbox-row", :count => 1 do + assert_select "tr#inbox-#{read_message.id}", :count => 1 do assert_select "a[href='#{user_path read_message.sender}']", :text => read_message.sender.display_name assert_select "a[href='#{message_path read_message}']", :text => read_message.title end @@ -367,7 +367,7 @@ def test_outbox assert_template "outbox" assert_select ".content-inner > table.messages-table > tbody", :count => 1 do assert_select "tr", :count => 1 - assert_select "tr.inbox-row", :count => 1 do + assert_select "tr#outbox-#{message.id}", :count => 1 do assert_select "a[href='#{user_path message.recipient}']", :text => message.recipient.display_name assert_select "a[href='#{message_path message}']", :text => message.title end From 8d128cc3ba99cfa62f5ffd8eafd7b2d92bfff48b Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Mon, 15 Apr 2024 04:07:50 +0300 Subject: [PATCH 3/4] Override .table-success in dark mode --- app/assets/stylesheets/common.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index b949e8ac16..1fe7ea53bf 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -75,7 +75,10 @@ time[title] { .table-secondary { --bs-table-bg: rgb(var(--bs-secondary-rgb), .25); } - .table-primary, .table-secondary { + .table-success { + --bs-table-bg: rgb(var(--bs-success-rgb), .25); + } + .table-primary, .table-secondary, .table-success { --bs-table-color: initial; border-color: inherit; } From 20d05510cfaf44f5d4dc90d5b49c2cac7c23e074 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Tue, 16 Apr 2024 00:51:38 +0300 Subject: [PATCH 4/4] Decrease border factor to lighten table variant borders --- app/assets/stylesheets/parameters.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/stylesheets/parameters.scss b/app/assets/stylesheets/parameters.scss index 3d66db5fbe..719f5ad3b0 100644 --- a/app/assets/stylesheets/parameters.scss +++ b/app/assets/stylesheets/parameters.scss @@ -19,4 +19,6 @@ $link-hover-color: #24d; $link-decoration: none; $link-hover-decoration: underline; +$table-border-factor: .1; + $enable-negative-margins: true;