Fix styling issues caused by Bootstrap upgrade

Kovah · Aug 1, 2023 · 576b576 · 576b576
1 parent ede3de6
commit 576b576
Show file tree

Hide file tree

Showing 32 changed files with 63 additions and 58 deletions.
diff --git a/resources/assets/sass/_variables-dark.scss b/resources/assets/sass/_variables-dark.scss
@@ -21,7 +21,7 @@ $teal: #20c997;
 $cyan: #5bc0de;
 
 $primary: $blue;
-$secondary: $gray-500;
+$secondary: $gray-400;
 $success: $green;
 $info: $cyan;
 $warning: $yellow;
@@ -71,8 +71,7 @@ $color-contrast-light: $black;
 // Body
 $body-bg: $darkmode-bg-darker;
 $body-color: $gray-300;
-$body-color-pale: $gray-400;
-$body-color-muted: $gray-600;
+$body-color-pale: $gray-500;
 
 
 // Components
@@ -90,6 +89,7 @@ $headings-color: $white;
 
 // Tables
 $table-color: $white;
+$table-bg: $darkmode-bg;
 $table-accent-bg: rgba($white, .05);
 $table-hover-bg: $gray-900;
 
@@ -99,6 +99,7 @@ $table-dark-border-color: $table-border-color;
 $table-dark-color: $white;
 
 
+
 // Forms
 $input-bg: $gray-800;
 $input-disabled-bg: $darkmode-bg-darkest;
@@ -140,7 +141,7 @@ $pagination-hover-border-color: $darkmode-bg;
 $pagination-active-bg: $gray-800;
 $pagination-active-border-color: $darkmode-bg;
 
-$pagination-disabled-color: $body-color-muted;
+$pagination-disabled-color: $body-color-pale;
 $pagination-disabled-bg: transparent;
 $pagination-disabled-border-color: $pagination-border-color;
 
@@ -161,6 +162,7 @@ $list-group-bg: $darkmode-bg;
 $list-group-color: $body-color;
 $list-group-border-color: $darkmode-bg-darker;
 
+$list-group-hover-bg: $darkmode-bg-dark;
 $list-group-hover-bg: $darkmode-bg-dark;
 $list-group-active-color: $white;
 $list-group-active-bg: $list-group-hover-bg;
@@ -169,6 +171,7 @@ $list-group-active-border-color: $list-group-border-color;
 $list-group-disabled-color: $gray-700;
 
 $list-group-action-color: $white;
+$list-group-action-hover-color: $white;
 $list-group-action-active-color: $white;
 $list-group-action-active-bg: $darkmode-bg-dark;
 

diff --git a/resources/assets/sass/_variables.scss b/resources/assets/sass/_variables.scss
@@ -94,7 +94,7 @@ $enable-caret: false;
 // Body
 $body-color: $black;
 $body-bg: $white;
-$body-secondary-color: $gray-600;
+$body-color-pale: $gray-500;
 
 
 // Links
@@ -120,8 +120,6 @@ $font-weight-normal: 400;
 $font-size-base: 1rem;
 $font-size-xs: $font-size-base * .75;
 
-$text-muted: $body-secondary-color;
-
 
 // Tables
 $table-dark-bg: $gray-900;
@@ -137,7 +135,7 @@ $input-btn-padding-x-xs: .3rem;
 $input-btn-font-size-xs: $font-size-xs;
 $input-btn-line-height-xs: $line-height-sm;
 
-$input-placeholder-color: $text-muted;
+$input-placeholder-color: $body-color-pale;
 
 $input-btn-border-width: $border-width;
 

diff --git a/resources/assets/sass/custom/_app.scss b/resources/assets/sass/custom/_app.scss
@@ -75,7 +75,7 @@ body:not(.bookmarklet) {
     }
 
     label {
-      color: $text-muted;
+      color: $body-color-pale;
       cursor: pointer;
     }
 
@@ -108,7 +108,7 @@ a.badge {
 }
 
 .text-pale {
-  color: $body-secondary-color;
+  color: $body-color-pale !important;
 }
 
 .btn-xs {

diff --git a/resources/assets/sass/custom/_fixes.scss b/resources/assets/sass/custom/_fixes.scss
@@ -33,3 +33,7 @@
   white-space: normal;
   max-width: 100%;
 }
+
+.table > :not(caption) > * > * {
+  box-shadow: none !important;
+}
diff --git a/resources/assets/sass/third-party/tom-select/_variables-dark.scss b/resources/assets/sass/third-party/tom-select/_variables-dark.scss
@@ -24,7 +24,7 @@ $select-color-dropdown-border-top: $input-border-color;
 $select-color-dropdown-border-top: $darkmode-bg-dark;
 $select-color-dropdown-item-active: $darkmode-bg-dark;
 $select-color-dropdown-item-active-text: $body-color;
