trim base css of most redundant classes

css/base.css

@@ -106,48 +106,6 @@ div.card:contains(section.banner.footer) {
     padding-bottom: 0px;
 }
 
-.tab-button {
-    font-size: 2rem;
-}
-
-.al {
-    text-align: left;
-}
-
-.ar {
-    text-align: right;
-}
-
-.ac {
-    text-align: center;
-}
-
-.w-100 {
-    width: 100%;
-}
-
-.h-100 {
-    height: 100%;
-}
-
-.inline-block {
-    display: inline-block;
-}
-
-.align-top {
-    align-items: top;
-}
-
-.flex-expand {
-    display: flex;
-    justify-content: space-between;
-}
-
-.flex-row-group {
-    display: block;
-    flex-grow: 1;
-}
-
 .row {
     display: flex;
     flex-wrap: wrap;
@@ -172,23 +130,7 @@ span.sm:not(.heading) {
     margin: .25rem;
 }
 
-.flex-col {
+/* Who knows for half of these to be honest */
-    display: flex;
-    flex-direction: column;
-}
-
-.flex-form {
-    display: flex;
-    flex-direction: column;
-}
-
-@media screen and (min-width: 768px) {
-    .flex-form {
-        flex: 1;
-        margin: 0.5rem;
-    }
-}
-
 @media screen and (max-width: 400px) {
     .row {
         flex-direction: column;
@@ -219,69 +161,6 @@ sup.\~critical, .text-critical {
     font-size: 1rem;
 }
 
-.inv-created-users strong,p {
-    padding-left: 0.5rem;
-    padding-bottom: 0.2rem;
-}
-
-.inv-created-users.empty strong,p {
-    padding: 0;
-}
-
-.inv {
-    overflow: visible;
-}
-
-.inv-table {
-    font-size: 0.8rem;
-}
-
-.inv-profilearea {
-    min-width: 20%;
-}
-
-.inv-profileselect {
-    min-width: 100%;
-}
-
-.inv-codearea {
-    max-width: 40%;
-    min-width: 10rem;
-    display: flex;
-    justify-content: start;
-    align-items: center;
-}
-
-.inv-empty .inv-codearea {
-    justify-content: start;
-}
-
-
-.invite-link {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    width: auto;
-}
-
-.ellipsis {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-}
-
-.no-pad {
-    padding: 0px 0px 0px 0px;
-}
-
-.elem-pad > * {
-    margin: var(--spacing-4, 1rem);
-}
-
-.icon.clickable {
-    padding: 0.5rem 0.6rem;
-}
-
 .input {
     box-sizing: border-box; /* fixes weird length issue with inputs */
 }
@@ -300,10 +179,6 @@ sup.\~critical, .text-critical {
     width: 100%;
 }
 
-.flex-auto {
-    flex: auto;
-}
-
 .center {
     justify-content: center;
 }
@@ -312,14 +187,6 @@ sup.\~critical, .text-critical {
     align-items: center;
 }
 
-.no-lp {
-    padding-left: 0px;
-}
-
-.block {
-    display: block;
-}
-
 .focused {
     display: block;
 }
@@ -416,7 +283,16 @@ table {
     color: var(--color-content);
 }
 
+table.table.manual-pad th, table.table.manual-pad td {
+    padding: 0;
+}
 
+table.table-p-0 th, table.table-p-0 td {
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+}
 
 p.top {
     margin-top: 0px;

html/admin.html

@@ -50,24 +50,24 @@
                 <p>{{ .strings.commitNoun }} <span class="text-black dark:text-white font-mono bg-inherit">{{ .commit }}</span></p>
                 <p>{{ .strings.buildTime }} <span class="text-black dark:text-white font-mono bg-inherit">{{ .buildTime }}</span></p>
                 <p>{{ .strings.builtBy }} <span class="text-black dark:text-white font-mono bg-inherit">{{ .builtBy }}</span></p>
-                <div class="row col flex">
+                <div class="flex flex-row flex-wrap gap-2 my-2">
-                    <a class="button ~neutral mr-2 mt-4 mb-4 lang-link" href="https://github.com/hrfee/jfa-go"><i class="ri-github-line mr-2"></i>github</a>
+                    <a class="button ~neutral lang-link" href="https://github.com/hrfee/jfa-go"><i class="ri-github-line mr-2"></i>github</a>
-                    <a class="button ~urge mt-4 mb-4 mr-2 lang-link" href="https://wiki.jfa-go.com">wiki/docs</a>
+                    <a class="button ~urge lang-link" href="https://wiki.jfa-go.com">wiki/docs</a>
-                    <a class="button ~positive mt-4 mb-4 mr-2 lang-link" href="https://weblate.jfa-go.com">translation</a>
+                    <a class="button ~positive lang-link" href="https://weblate.jfa-go.com">translation</a>
-                    <div class="dropdown mr-2" tabindex="0">
+                    <div class="dropdown" tabindex="0">
-                        <a href="https://github.com/sponsors/hrfee" target="_blank" class="button ~info mt-4 mb-4 dropdown-button lang-link">
+                        <a href="https://github.com/sponsors/hrfee" target="_blank" class="button ~info dropdown-button lang-link">
                             <i class="ri-hand-heart-line mr-2"></i>
                             donate
                             <span class="ml-2 chev"></span>
                         </a>
                         <div class="dropdown-display">
                             <div class="card ~neutral @low">
-                                <a href="https://github.com/sponsors/hrfee" target="_blank" class="button ~neutral mb-2 w-100 lang-link">GitHub</a>
+                                <a href="https://github.com/sponsors/hrfee" target="_blank" class="button ~neutral mb-2 w-full lang-link">GitHub</a>
-                                <a href="https://ko-fi.com/hrfee" target="_blank" class="button ~neutral mb-2 w-100 lang-link">Ko-fi</a>
+                                <a href="https://ko-fi.com/hrfee" target="_blank" class="button ~neutral mb-2 w-full lang-link">Ko-fi</a>
                             </div>
                         </div>
                     </div>
-                    <a class="button ~urge mt-4 mb-4 @low discord lang-link" href="https://discord.com/invite/MrtvuQmyhP" target="_blank"><i class="ri-discord-line mr-2"></i>discord</a>
+                    <a class="button ~urge @low discord lang-link" href="https://discord.com/invite/MrtvuQmyhP" target="_blank"><i class="ri-discord-line mr-2"></i>discord</a>
                 </div>
                 <p><a href="https://github.com/hrfee/jfa-go/blob/main/LICENSE">Available under the MIT License. Font "Hanken Grotesk" available under SIL OFL 1.1 License.</a></p>
                 <pre class="font-mono bg-inherit">{{ .license }}</pre>
@@ -84,11 +84,11 @@
                 <span class="heading"><span id="header-modify-user"></span> <span class="modal-close">&times;</span></span>
                 <p class="content my-4">{{ .strings.modifySettingsDescription }}</p>
                 <div class="flex flex-row mb-4">
-                    <label class="flex-row-group mr-2">
+                    <label class="grow mr-2">
                         <input type="radio" name="modify-user-source" class="unfocused" id="radio-use-profile" checked>
                         <span class="button ~neutral @high supra full-width center">{{ .strings.profile }}</span>
                     </label>
-                    <label class="flex-row-group ml-2">
+                    <label class="grow ml-2">
                         <input type="radio" name="modify-user-source" class="unfocused" id="radio-use-user">
                         <span class="button ~neutral @low supra full-width center">{{ .strings.user }}</span>
                     </label>
@@ -115,11 +115,11 @@
                 <span class="heading"><span id="header-enable-referrals-user"></span> <span class="modal-close">&times;</span></span>
                 <p class="content my-4">{{ .strings.enableReferralsDescription }}</p>
                 <div class="flex flex-row mb-4">
-                    <label class="flex-row-group mr-2">
+                    <label class="grow mr-2">
                         <input type="radio" name="enable-referrals-user-source" class="unfocused" id="radio-referrals-use-profile" checked>
                         <span class="button ~neutral @high supra full-width center">{{ .strings.profile }}</span>
                     </label>
-                    <label class="flex-row-group ml-2">
+                    <label class="grow ml-2">
                         <input type="radio" name="enable-referrals-user-source" class="unfocused" id="radio-referrals-use-invite">
                         <span class="button ~neutral @low supra full-width center">{{ .strings.invite }}</span>
                     </label>
@@ -259,7 +259,7 @@
                             <input type="text" class="input ~neutral @low mb-2 mt-4">
                             <p class="support">{{ .strings.templateEnterName }}</p>
                         </label>
-                        <div class="row flex-expand">
+                        <div class="flex flex-row justify-between">
                             <label>
                                 <input type="submit" class="unfocused">
                                 <span class="button ~urge @low center supra submit">{{ .strings.send }}</span>
@@ -278,7 +278,7 @@
             <div class="card relative mx-auto my-[10%] w-11/12 sm:w-4/5 lg:w-1/3">
                 <span class="heading">{{ .strings.customizeMessages }} <span class="modal-close">&times;</span></span>
                 <p class="content my-4">{{ .strings.customizeMessagesDescription }}</p>
-                <div class="table-responsive">
+                <div class="">
                     <table class="table">
                         <thead>
                             <tr>
@@ -329,7 +329,7 @@
             </div>
         </div>
         <div id="modal-backups" class="modal">
-            <div class="card relative mx-auto my-[10%] w-11/12 sm:w-4/5 lg:w-1/3">
+            <div class="card relative mx-auto my-[10%] w-11/12 sm:w-4/5 lg:w-2/3">
                 <span class="heading">{{ .strings.backups }} <span class="modal-close">&times;</span></span>
                 <div class="content my-4">
                     {{ .strings.backupsDescription }}
@@ -365,7 +365,7 @@
                 <p class="content my-4" id="settings-backed-up-location"></p>
                 <p class="content my-4">{{ .strings.backupCanDownload }}</p>
                 <div>
-                    <button class="button flex w-100 ~info @low mb-2"><span class="flex items-center" id="settings-backed-up-download">{{ .strings.download }}</span></button>
+                    <button class="button flex w-full ~info @low mb-2"><span class="flex items-center" id="settings-backed-up-download">{{ .strings.download }}</span></button>
                 </div>
             </div>
         </div>
@@ -396,7 +396,7 @@
             </form>
         </div>
         <div id="modal-user-profiles" class="modal">
-            <div class="relative mx-auto my-[10%] w-4/5 lg:w-2/3 content card">
+            <div class="relative mx-auto my-[10%] w-11/12 sm:w-4/5 lg:w-2/3 content card">
                 <span class="heading">{{ .strings.userProfiles }} <span class="modal-close">&times;</span></span>
                 <p class="content my-4">{{ .strings.userProfilesDescription }}</p>
                 <div class="table-responsive">
@@ -445,7 +445,7 @@
             </form>
         </div>
         <div id="modal-update" class="modal">
-            <div class="relative mx-auto my-[10%] w-4/5 lg:w-2/3 content card">
+            <div class="relative mx-auto my-[10%] w-11/12 sm:w-4/5 lg:w-1/3 content card">
                 <span class="heading">{{ .strings.updates }} <span class="modal-close">&times;</span></span>
                 <p class="content">
                     <h2 class="mt-2">
@@ -549,11 +549,11 @@
             <div id="tab-invites">
                 <div class="card @low invites dark:~d_neutral mb-4 overflow-visible">
                     <span class="heading">{{ .strings.invites }}</span>
-                    <div id="invites"></div>
+                    <div id="invites" class="mt-2"></div>
                 </div>
                 <div class="card @low dark:~d_neutral">
                     <span class="heading">{{ .strings.create }}</span>
-                    <div class="flex flex-col md:flex-row gap-3" id="create-inv">
+                    <div class="flex flex-col md:flex-row gap-3 mt-2" id="create-inv">
                         <div class="card ~neutral @low flex flex-col gap-2 w-1/2">
                             <div class="flex flex-row gap-2">
                                 <label class="w-1/2">
@@ -708,13 +708,13 @@
             </div>
             <div id="tab-accounts" class="unfocused">
                 <div class="card @low dark:~d_neutral accounts mb-4 overflow-visible">
-                    <div id="accounts-filter-dropdown" class="dropdown manual z-10 w-100">
+                    <div id="accounts-filter-dropdown" class="dropdown manual z-10 w-full">
                         <div class="flex flex-col md:flex-row align-middle gap-2">
                             <div class="flex flex-row align-middle justify-between md:justify-normal">
                                 <span class="text-3xl font-bold mr-4">{{ .strings.accounts }}</span>
-                                <span class="dropdown-manual-toggle"><button class="h-100 button ~neutral @low center" id="accounts-filter-button" tabindex="0">{{ .strings.filters }}</button></span>
+                                <span class="dropdown-manual-toggle"><button class="h-full button ~neutral @low center" id="accounts-filter-button" tabindex="0">{{ .strings.filters }}</button></span>
                             </div>
-                            <div class="flex flex-row align-middle w-100">
+                            <div class="flex flex-row align-middle w-full">
                                 <input type="search" class="field ~neutral @low input search mr-2" id="accounts-search" placeholder="{{ .strings.search }}">
                                 <span class="button ~neutral @low center ml-[-2.64rem] rounded-s-none accounts-search-clear" aria-label="{{ .strings.clearSearch }}" text="{{ .strings.clearSearch }}"><i class="ri-close-line"></i></span>
                             </div>
@@ -734,7 +734,7 @@
                     <div class="flex flex-row flex-wrap gap-3 mb-4">
                         <span class="button ~neutral @low center " id="accounts-add-user">{{ .quantityStrings.addUser.Singular }}</span>
                         <div id="accounts-announce-dropdown" class="dropdown pb-0i " tabindex="0">
-                            <span class="w-100 button ~info @low center items-baseline" id="accounts-announce">{{ .strings.announce }}</span>
+                            <span class="w-full button ~info @low center items-baseline" id="accounts-announce">{{ .strings.announce }}</span>
                             <div class="dropdown-display">
                                 <div class="card ~neutral @low">
                                     <span class="supra sm">{{ .strings.templates }}</span>
@@ -747,7 +747,7 @@
                             <span class="button ~urge @low center " id="accounts-enable-referrals">{{ .strings.enableReferrals }}</span>
                         {{ end }}
                         <div id="accounts-expiry-dropdown" class="dropdown pb-0i " tabindex="0">
-                            <span class="w-100 button ~positive @low center items-baseline" id="accounts-expiry-dropdown-button">{{ .strings.expiry }} <i class="ri-arrow-down-s-line ml-2"></i></span>
+                            <span class="w-full button ~positive @low center items-baseline" id="accounts-expiry-dropdown-button">{{ .strings.expiry }} <i class="ri-arrow-down-s-line ml-2"></i></span>
                             <div class="dropdown-display">
                                 <div class="card ~neutral @low">
                                     <span class="button ~warning full-width @low center" id="accounts-extend-expiry">{{ .strings.extendExpiry }}</span>
@@ -756,7 +756,7 @@
                             </div>
                         </div>
                         <div id="accounts-disable-enable-dropdown" class="dropdown manual pb-0i " tabindex="0">
-                            <span class="w-100 button ~positive @low center" id="accounts-disable-enable">{{ .strings.disable }}</span>
+                            <span class="w-full button ~positive @low center" id="accounts-disable-enable">{{ .strings.disable }}</span>
                             <div class="dropdown-display">
                                 <div class="card ~neutral @low">
                                     <span class="button ~urge full-width accounts-announce-template-button" id="accounts-enable-expiry">{{ .strings.setExpiry }}</span>
@@ -807,16 +807,16 @@
             </div>
             <div id="tab-activity" class="unfocused">
                 <div class="card @low dark:~d_neutral activity mb-4 overflow-visible">
-                    <div id="activity-filter-dropdown" class="dropdown manual z-10 w-100" tabindex="0">
+                    <div id="activity-filter-dropdown" class="dropdown manual z-10 w-full" tabindex="0">
                         <div class="flex flex-col md:flex-row align-middle gap-2">
                             <div class="flex flex-row align-middle justify-between md:justify-normal">
                                 <span class="text-3xl font-bold mr-4">{{ .strings.activity }}</span>
                                 <div class="flex flex-row align-middle">
-                                    <span class="dropdown-manual-toggle"><button class="h-100 button ~neutral @low center" id="activity-filter-button">{{ .strings.filters }}</button></span>
+                                    <span class="dropdown-manual-toggle"><button class="h-full button ~neutral @low center" id="activity-filter-button">{{ .strings.filters }}</button></span>
                                     <button class="button ~neutral @low ml-2" id="activity-sort-direction">{{ .strings.sortDirection }}</button>
                                 </div>
                             </div>
-                            <div class="flex flex-row align-middle w-100">
+                            <div class="flex flex-row align-middle w-full">
                                 <input type="search" class="field ~neutral @low input search mr-2" id="activity-search" placeholder="{{ .strings.search }}">
                                 <span class="button ~neutral @low center ml-[-2.64rem] rounded-s-none activity-search-clear" aria-label="{{ .strings.clearSearch }}" text="{{ .strings.clearSearch }}"><i class="ri-close-line"></i></span>
                                 <button class="button ~info @low ml-2" id="activity-refresh" aria-label="{{ .strings.refresh }}" disabled><i class="ri-refresh-line"></i></button>
@@ -872,7 +872,7 @@
                                 <span class="ml-2">{{ .strings.advancedSettings }} </span>
                             </label>
                         </div>
-                        <div class="flex flex-row justify-start md:justify-end gap-2 w-100">
+                        <div class="flex flex-row justify-start md:justify-end gap-2 w-full">
                             <span class="button ~neutral @low" id="settings-logs">{{ .strings.logs }}</span>
                             <span class="button ~info @low" id="settings-backups">{{ .strings.backups }}</span>
                             <span class="button ~neutral @low" id="settings-restart">{{ .strings.settingsRestart }}</span>
@@ -881,7 +881,7 @@
                     </div>
                     <div class="flex flex-col md:flex-row gap-3">
                         <div class="card @low dark:~d_neutral col" id="settings-sidebar">
-                            <div class="flex-expand">
+                            <div class="flex flex-row justify-between">
                                 <input type="search" class="field ~neutral @low input settings-section-button justify-between mb-2" id="settings-search" placeholder="{{ .strings.search }}">
                                 <button class="button ~neutral @low center -ml-10 rounded-s-none mb-2 settings-search-clear" aria-label="{{ .strings.clearSearch }}" text="{{ .strings.clearSearch }}"><i class="ri-close-line"></i></button>
                             </div>

html/crash.html

@@ -18,7 +18,7 @@
                     <a class="button ~critical mb-4" target="_blank" href="https://github.com/hrfee/jfa-go/issues/new/choose">Create an Issue</a>
                 </section>
                 <section class="section ~neutral @low">
-                    <div class="flex-expand">
+                    <div class="flex flex-row justify-between">
                         <span class="subheading">Full Log</span>
                         <span class="button ~urge ml-4" id="copy-log">Copy</span>
                     </div>

html/login-modal.html

@@ -11,11 +11,11 @@
                 {{ if and .userPageEnabled .showUserPageLink }}
                 <div class="card mx-2 flex-initial w-[100%] lg:w-[35%] mb-4 lg:mb-0 dark:~d_neutral @low content">
                     <span class="heading row">{{ .strings.loginNotAdmin }}</span>
-                    <a class="button ~info h-12 w-100" href="{{ .urlBase }}/my/account"><i class="ri-account-circle-fill mr-2"></i>{{ .strings.myAccount }}</a>
+                    <a class="button ~info h-12 w-full" href="{{ .urlBase }}/my/account"><i class="ri-account-circle-fill mr-2"></i>{{ .strings.myAccount }}</a>
                 </div>
             {{ end }}
         {{ end }}
-        <form class="card mx-2 flex-auto form-login w-[100%] lg:w-[55%] mb-0" href="">
+        <form class="card mx-2 form-login w-[100%] lg:w-[55%] mb-0" href="">
             <span class="heading">{{ .strings.login }}</span>
             <input type="text" class="field input ~neutral @high mt-4 mb-2" placeholder="{{ .strings.username }}" id="login-user">
             <input type="password" class="field input ~neutral @high mb-4" placeholder="{{ .strings.password }}" id="login-password">

html/password-reset.html

@@ -35,7 +35,7 @@
                 <aside class="aside ~warning">
                     {{ .strings.changeYourPassword }}
                 </aside>
-                <span class="button ~urge @low w-100 text-center text-xl p-1 mt-4" id="pin" title="{{ .strings.copy }}">{{ .pin }}</span>
+                <span class="button ~urge @low w-full text-center text-xl p-1 mt-4" id="pin" title="{{ .strings.copy }}">{{ .pin }}</span>
                 {{ end }}
             </div>
             <i class="content">{{ .contactMessage }}</i>

html/setup.html

@@ -30,7 +30,7 @@
                 <div class="row col flex center">
                     <p class="content my-2">{{ .lang.StartPage.pressStart }}</p>
                 </div>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="support">{{ .lang.StartPage.httpsNotice }}</span>
                     <span class="button ~urge @low next">{{ .lang.StartPage.start }}</span>
                 </section>
@@ -59,7 +59,7 @@
                         </select>
                     </div>
                 </label>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                 </section>
@@ -150,7 +150,7 @@
                         </label>
                     </div>
                 </div>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                 </section>
@@ -189,7 +189,7 @@
                         <span class="support mb-2 mt-1">{{ .lang.Login.emailNotice }}</span>
                     </label>
                 </div>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
                 </section>
@@ -235,7 +235,7 @@
                         </label>
                     </div>
                 </div>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
                         <span class="button ~urge @low" id="jellyfin-test-connection">{{ .lang.JellyfinEmby.testConnection }}</span>
@@ -258,7 +258,7 @@
                     <input type="text" class="input ~neutral @low mt-4" id="ombi-api_key">
                     <p class="support mb-2 mt-1">{{ .lang.Ombi.apiKeyNotice }}</p>
                 </label>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
                         <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
@@ -273,7 +273,7 @@
                     <input type="checkbox" class="mr-2" id="userpage-enabled"><span>{{ .lang.Strings.enabled }}</span>
                 </label>
                 <p class="support mb-1 mt-1">{{ .lang.UserPage.requiredSettings }}</p>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
                         <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
@@ -370,7 +370,7 @@
                         </div>
                     </div>
                 </div>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
                         <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
@@ -392,7 +392,7 @@
                     <span class="mt-4">{{ .lang.Strings.emailSubject }}</span>
                     <input type="text" class="input ~neutral @low mt-4 mb-2" id="welcome_email-subject" placeholder="{{ .emailLang.WelcomeEmail.title }}">
                 </label>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
                         <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
@@ -413,7 +413,7 @@
                     <span class="mt-4">{{ .lang.Strings.emailSubject }}</span>
                     <input type="text" class="input ~neutral @low mt-4 mb-2" id="invite_emails-subject" placeholder="{{ .emailLang.InviteEmail.title }}">
                 </label>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
                         <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
@@ -450,7 +450,7 @@
                     <span class="mt-4">{{ .lang.Strings.emailSubject }}</span>
                     <input type="text" class="input ~neutral @low mt-4 mb-2" id="password_resets-subject" placeholder="{{ .emailLang.PasswordReset.title }}">
                 </label>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
                         <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
@@ -483,7 +483,7 @@
                     <span class="mt-4">{{ .lang.PasswordValidation.special }}</span>
                     <input type="number" class="input ~neutral @low mt-4 mb-2" id="password_validation-special" value="0">
                 </label>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
                         <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>
@@ -513,7 +513,7 @@
                     <input type="text" class="input ~neutral @low mt-4" id="email-message">
                     <p class="support mb-2 mt-1">{{ .lang.HelpMessages.emailMessageNotice }}</p>
                 </label>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <span class="button ~neutral @low back">{{ .lang.Strings.back }}</span>
                     <div>
                         <span class="button ~urge @low next">{{ .lang.Strings.next }}</span>

html/user.html

@@ -109,10 +109,10 @@
             <div class="card @low dark:~d_neutral mb-4" id="card-user">
                 <span class="heading mb-2"></span>
             </div>
-            <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
+            <div class="columns-1 sm:columns-2 gap-4" id="user-cardlist">
                 {{ if index . "PageMessageEnabled" }}
                     {{ if .PageMessageEnabled }}
-                        <div class="card @low dark:~d_neutral content" id="card-message">
+                        <div class="card @low dark:~d_neutral content break-words" id="card-message">
                             {{ .PageMessageContent }}
                         </div>
                     {{ end }}
@@ -162,7 +162,7 @@
                         <div class="card @low dark:~d_neutral unfocused" id="card-referrals">
                             <span class="heading mb-2">{{ .strings.referrals }}</span>
                             <aside class="aside ~neutral my-4 col user-referrals-description"></aside>
-                            <div class="row flex-expand">
+                            <div class="flex flex-row justify-between gap-2">
                                 <div class="user-referrals-info"></div>
                                 <div class="grid my-2">
                                     <button type="button" class="user-referrals-button button ~info dark:~d_info @low" title="Copy">{{ .strings.copyReferral }}<i class="ri-file-copy-line ml-2"></i></button>

site/index.html

@@ -129,7 +129,7 @@ sudo apt-get install jfa-go-tray
                         <a class="button ~info mr-2 mb-2 lang-link" target="_blank" href="https://aur.archlinux.org/packages/jfa-go-git">arch (aur git)</a>
                     </div>
                 </div>
-                <section class="section ~neutral banner footer flex-expand middle">
+                <section class="section ~neutral banner footer flex flex-row justify-between middle">
                     <a href="https://github.com/hrfee/jfa-go/blob/main/LICENSE" class="support">© 2023 Harvey Tindall</a>
                 </section>
             </div>

ts/modules/accounts.ts

@@ -218,13 +218,13 @@ class user implements User, SearchableItem {
                     </div>
                     <div class="supra sm mb-2 accounts-unlink-header">${window.lang.strings("unlink")}:</div>
                     <div class="accounts-unlink-telegram"> 
-                        <button class="button ~critical mb-2 w-100">Telegram</button>
+                        <button class="button ~critical mb-2 w-full">Telegram</button>
                     </div>
                     <div class="accounts-unlink-discord"> 
-                        <button class="button ~critical mb-2 w-100">Discord</button>
+                        <button class="button ~critical mb-2 w-full">Discord</button>
                     </div>
                     <div class="accounts-unlink-matrix"> 
-                        <button class="button ~critical mb-2 w-100">Matrix</button>
+                        <button class="button ~critical mb-2 w-full">Matrix</button>
                     </div>
                 </div>
             </div>
@@ -1271,7 +1271,7 @@ export class accountsList {
             dList.textContent = '';
             for (let name of list) {
                 const el = document.createElement("div") as HTMLDivElement;
-                el.classList.add("flex-expand", "ellipsis", "mt-2");
+                el.classList.add("flex", "flex-row", "justify-between", "truncate", "mt-2");
                 el.innerHTML = `
                 <span class="button ~neutral sm full-width accounts-announce-template-button">${name}</span><span class="button ~critical fr ml-4 accounts-announce-template-delete">&times;</span>
                 `;

ts/modules/captcha.ts

@@ -51,7 +51,7 @@ export class Captcha {
                 this.captchaID = this.isPWR ? this.code : req.response["id"];
                 // the Math.random() appearance below is used for PWRs, since they don't have a unique captchaID. The parameter is ignored by the server, but tells the browser to reload the image.
                 document.getElementById("captcha-img").innerHTML = `
-                <img class="w-100" src="${window.location.toString().substring(0, window.location.toString().lastIndexOf("/invite"))}/captcha/img/${this.code}/${this.isPWR ? Math.random() : this.captchaID}${this.isPWR ? "?pwr=true" : ""}"></img>
+                <img class="w-full" src="${window.location.toString().substring(0, window.location.toString().lastIndexOf("/invite"))}/captcha/img/${this.code}/${this.isPWR ? Math.random() : this.captchaID}${this.isPWR ? "?pwr=true" : ""}"></img>
                 `;
                 this.input.value = "";
             }

ts/modules/invites.ts

@@ -115,10 +115,10 @@ class DOMInvite implements Invite {
             chip.classList.remove("~neutral");
             chip.classList.remove("~critical");
             chip.classList.remove("button");
-            chip.parentElement.classList.remove("h-100");
+            chip.parentElement.classList.remove("h-full");
         } else {
             chip.classList.add("button");
-            chip.parentElement.classList.add("h-100");
+            chip.parentElement.classList.add("h-full");
             if (address.includes("Failed")) {
                 icon.classList.remove("ri-mail-line");
                 icon.classList.add("ri-mail-close-line");
@@ -146,10 +146,11 @@ class DOMInvite implements Invite {
         }
         this._right.classList.remove("empty");
         let innerHTML = `
-        <table class="table inv-table">
+        <table class="table inv-table table-p-0">
             <thead>
                 <tr>
                     <th>${window.lang.strings("name")}</th>
+                    <th class="w-2"></th>
                     <th>${window.lang.strings("date")}</th>
                 </tr>
             </thead>
@@ -159,6 +160,7 @@ class DOMInvite implements Invite {
             innerHTML += `
                 <tr>
                     <td>${username}</td>
+                    <td class="w-2"></td>
                     <td>${toDateString(new Date(uB[username] * 1000))}</td>
                 </tr>
             `;
@@ -266,7 +268,7 @@ class DOMInvite implements Invite {
     constructor(invite: Invite) {
         // first create the invite structure, then use our setter methods to fill in the data.
         this._container = document.createElement('div') as HTMLDivElement;
-        this._container.classList.add("inv", "overflow-y-visible");
+        this._container.classList.add("inv", "overflow-visible");
 
         this._header = document.createElement('div') as HTMLDivElement;
         this._container.appendChild(this._header);
@@ -274,10 +276,10 @@ class DOMInvite implements Invite {
 
         this._codeArea = document.createElement('div') as HTMLDivElement;
         this._header.appendChild(this._codeArea);
-        this._codeArea.classList.add("flex", "flex-row", "flex-wrap", "justify-between", "w-100", "items-baseline", "gap-2", "truncate");
+        this._codeArea.classList.add("flex", "flex-row", "flex-wrap", "justify-between", "w-full", "items-baseline", "gap-2", "truncate");
         this._codeArea.innerHTML = `
         <div class="flex items-baseline gap-x-4 gap-y-2 truncate">
-            <a class="invite-link text-black dark:text-white font-mono bg-inherit" href=""></a>
+            <a class="invite-link text-black dark:text-white font-mono bg-inherit truncate" href=""></a>
             <span class="button ~info @low" title="${window.lang.strings("copy")}"><i class="ri-file-copy-line"></i></span>
         </div>
         <span class="inv-duration"></span>
@@ -303,12 +305,12 @@ class DOMInvite implements Invite {
         this._infoArea.classList.add("inv-infoarea", "flex", "flex-row", "items-baseline", "gap-2");
         this._infoArea.innerHTML = `
         <div class="tooltip below darker" tabindex="0">
-            <span class="inv-email-chip h-100"><i></i></span>
+            <span class="inv-email-chip h-full"><i></i></span>
             <span class="content sm p-1"></span>
         </div>
-        <span class="button ~critical @low inv-delete h-100">${window.lang.strings("delete")}</span>
+        <span class="button ~critical @low inv-delete h-full">${window.lang.strings("delete")}</span>
         <label>
-            <i class="icon clickable ri-arrow-down-s-line not-rotated"></i>
+            <i class="icon px-2.5 py-2 ri-arrow-down-s-line not-rotated"></i>
             <input class="inv-toggle-details unfocused" type="checkbox">
         </label>
         `;
@@ -327,17 +329,20 @@ class DOMInvite implements Invite {
 
         this._details = document.createElement('div') as HTMLDivElement;
         this._container.appendChild(this._details);
-        this._details.classList.add("card", "~neutral", "@low", "mt-2", "no-pad", "inv-details");
+        this._details.classList.add("card", "~neutral", "@low", "mt-2", "inv-details");
         const detailsInner = document.createElement('div') as HTMLDivElement;
         this._details.appendChild(detailsInner);
-        detailsInner.classList.add("inv-row", "flex-expand", "row", "elem-pad", "align-top");
+        detailsInner.classList.add("inv-row", "flex", "flex-row", "flex-wrap", "justify-between", "gap-4");
 
         this._left = document.createElement('div') as HTMLDivElement;
+        this._left.classList.add("flex", "flex-row", "flex-wrap", "gap-4", "min-w-full", "sm:min-w-fit", "whitespace-nowrap");
         detailsInner.appendChild(this._left);
-        this._left.classList.add("inv-profilearea");
+        const leftLeft = document.createElement("div") as HTMLDivElement;
+        this._left.appendChild(leftLeft);
+        leftLeft.classList.add("inv-profilearea", "min-w-full", "sm:min-w-fit");
         let innerHTML = `
         <p class="supra mb-2 top">${window.lang.strings("profile")}</p>
-        <div class="select ~neutral @low inv-profileselect inline-block mb-2">
+        <div class="select ~neutral @low inv-profileselect min-w-full inline-block mb-2">
             <select>
                 <option value="noProfile" selected>${window.lang.strings("inviteNoProfile")}</option>
             </select>
@@ -356,7 +361,7 @@ class DOMInvite implements Invite {
             </label>
             `;
         }
-        this._left.innerHTML = innerHTML;
+        leftLeft.innerHTML = innerHTML;
         (this._left.querySelector("select") as HTMLSelectElement).onchange = this.updateProfile;
         
         if (window.notificationsEnabled) {
@@ -368,20 +373,21 @@ class DOMInvite implements Invite {
         }
 
         this._middle = document.createElement('div') as HTMLDivElement;
-        detailsInner.appendChild(this._middle);
+        this._left.appendChild(this._middle);
-        this._middle.classList.add("block");
+        this._middle.classList.add("flex", "flex-col", "justify-between");
         this._middle.innerHTML = `
-        <p class="supra mb-4 top">${window.lang.strings("inviteDateCreated")} <strong class="inv-created"></strong></p>
+        <p class="supra top">${window.lang.strings("inviteDateCreated")} <strong class="inv-created"></strong></p>
-        <p class="supra mb-4">${window.lang.strings("inviteRemainingUses")} <strong class="inv-remaining"></strong></p>
+        <p class="supra">${window.lang.strings("inviteRemainingUses")} <strong class="inv-remaining"></strong></p>
-        <p class="supra mb-4"><span class="user-expiry"></span> <strong class="user-expiry-time"></strong></p>
+        <p class="supra"><span class="user-expiry"></span> <strong class="user-expiry-time"></strong></p>
-        <p class="mb-4 flex items-center"><span class="user-label-label supra mr-2"></span> <span class="user-label chip ~blue unfocused"></span></p>
+        <p class="flex items-center"><span class="user-label-label supra mr-2"></span> <span class="user-label chip ~blue unfocused"></span></p>
         `;
 
         this._right = document.createElement('div') as HTMLDivElement;
         detailsInner.appendChild(this._right);
-        this._right.classList.add("card", "~neutral", "@low", "inv-created-users");
+        this._right.classList.add("card", "~neutral", "@low", "inv-created-users", "min-w-full", "sm:min-w-fit", "whitespace-nowrap");
-        this._right.innerHTML = `<strong class="supra table-header">${window.lang.strings("inviteUsersCreated")}</strong>`;
+        this._right.innerHTML = `<span class="supra table-header">${window.lang.strings("inviteUsersCreated")}</span>`;
         this._userTable = document.createElement('div') as HTMLDivElement;
+        this._userTable.classList.add("text-sm", "mt-1", );
         this._right.appendChild(this._userTable);
 
 
@@ -474,8 +480,8 @@ export class inviteList implements inviteList {
             this._list.classList.add("empty");
             this._list.innerHTML = `
             <div class="inv inv-empty">
-                <div class="card dark:~d_neutral @low inv-header flex-expand mt-2">
+                <div class="card dark:~d_neutral @low inv-header mt-2">
-                    <div class="inv-codearea">
+                    <div class="justify-start">
                         <span class="text-black dark:text-white font-mono bg-inherit">${window.lang.strings("inviteNoInvites")}</span>
                     </div>
                 </div>

ts/modules/lang.ts

@@ -83,7 +83,7 @@ export const loadLangSelector = (page: string) => {
             let innerHTML = '';
             for (let code in req.response) {
                 queryString.set("lang", code);
-                innerHTML += `<a href="?${queryString.toString()}" class="button w-100 al justify-start ~neutral mb-2 lang-link">${req.response[code]}</a>`;
+                innerHTML += `<a href="?${queryString.toString()}" class="button w-full text-left justify-start ~neutral mb-2 lang-link">${req.response[code]}</a>`;
                 queryString.delete("lang");
             }
             list.innerHTML = innerHTML;

ts/modules/profiles.ts

@@ -86,7 +86,7 @@ class profile implements Profile {
             <td><span class="button @low profile-referrals"></span></td>
         `;
         innerHTML += `
-            <td class="profile-from ellipsis"></td>
+            <td class="profile-from truncate"></td>
             <td class="profile-libraries"></td>
             <td><span class="button ~critical @low">${window.lang.strings("delete")}</span></td>
         `;

ts/user.ts

@@ -144,9 +144,9 @@ class ContactMethods {
 
     append = (name: string, details: MyDetailsContactMethod, icon: string, addEditFunc?: (add: boolean) => void, required?: boolean) => {
         const row = document.createElement("div");
-        row.classList.add("flex", "flex-expand", "my-2", "flex-nowrap");
+        row.classList.add("flex", "flex-row", "justify-between", "my-2", "flex-nowrap");
         let innerHTML = `
-            <div class="flex items-baseline flex-nowrap ellipsis">
+            <div class="flex items-baseline flex-nowrap truncate">
                 <span class="shield ~urge" alt="${name}">
                     <span class="icon">
                         ${icon}
@@ -637,10 +637,10 @@ document.addEventListener("details-reload", () => {
 
             if (typeof(messageCard) != "undefined" && messageCard != null) {
                 messageCard.innerHTML = messageCard.innerHTML.replace(new RegExp("{username}", "g"), details.username);
-                setBestRowSpan(messageCard, false);
+                // setBestRowSpan(messageCard, false);
                 // contactCard.querySelector(".content").classList.add("h-100");
             } else if (!statusCard.classList.contains("unfocused")) {
-                setBestRowSpan(passwordCard, true);
+                // setBestRowSpan(passwordCard, true);
             }
 
             if (window.referralsEnabled) {
@@ -649,15 +649,69 @@ document.addEventListener("details-reload", () => {
                         if (req.readyState != 4 || req.status != 200) return; 
                         const referral: MyReferral = req.response as MyReferral;
                         referralCard.update(referral);
+                        setCardOrder(messageCard);
                     });
                 } else {
                     referralCard.hide();
+                    setCardOrder(messageCard);
                 }
+            } else {
+                setCardOrder(messageCard);
             }
         }
     });
 });
 
+const setCardOrder = (messageCard: HTMLElement) => {
+    const cards = document.getElementById("user-cardlist");
+    const children = Array.from(cards.children);
+    const idxs = [...Array(cards.childElementCount).keys()]
+    // The message card is the first element and should always be so, so remove it from the list.
+    const hasMessageCard = !(typeof(messageCard) == "undefined" || messageCard == null);
+    if (hasMessageCard) idxs.shift();
+    const perms = generatePermutations(idxs);
+    let minHeight = 999999;
+    let minHeightPerm: [number[], number[]];
+    for (let perm of perms) {
+        let leftHeight = 0;
+        for (let idx of perm[0]) {
+            leftHeight += (cards.children[idx] as HTMLElement).offsetHeight;
+        }
+        if (hasMessageCard) leftHeight += (cards.children[0] as HTMLElement).offsetHeight;
+        let rightHeight = 0;
+        for (let idx of perm[1]) {
+            rightHeight += (cards.children[idx] as HTMLElement).offsetHeight;
+        }
+        let height = Math.max(leftHeight, rightHeight);
+        // console.log("got height", leftHeight, rightHeight, height, "for", perm);
+        if (height < minHeight) {
+            minHeight = height;
+            minHeightPerm = perm;
+        }
+    }
+
+    const gapDiv = () => {
+        const g = document.createElement("div");
+        g.classList.add("my-4");
+        return g;
+    };
+
+    let addValue = hasMessageCard ? 1 : 0;
+    // if (hasMessageCard) cards.appendChild(children[0]);
+    if (hasMessageCard) cards.appendChild(gapDiv());
+    for (let side of minHeightPerm) {
+        for (let i = 0; i < side.length; i++) {
+            // (cards.children[side[i]] as HTMLElement).style.order = (i+addValue).toString();
+            children[side[i]].remove();
+            cards.appendChild(children[side[i]]);
+            cards.appendChild(gapDiv());
+        }
+        // addValue += side.length;
+    }
+
+    console.log("Shortest order:", minHeightPerm);
+};
+
 const login = new Login(window.modals.login as Modal, "/my/", "opaque");
 login.onLogin = () => {
     console.log("Logged in.");
@@ -699,6 +753,24 @@ const computeRealHeight = (el: HTMLElement): number => {
     return total;
 }
 
+const generatePermutations = (xs: number[]): [number[], number[]][] => {
+    const l = xs.length;
+    let out: [number[], number[]][] = [];
+    for (let i = 0; i < (l << 1); i++) {
+        let incl = [];
+        let excl = [];
+        for (let j = 0; j < l; j++) {
+            if (i & (1 << j)) {
+                incl.push(xs[j]);
+            } else {
+                excl.push(xs[j]);
+            }
+        }
+        out.push([incl, excl]);
+    }
+    return out;
+}
+
 login.bindLogout(document.getElementById("logout-button"));
 
 login.login("", "");