diff --git a/app/models/page_collections/page_collection.rb b/app/models/page_collections/page_collection.rb index 0237819b..e2090973 100644 --- a/app/models/page_collections/page_collection.rb +++ b/app/models/page_collections/page_collection.rb @@ -71,7 +71,7 @@ class PageCollection < ApplicationRecord serialize :page_types, Array def self.color - 'brown' + 'brown bg-brown-800' end def self.text_color diff --git a/app/views/layouts/tailwind.html.erb b/app/views/layouts/tailwind.html.erb index c7a6a090..8d27a685 100644 --- a/app/views/layouts/tailwind.html.erb +++ b/app/views/layouts/tailwind.html.erb @@ -42,7 +42,7 @@ -
+
<% if @universe_scope %> <%= link_to @universe_scope, class: "px-3 py-2 #{Universe.text_color} bg-purple-50 hover:bg-purple-200 rounded" do %> <%= Universe.icon %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 088e9f3a..83bda2c4 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -20,13 +20,20 @@
<%= image_tag @user.image_url, class: 'block rounded-full mr-4 h-20 w-20 border-2 border-notebook-blue p-1' %> -

-
- <%= @user.name %> +

+
+ + <%= @user.name %> + + + @<%= @user.username %> + <%= render partial: 'thredded/users/badge', locals: { user: @user } %> +
-
- @<%= @user.username %> - <%= render partial: 'thredded/users/badge', locals: { user: @user } %> +
+ <%= link_to 'Follow', '#', class: "text-white #{User.color} py-2 px-4 rounded hover:shadow hover:bg-green-500 transition mr-1" %> + <%= link_to 'Send Message', '#', class: "text-white bg-blue-500 py-2 px-4 rounded hover:shadow hover:bg-blue-400 transition mr-1" %> + <%= link_to 'Block', '#', class: "text-white bg-red-400 py-2 px-4 rounded hover:shadow hover:bg-red-300 transition" %>

@@ -34,6 +41,9 @@

<%= @user.bio %>

+ <%= link_to '#', class: "#{User.text_color} text-right block text-xs hover:text-green-400 transition" do %> + Read more + <% end %>

@@ -85,7 +95,7 @@