-$select-color-dropdown-item-create-text: $body-color-muted;
+$select-color-dropdown-item-create-text: $body-color-pale;
 $select-color-dropdown-item-create-active-text: $body-color;
 $select-opacity-disabled: 0.5;
 $select-shadow-input: none;

diff --git a/resources/views/app/search/partials/table.blade.php b/resources/views/app/search/partials/table.blade.php
@@ -29,7 +29,7 @@
                         {{ $link->shortUrl() }}
                     </a>
                 </td>
-                <td class="text-muted small">{!! $link->addedAt() !!}</td>
+                <td class="text-pale small">{!! $link->addedAt() !!}</td>
             </tr>
         @endforeach
         </tbody>

diff --git a/resources/views/app/settings/partials/system/general-settings.blade.php b/resources/views/app/settings/partials/system/general-settings.blade.php
@@ -41,7 +41,7 @@ class="simple-select {{ $errors->has('system_guest_access') ? ' is-invalid' : ''
                                 @lang('linkace.yes')
                             </option>
                         </select>
-                        <p class="small text-muted mt-1">@lang('settings.sys_guest_access_help')</p>
+                        <p class="small text-pale mt-1">@lang('settings.sys_guest_access_help')</p>
                         @if ($errors->has('system_guest_access'))
                             <p class="invalid-feedback" role="alert">
                                 {{ $errors->first('system_guest_access') }}
@@ -62,7 +62,7 @@ class="simple-select {{ $errors->has('system_guest_access') ? ' is-invalid' : ''
                         <textarea name="system_custom_header_content" id="system_custom_header_content" rows="4"
                             class="form-control{{ $errors->has('system_custom_header_content') ? ' is-invalid' : '' }}"
                         >{{ old('system_custom_header_content', systemsettings('system_custom_header_content')) }}</textarea>
-                        <p class="small text-muted mt-1">@lang('settings.sys_custom_header_content_help')</p>
+                        <p class="small text-pale mt-1">@lang('settings.sys_custom_header_content_help')</p>
 
                         @error('system_custom_header_content')
                         <p class="invalid-feedback" role="alert">

diff --git a/resources/views/app/settings/partials/user/app-settings/archive-backups.blade.php b/resources/views/app/settings/partials/user/app-settings/archive-backups.blade.php
@@ -23,7 +23,7 @@ class="form-select{{ $errors->has('archive_backups_enabled') ? ' is-invalid' : '
                         @lang('linkace.no')
                     </option>
                 </select>
-                <p class="text-muted small mt-1">@lang('settings.archive_backups_enabled_help')</p>
+                <p class="text-pale small mt-1">@lang('settings.archive_backups_enabled_help')</p>
                 @if ($errors->has('archive_backups_enabled'))
                     <p class="invalid-feedback" role="alert">
                         {{ $errors->first('archive_backups_enabled') }}
@@ -50,7 +50,7 @@ class="form-select{{ $errors->has('archive_private_backups_enabled') ? ' is-inva
                         @lang('linkace.no')
                     </option>
                 </select>
-                <p class="text-muted small mt-1">@lang('settings.archive_private_backups_enabled_help')</p>
+                <p class="text-pale small mt-1">@lang('settings.archive_private_backups_enabled_help')</p>
                 @if ($errors->has('archive_private_backups_enabled'))
                     <p class="invalid-feedback" role="alert">
                         {{ $errors->first('archive_private_backups_enabled') }}

diff --git a/resources/views/app/settings/partials/user/app-settings/privacy.blade.php b/resources/views/app/settings/partials/user/app-settings/privacy.blade.php
@@ -21,7 +21,7 @@ class="form-select{{ $errors->has('links_private_default') ? ' is-invalid' : ''
                         @lang('linkace.yes')
                     </option>
                 </select>
-                <p class="text-muted small mt-1">@lang('settings.links_private_default_help')</p>
+                <p class="text-pale small mt-1">@lang('settings.links_private_default_help')</p>
                 @if ($errors->has('links_private_default'))
                     <p class="invalid-feedback" role="alert">
                         {{ $errors->first('links_private_default') }}
@@ -47,7 +47,7 @@ class="form-select{{ $errors->has('notes_private_default') ? ' is-invalid' : ''
                         @lang('linkace.yes')
                     </option>
                 </select>
-                <p class="text-muted small mt-1">@lang('settings.notes_private_default_help')</p>
+                <p class="text-pale small mt-1">@lang('settings.notes_private_default_help')</p>
                 @if ($errors->has('notes_private_default'))
                     <p class="invalid-feedback" role="alert">
                         {{ $errors->first('notes_private_default') }}
@@ -76,7 +76,7 @@ class="form-select{{ $errors->has('lists_private_default') ? ' is-invalid' : ''
                         @lang('linkace.yes')
                     </option>
                 </select>
