diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css index 14402e9..3b23f11 100644 --- a/app/assets/stylesheets/application.tailwind.css +++ b/app/assets/stylesheets/application.tailwind.css @@ -25,7 +25,7 @@ } .link { - @apply underline text-white; + @apply underline; } .link:hover { @@ -33,15 +33,15 @@ } .link--dark { - @apply underline text-secondary-900; + @apply underline text-black; } .link--dark:hover { - @apply underline text-secondary-700; + @apply underline text-black bg-secondary-200; } .link--light { - @apply underline text-white bg-primary-400 px-1; + @apply underline text-black bg-primary-400 px-1; } .link--light:hover { diff --git a/app/assets/stylesheets/cursors.css.erb b/app/assets/stylesheets/cursors.css.erb index aca14a4..6722db0 100644 --- a/app/assets/stylesheets/cursors.css.erb +++ b/app/assets/stylesheets/cursors.css.erb @@ -1,6 +1,6 @@ body { - cursor: url(<%= Dir[ './public/cursors/halloween/**/*' ].sample.split('/').last(3).join('/') %>), auto; + cursor: url(<%= Dir[ './public/cursors/summer/**/*' ].sample.split('/').last(3).join('/') %>), auto; } a, button { - cursor: url(<%= Dir[ './public/cursors/halloween/**/*' ].sample.split('/').last(3).join('/') %>), pointer; -} \ No newline at end of file + cursor: url(<%= Dir[ './public/cursors/summer/**/*' ].sample.split('/').last(3).join('/') %>), pointer; +} diff --git a/app/models/site_theme.rb b/app/models/site_theme.rb index 8f85b36..b291181 100644 --- a/app/models/site_theme.rb +++ b/app/models/site_theme.rb @@ -1,10 +1,26 @@ class SiteTheme def self.pick_color(number) color_wheel = %w[ - bg-amber-500 - bg-amber-400 + bg-amber-100 + bg-amber-200 bg-amber-300 bg-amber-200 + bg-amber-100 + bg-rose-100 + bg-rose-200 + bg-rose-300 + bg-rose-200 + bg-rose-100 + bg-cyan-100 + bg-cyan-200 + bg-cyan-300 + bg-cyan-200 + bg-cyan-100 + bg-rose-100 + bg-rose-200 + bg-rose-300 + bg-rose-200 + bg-rose-100 ] index = number % color_wheel.length diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index d62011a..3c88288 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,6 +1,6 @@ <% title("Confirm account") %> -

resend confirmation instructions

+

resend confirmation instructions

<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> <%= render "devise/shared/error_messages", resource: resource %> diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index a4d4ff4..37164ec 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -1,6 +1,6 @@ <% title("Change password") %> -

change your password

+

change your password

<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }, class: "py-3") do |f| %> <%= render "devise/shared/error_messages", resource: resource %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 0863f45..1a5fc3b 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,6 +1,6 @@ <% title("Forgot password") %> -

forgot your password?

+

forgot your password?

<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> <%= render "devise/shared/error_messages", resource: resource %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index fe1942c..b98584a 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,6 +1,6 @@ <% title("Log in") %> -

log in

+

log in

<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb index fdd4e25..96afad0 100644 --- a/app/views/devise/shared/_links.html.erb +++ b/app/views/devise/shared/_links.html.erb @@ -1,25 +1,25 @@ <%- if controller_name != 'sessions' %> - <%= link_to "log in", new_session_path(resource_name), class: "link--light" %>
+ <%= link_to "log in", new_session_path(resource_name), class: "link" %>
<% end %> <%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "sign up", new_registration_path(resource_name), class: "link--light" %>
+ <%= link_to "sign up", new_registration_path(resource_name), class: "link" %>
<% end %> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to "forgot your password?", new_password_path(resource_name), class: "link--light" %>
+ <%= link_to "forgot your password?", new_password_path(resource_name), class: "link" %>
<% end %> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "link--light" %>
+ <%= link_to "didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "link" %>
<% end %> <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "didn't receive unlock instructions?", new_unlock_path(resource_name), class: "link--light" %>
+ <%= link_to "didn't receive unlock instructions?", new_unlock_path(resource_name), class: "link" %>
<% end %> <%- if devise_mapping.omniauthable? %> <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to "sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), method: :post, class: "link--light" %>
+ <%= link_to "sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), method: :post, class: "link" %>
<% end %> <% end %> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb index b60c8af..acc7d9c 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -1,6 +1,6 @@ <% title("Unlock account") %> -

resend unlock instructions

+

resend unlock instructions

<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> <%= render "devise/shared/error_messages", resource: resource %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6e299e8..e2baded 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -30,11 +30,21 @@
-

<%= notice %>

-

<%= alert %>

+

<%= notice %>

+

<%= alert %>

