Remove special link class

This cleans up the code quite a bit, but also allows links in editable
content to be rendered with the default style.

app/assets/stylesheets/components/base.css

@@ -61,10 +61,12 @@
     @apply leading-6;
   }
 
-  main a:not(nav > *) {
+  main a:not(nav > *),
+  main a:not([data-tabs-target="tab"] {
     @apply text-blue-600;
     &:hover   { @apply underline; }
     &:visited { @apply text-indigo-600; }
     &:active  { @apply text-red-600; }
   }
+
 }

app/components/main_compact_component.html.erb

@@ -1,4 +1,4 @@
-<main class="w-full max-w-xl mx-auto px-4 sm:px-6 lg:px-8">
+<main class="w-full max-w-xl mx-auto pb-12 px-4 sm:px-6 lg:px-8">
   <div class="bg-white rounded-lg shadow px-6 sm:px-12 py-8 sm:py-12">
     <%= content %>
   </div>

app/components/main_simple_component.html.erb

@@ -1,4 +1,4 @@
-<main class="w-full max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
+<main class="w-full max-w-6xl mx-auto pb-12 px-4 md:px-6 lg:px-8">
   <div class="md:min-h-[50vh] bg-white rounded-lg shadow px-6 sm:px-12 py-8 sm:py-12">
     <%= content %>
   </div>

app/components/main_with_sidenav_component.html.erb

@@ -1,4 +1,4 @@
-<main class="w-full max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
+<main class="w-full max-w-6xl mx-auto pb-12 px-4 md:px-6 lg:px-8">
   <div class="bg-white rounded-lg shadow">
     <div class="md:min-h-[50vh] divide-y divide-gray-200 lg:grid lg:grid-cols-12 lg:divide-y-0 lg:divide-x">
       <aside class="py-6 sm:py-8 lg:col-span-3">

app/components/main_with_tabnav_component.html.erb

@@ -1,4 +1,4 @@
-<main class="w-full max-w-6xl mx-auto px-4 md:px-6 lg:px-8">
+<main class="w-full max-w-6xl mx-auto pb-12 px-4 md:px-6 lg:px-8">
   <div class="md:min-h-[50vh] bg-white rounded-lg shadow">
     <div class="px-6 sm:px-12 pt-2 sm:pt-4">
       <%= render partial: @tabnav_partial %>

app/controllers/pages_controller.rb

@@ -1,9 +0,0 @@
-class PagesController < ApplicationController
-  def privacy
-    @current_section = :privacy
-  end
-
-  def tos
-    @current_section = :tos
-  end
-end

app/services/ejabberd_manager/set_avatar.rb

@@ -11,7 +11,7 @@ module EjabberdManager
     def call
       unless @overwrite
         current_avatar = EjabberdManager::GetAvatar.call(user: @user)
-        Rails.logger.info { "User #{@user.cn} already has an avatar set" }
+        Rails.logger.info { "User #{user.cn} already has an avatar set" }
         return if current_avatar.present?
       end
 

app/views/devise/sessions/new.html.erb

@@ -47,7 +47,7 @@
             data: { action: "click->settings--toggle#toggleSwitch" } %>
       <p class="grow text-sm text-right">
         <%= link_to "Forgot your password?", new_password_path(resource_name),
-              class: "text-gray-500 visited:text-gray-500 underline" %><br />
+              class: "text-gray-500 underline" %><br />
       </p>
     <% end %>
 

app/views/devise/shared/_links.html.erb

@@ -2,28 +2,28 @@
   <%- if controller_name != 'sessions' %>
     <p class="mb-2">
       <%= link_to "Log in", new_session_path(resource_name),
-            class: "text-gray-500 visited:text-gray-500 underline" %>
+            class: "text-gray-500 underline" %>
     </p>
   <% end %>
 
   <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
     <p class="mb-2">
       <%= link_to "Forgot your password?", new_password_path(resource_name),
-            class: "text-gray-500 visited:text-gray-500 underline" %>
+            class: "text-gray-500 underline" %>
     </p>
   <% end %>
 
   <%- if devise_mapping.confirmable? && !controller_name.match(/^(confirmations|sessions)$/) %>
     <p class="mb-2">
       <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name),
-            class: "text-gray-500 visited:text-gray-500 underline" %>
+            class: "text-gray-500 underline" %>
     </p>
   <% end %>
 
   <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
     <p class="mb-2">
       <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name),
-            class: "text-gray-500 visited:text-gray-500 underline" %>
+            class: "text-gray-500 underline" %>
     </p>
   <% end %>
 </div>

app/views/layouts/application.html.erb

@@ -10,7 +10,7 @@
     <%= javascript_importmap_tags %>
   </head>
   <body <%= @context.present? ? "id=#{@context}" : "" %> class="h-full <%= @context == :admin ? "bg-red-500" : "bg-sky-900" %>">
-    <div class="min-h-full flex flex-col">
+    <div class="min-h-full">
       <nav data-controller="topbar">
         <div class="max-w-6xl mx-auto sm:px-6 lg:px-8">
           <div class="border-b border-gray-200/10">
@@ -96,18 +96,7 @@
         </div>
       </div>
 