-                <p class="text-muted small mt-1">@lang('settings.lists_private_default_help')</p>
+                <p class="text-pale small mt-1">@lang('settings.lists_private_default_help')</p>
                 @if ($errors->has('lists_private_default'))
                     <p class="invalid-feedback" role="alert">
                         {{ $errors->first('lists_private_default') }}
@@ -102,7 +102,7 @@ class="form-select{{ $errors->has('tags_private_default') ? ' is-invalid' : '' }
                         @lang('linkace.yes')
                     </option>
                 </select>
-                <p class="text-muted small mt-1">@lang('settings.tags_private_default_help')</p>
+                <p class="text-pale small mt-1">@lang('settings.tags_private_default_help')</p>
                 @if ($errors->has('tags_private_default'))
                     <p class="invalid-feedback" role="alert">
                         {{ $errors->first('tags_private_default') }}

diff --git a/resources/views/app/settings/partials/user/two-factor.blade.php b/resources/views/app/settings/partials/user/two-factor.blade.php
@@ -37,7 +37,7 @@
                     </div>
 
                     <details>
-                        <summary class="text-muted small">@lang('settings.two_factor_setup_url')</summary>
+                        <summary class="text-pale small">@lang('settings.two_factor_setup_url')</summary>
                         <code>{{ $user->twoFactorQrCodeUrl() }}</code>
                     </details>
 

diff --git a/resources/views/app/trash/index.blade.php b/resources/views/app/trash/index.blade.php
@@ -27,7 +27,7 @@
 
             @includeWhen($links->isNotempty(), 'app.trash.partials.link-table', ['links' => $links])
             @if($links->isEmpty())
-                <small class="text-muted">@lang('trash.delete_no_entries')</small>
+                <small class="text-pale">@lang('trash.delete_no_entries')</small>
             @endif
 
         </div>
@@ -52,7 +52,7 @@
 
             @includeWhen($lists->isNotEmpty(), 'app.trash.partials.list-table', ['lists' => $lists])
             @if($lists->isEmpty())
-                <small class="text-muted">@lang('trash.delete_no_entries')</small>
+                <small class="text-pale">@lang('trash.delete_no_entries')</small>
             @endif
 
         </div>
@@ -77,7 +77,7 @@
 
             @includeWhen($tags->isNotEmpty(), 'app.trash.partials.tag-table', ['tags' => $tags])
             @if($tags->isEmpty())
-                <small class="text-muted">@lang('trash.delete_no_entries')</small>
+                <small class="text-pale">@lang('trash.delete_no_entries')</small>
             @endif
 
         </div>
@@ -103,7 +103,7 @@
             @includeWhen($notes->isNotEmpty(), 'app.trash.partials.note-table', ['notes' => $notes])
 
             @if($notes->isEmpty())
-                <small class="text-muted">@lang('trash.delete_no_entries')</small>
+                <small class="text-pale">@lang('trash.delete_no_entries')</small>
             @endif
 
         </div>

diff --git a/resources/views/app/trash/partials/link-table.blade.php b/resources/views/app/trash/partials/link-table.blade.php
@@ -14,7 +14,7 @@
                 <td>
                     {{ $link->url }}
                 </td>
-                <td class="text-muted">
+                <td class="text-pale">
                     <small>{{ formatDateTime($link->created_at) }}</small>
                 </td>
                 <td class="text-end">

diff --git a/resources/views/app/trash/partials/list-table.blade.php b/resources/views/app/trash/partials/list-table.blade.php
@@ -14,7 +14,7 @@
                 <td>
                     {{ $list->name }}
                 </td>
-                <td class="text-muted">
+                <td class="text-pale">
                     <small>{{ formatDateTime($list->created_at) }}</small>
                 </td>
                 <td class="text-end">

diff --git a/resources/views/app/trash/partials/note-table.blade.php b/resources/views/app/trash/partials/note-table.blade.php
@@ -20,7 +20,7 @@
                 <td>
                     {{ $note->note }}
                 </td>
-                <td class="text-muted">
+                <td class="text-pale">
                     <small>{{ formatDateTime($note->created_at) }}</small>
                 </td>
                 <td class="text-end">

diff --git a/resources/views/app/trash/partials/tag-table.blade.php b/resources/views/app/trash/partials/tag-table.blade.php
@@ -14,7 +14,7 @@
                 <td>
                     {{ $tag->name }}
                 </td>
-                <td class="text-muted">
+                <td class="text-pale">
                     <small>{{ formatDateTime($tag->created_at) }}</small>
                 </td>
                 <td class="text-end">

diff --git a/resources/views/auth/login-form.blade.php b/resources/views/auth/login-form.blade.php
@@ -60,6 +60,6 @@
     </div>
 </div>
 