<%= yield %>
+ diff --git a/app/views/profile/edit.html.erb b/app/views/profile/edit.html.erb index 5db2c04..ae7b201 100644 --- a/app/views/profile/edit.html.erb +++ b/app/views/profile/edit.html.erb @@ -1,6 +1,6 @@ <% title("Edit profile") %> -

editing <%= @profile.user.username %>'s profile

+

editing <%= @profile.user.username %>'s profile

<%= form_with model: @profile, url: profile_path(@profile.user) do |f| %> <%= render 'shared/errors', errors: @profile.errors %> diff --git a/app/views/profile/show.html.erb b/app/views/profile/show.html.erb index 5edce73..a78c49f 100644 --- a/app/views/profile/show.html.erb +++ b/app/views/profile/show.html.erb @@ -1,7 +1,7 @@ <% title("@#{@profile.user.username}'s Profile") %> <% if Rails.configuration.x.invitations.enabled && current_user.has_invites_available? %> -
+
hello, you have an invite available! care to <%= link_to 'invite someone', new_user_invitation_path, class: 'link' %>?
<% end %> diff --git a/app/views/topics/_table.html.erb b/app/views/topics/_table.html.erb index 16724ed..1a94640 100644 --- a/app/views/topics/_table.html.erb +++ b/app/views/topics/_table.html.erb @@ -1,6 +1,6 @@ - + @@ -14,7 +14,7 @@ <% views_for_topic = topic_views[topic.id] %> <% unread_posts = unread_posts?(topic, views_for_topic) %> - +
📜notices title
<% if unread_mentions?(mentions[topic.id], views_for_topic) %> 👀 diff --git a/app/views/topics/index.html.erb b/app/views/topics/index.html.erb index f3569f2..a67b937 100644 --- a/app/views/topics/index.html.erb +++ b/app/views/topics/index.html.erb @@ -3,16 +3,16 @@
<%= link_to root_path do %> -

topics

+

topics

<% end %> <%= link_to "new topic", new_topic_path, class: "btn inline-block" %>
-
- forum-wide pinned posts +
+ forum-wide pinned posts - + @@ -25,7 +25,7 @@ <% views_for_topic = @topic_views[topic.id] %> <% unread_posts = unread_posts?(topic, views_for_topic) %> - + @@ -50,5 +50,5 @@ <%= render 'table', topics: @topics, topic_follows: @topic_follows, topic_views: @topic_views, mentions: @mentions %>
- <%= render 'shared/pagination_controls', link_classes: %w[my-3 link--light] %> + <%= render 'shared/pagination_controls', link_classes: %w[my-3 link] %>
diff --git a/app/views/topics/mentions.html.erb b/app/views/topics/mentions.html.erb index 035c520..dc49ad8 100644 --- a/app/views/topics/mentions.html.erb +++ b/app/views/topics/mentions.html.erb @@ -1,10 +1,10 @@ <% title("Mentions") %>
-

topics you've been mentioned in

+

topics you've been mentioned in

<%= link_to "new topic", new_topic_path, class: "btn inline-block" %>
<%= render 'table', topics: @topics, topic_follows: @topic_follows, topic_views: @topic_views, mentions: @mentions %> -<%= link_to "back to topics", topics_path, class: "link--light mb-3" %> +<%= link_to "back to topics", topics_path, class: "link mb-3" %> diff --git a/app/views/topics/new.html.erb b/app/views/topics/new.html.erb index abfc9e5..597beeb 100644 --- a/app/views/topics/new.html.erb +++ b/app/views/topics/new.html.erb @@ -1,6 +1,6 @@ <% title("New topic") %> -

new topic

+

new topic

<%= form_with model: @topic, class: "py-2" do |f| %> <%= render 'shared/errors', errors: @topic.errors if @topic.errors.any? %> diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 8802f4c..dd3f84e 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -1,7 +1,7 @@ <% title(@topic.title) %>
- <%= link_to 'â–¼ jump to bottom', '#last-post', class: "link--light" %> + <%= link_to 'â–¼ jump to bottom', '#last-post', class: "link link--light" %>
diff --git a/app/views/topics/starred.html.erb b/app/views/topics/starred.html.erb index 8285a8b..1a23532 100644 --- a/app/views/topics/starred.html.erb +++ b/app/views/topics/starred.html.erb @@ -7,4 +7,4 @@ <%= render 'table', topics: @topics, topic_follows: @topic_follows, topic_views: @topic_views, mentions: @mentions %> -<%= link_to "back to topics", topics_path, class: "link--light mb-3" %> +<%= link_to "back to topics", topics_path, class: "link mb-3" %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 68c3a6a..158d876 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,12 +1,12 @@ <% title("Directory") %>
-

the poster list

+

the poster list

title
<%= link_to topic.title, topic_path(topic) %> <%= '(unread)' if unread_posts %>
- + @@ -14,7 +14,7 @@ <% @users.each_with_index do |user, index| %> - + <% if user.invited_by.present? %>
username joined
<%= link_to user.username, profile_path(user) %>