-      <div class="flex-grow">
+      <%= yield %>
-        <%= yield %>
-      </div>
-
-      <% if user_signed_in? && current_user.confirmed? %>
-      <nav id="footer" class="max-w-6xl mx-auto pt-4 sm:px-6 lg:px-8">
-        <div class="flex justify-end items-center space-x-4 h-16">
-          <%= link_to "Terms", tos_page_path, class: main_nav_class(@current_section, :tos) %>
-          <%= link_to "Privacy", privacy_page_path, class: main_nav_class(@current_section, :privacy) %>
-        </div>
-      </nav>
-      <% end %>
     </div>
   </body>
 </html>

app/views/pages/privacy.html.erb

@@ -1,17 +0,0 @@
-<%= render HeaderComponent.new(title: "Privacy Policy") %>
-
-<%= render MainSimpleComponent.new do %>
-  <section>
-    <%= render EditableContentComponent.new(
-      context: "privacy", key: "body", rich_text: true,
-      default: "No content yet. Please add a privacy policy.") %>
-
-    <% if user_signed_in? && current_user.is_admin? %>
-    <div class="mt-8 pt-6 border-t border-gray-200 text-right">
-      <%= render EditContentButtonComponent.new(
-        context: "privacy", key: "body", rich_text: true,
-        redirect_to: request.path) do %>Edit content<% end %>
-    </div>
-    <% end %>
-  </section>
-<% end %>

app/views/pages/tos.html.erb

@@ -1,17 +0,0 @@
-<%= render HeaderComponent.new(title: "Terms of Service") %>
-
-<%= render MainSimpleComponent.new do %>
-  <section>
-    <%= render EditableContentComponent.new(
-      context: "tos", key: "body", rich_text: true,
-      default: "No content yet. Please add your terms of service.") %>
-
-    <% if user_signed_in? && current_user.is_admin? %>
-    <div class="mt-8 pt-6 border-t border-gray-200 text-right">
-      <%= render EditContentButtonComponent.new(
-        context: "tos", key: "body", rich_text: true,
-        redirect_to: request.path) do %>Edit content<% end %>
-    </div>
-    <% end %>
-  </section>
-<% end %>

app/views/services/chat/show.html.erb

@@ -62,30 +62,35 @@
       </select>
       <ul class="hidden sm:flex list-reset mb-8 border-gray-200 border-b">
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Android
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             iOS
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Linux
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Windows
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             macOS
           </a>
         </li>
+        <!-- <li class="mr&#45;2" data&#45;tabs&#45;target="tab" data&#45;action="click&#45;>tabs#change"> -->
+        <!--   <a href="#" class="bg&#45;white inline&#45;block py&#45;2 px&#45;4 font&#45;semibold no&#45;underline"> -->
+        <!--     Web -->
+        <!--   </a> -->
+        <!-- </li> -->
       </ul>
 
       <div id="apps-android" class="hidden grid grid-cols-1 gap-6"

app/views/services/email/show.html.erb

@@ -56,22 +56,22 @@
       </select>
       <ul class="hidden sm:flex list-reset mb-8 border-gray-200 border-b">
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Android
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Linux
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Windows
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             macOS
           </a>
         </li>

app/views/services/mastodon/show.html.erb

@@ -61,32 +61,32 @@
       </select>
       <ul class="hidden sm:flex list-reset mb-8 border-gray-200 border-b">
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Web
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-5 font-semibold no-underline">
             Android
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             iOS
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Linux
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Windows
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             macOS
           </a>
         </li>

app/views/services/remotestorage/show.html.erb

@@ -37,8 +37,10 @@
     <h3>Compatible Apps</h3>
     <p>
       Your Storage account is based on a new open standard called
-      <img src="/img/logos/icon_remotestorage.svg" class="h-4 w-4 inline">
+      <a href="https://remotestorage.io" target="_blank">
-      <strong>remoteStorage</strong>, which is not yet widely supported. Look
+        <img src="/img/logos/icon_remotestorage.svg" class="h-4 w-4 inline">
+        <strong>remoteStorage</strong>
+      </a>, which is not yet widely supported.  Look
       for the remoteStorage icon, or check the Sync settings in apps.
     </p>
     <p>
@@ -65,27 +67,27 @@
       </select>
       <ul class="hidden sm:flex list-reset mb-8 border-gray-200 border-b">
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Productivity
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Bookmarks
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Reading
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             File sharing
           </a>
         </li>
         <li class="mr-2" data-tabs-target="tab" data-action="click->tabs#change:prevent">
-          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline hover:no-underline text-inherit active:text-inherit">
+          <a href="#" class="bg-white inline-block py-2 px-4 font-semibold no-underline">
             Learning
           </a>
         </li>

app/views/settings/_profile.html.erb

@@ -34,7 +34,7 @@
     <label class="block">
       <p class="font-bold mb-1">Avatar</p>
       <p class="text-gray-500">Default profile picture</p>
-      <div class="flex flex-col sm:flex-row items-center gap-6">
+      <div class="flex items-center gap-6">
         <% if @user.avatar.attached? %>
           <p class="flex-none">
             <%= image_tag image_url_for(@user.avatar), class: "h-24 w-24 rounded-lg" %>

config/routes.rb

@@ -15,8 +15,6 @@ Rails.application.routes.draw do
   match 'signup/:step', to: 'signup#steps', as: :signup_steps, via: [:get, :post]
   post 'signup_validate', to: 'signup#validate'
 
-  get 'privacy', to: 'pages#privacy', as: :privacy_page
-  get 'tos',     to: 'pages#tos',     as: :tos_page
 
   get "users/:username/avatars/:hash", to: "avatars#show", as: :user_avatar