-<div class="text-center text-muted mt-3 small">
+<div class="text-center text-pale mt-3 small">
     {!! trans('linkace.forgot_password_link', ['reset_url' => route('password.request')]) !!}
 </div>
diff --git a/resources/views/guest/links/partials/single-card.blade.php b/resources/views/guest/links/partials/single-card.blade.php
@@ -10,12 +10,12 @@
                         {{ $link->shortTitle() }}
                     </a>
                     <br>
-                    <small class="text-muted">{{ $link->shortUrl() }}</small>
+                    <small class="text-pale">{{ $link->shortUrl() }}</small>
                 </div>
             </div>
         </div>
 
-        <div class="px-3 py-2 text-xs text-muted text-end">
+        <div class="px-3 py-2 text-xs text-pale text-end">
             @lang('linkace.added') {!! $link->addedAt() !!}
         </div>
     </div>

diff --git a/resources/views/guest/links/partials/single-detailed.blade.php b/resources/views/guest/links/partials/single-detailed.blade.php
@@ -9,7 +9,7 @@
                 <div>
                     <a href="{{ $link->url }}" {!! linkTarget() !!}>{{ $link->title }}</a>
                     <br>
-                    <small class="text-muted">{{ $link->shortUrl() }}</small>
+                    <small class="text-pale">{{ $link->shortUrl() }}</small>
                 </div>
             </div>
             <div class="ms-auto text-end">
@@ -45,12 +45,12 @@ class="btn btn-xs btn-light">
                         @endif
                     @endforeach
                 @else
-                    <span class="small text-muted">@lang('tag.no_tags')</span>
+                    <span class="small text-pale">@lang('tag.no_tags')</span>
                 @endif
 
             </div>
             <div class="col-12 col-sm-6 d-sm-flex align-items-sm-center justify-content-sm-end flex-wrap">
-                <div class="text-xs text-muted mt-3 mt-sm-0">
+                <div class="text-xs text-pale mt-3 mt-sm-0">
                     @lang('linkace.added') {!! $link->addedAt() !!}
                 </div>
             </div>

diff --git a/resources/views/guest/links/partials/single-simple.blade.php b/resources/views/guest/links/partials/single-simple.blade.php
@@ -7,7 +7,7 @@
             </a>
         </div>
         <div class="mt-2 mt-sm-0 ms-auto flex-shrink-0">
-            <small class="text-muted">{!! $link->domainOfURL() !!}</small>
+            <small class="text-pale">{!! $link->domainOfURL() !!}</small>
         </div>
     </div>
 </li>
diff --git a/resources/views/guest/links/partials/single-table.blade.php b/resources/views/guest/links/partials/single-table.blade.php
@@ -7,7 +7,7 @@
             {{ $link->url }}
         </a>
     </td>
-    <td class="text-muted">
+    <td class="text-pale">
         <small>
             {!! $link->addedAt() !!}
         </small>

diff --git a/resources/views/guest/links/partials/single.blade.php b/resources/views/guest/links/partials/single.blade.php
@@ -39,7 +39,7 @@ class="badge badge-primary">
                 </div>
 
             </div>
-            <div class="col-xs-12 col-sm-6 text-md-right text-muted">
+            <div class="col-xs-12 col-sm-6 text-md-right text-pale">
 
                 <div>
                     <small>

diff --git a/resources/views/guest/lists/partials/single.blade.php b/resources/views/guest/lists/partials/single.blade.php
@@ -8,7 +8,7 @@
         </div>
 
         <div class="py-2 px-3">
-            <div class="text-xs text-muted">
+            <div class="text-xs text-pale">
                 @if($list->links_count > 0)
                     {{ trans_choice('list.number_links', $list->links_count, ['number' => $list->links_count]) }}
                 @else

diff --git a/resources/views/models/links/partials/single-card-detailed.blade.php b/resources/views/models/links/partials/single-card-detailed.blade.php
@@ -27,7 +27,7 @@
                 <div>
                     <a href="{{ $link->url }}" {!! linkTarget() !!}>{{ $link->shortTitle() }}</a>
                     <br>
-                    <small class="text-muted">{{ $link->shortUrl() }}</small>
+                    <small class="text-pale">{{ $link->shortUrl() }}</small>
                 </div>
             </div>
         </div>
@@ -40,12 +40,12 @@
                     </a>
                 @endforeach
             @else
-                <span class="small text-muted">@lang('tag.no_tags')</span>
+                <span class="small text-pale">@lang('tag.no_tags')</span>
             @endif
         </div>
 
         <div class="d-flex align-items-center my-1">
-            <div class="text-muted text-xs me-3 ps-3">
+            <div class="text-pale text-xs me-3 ps-3">
                 @lang('linkace.added') {!! $link->addedAt() !!}
             </div>