Skip to content

Commit

Permalink
Merge pull request #4434 from AnabolicsAnonymous/style
Browse files Browse the repository at this point in the history
  • Loading branch information
HDVinnie authored Jan 22, 2025
2 parents 126cc85 + 3c965f3 commit 64d08ec
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 7 deletions.
1 change: 1 addition & 0 deletions resources/sass/layout/_secondary-nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.secondary-nav {
display: grid;
grid-template-columns: 1fr auto 1fr;
box-shadow: var(--secondary-nav-box-shadow);
background-color: var(--secondary-nav-bg);
margin: 0;
padding: 0 18px;
Expand Down
1 change: 1 addition & 0 deletions resources/sass/themes/_cosmic-void.scss
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@
--scrollbar-color: #ffffff13;

--secondary-nav-bg: #292929;
--secondary-nav-box-shadow: none;
--secondary-nav-tab-fg: #aaa;
--secondary-nav-tab-bg: inherit;
--secondary-nav-tab-active-text-decoration: underline #777 2px;
Expand Down
1 change: 1 addition & 0 deletions resources/sass/themes/_galactic.scss
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@
--scrollbar-color: #ffffff19;

--secondary-nav-bg: #292929;
--secondary-nav-box-shadow: none;
--secondary-nav-tab-fg: #aaa;
--secondary-nav-tab-bg: inherit;
--secondary-nav-tab-active-text-decoration: underline #777 2px;
Expand Down
1 change: 1 addition & 0 deletions resources/sass/themes/_light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@
--scrollbar-color: #0004;

--secondary-nav-bg: #e2e2e2;
--secondary-nav-box-shadow: none;
--secondary-nav-tab-fg: #222;
--secondary-nav-tab-bg: inherit;
--secondary-nav-tab-active-text-decoration: underline #222 2px;
Expand Down
1 change: 1 addition & 0 deletions resources/sass/themes/_material-design-v3-amoled.scss
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@
--scrollbar-color: #0004;

--secondary-nav-bg: #000;
--secondary-nav-box-shadow: none;
--secondary-nav-tab-fg: #fff;
--secondary-nav-tab-bg: inherit;
--secondary-nav-tab-active-text-decoration: underline #ddd 2px;
Expand Down
1 change: 1 addition & 0 deletions resources/sass/themes/_material-design-v3-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@
--scrollbar-color: #0004;

--secondary-nav-bg: #221e24;
--secondary-nav-box-shadow: none;
--secondary-nav-tab-fg: #999;
--secondary-nav-tab-bg: inherit;
--secondary-nav-tab-active-text-decoration: underline #0099ff 2px;
Expand Down
1 change: 1 addition & 0 deletions resources/sass/themes/_material-design-v3-light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@
--scrollbar-color: #0004;

--secondary-nav-bg: #f4f4f4;
--secondary-nav-box-shadow: none;
--secondary-nav-tab-fg: #050505;
--secondary-nav-tab-bg: inherit;
--secondary-nav-tab-active-text-decoration: underline #0099ff 2px;
Expand Down
11 changes: 6 additions & 5 deletions resources/sass/themes/_material-design-v3-navy.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
--bbcode-input-bg: #0c0e15;

--bbcode-rendered-fg-default: #c9d1d9;
--bbcode-rendered-fg-muted: #fff;
--bbcode-rendered-fg-muted: #808080;
--bbcode-rendered-fg-subtle: #484f58;
--bbcode-rendered-canvas-default: transparent;
--bbcode-rendered-canvas-subtle: #313131;
Expand Down Expand Up @@ -253,14 +253,15 @@

--scrollbar-color: #0004;

--secondary-nav-bg: #0c0e15;
--secondary-nav-bg: #08090f;
--secondary-nav-box-shadow: 0 8px 10px 0 rgba(0, 0, 0, 0.3);
--secondary-nav-tab-fg: #fff;
--secondary-nav-tab-bg: inherit;
--secondary-nav-tab-active-text-decoration: underline #0099ff 2px;
--secondary-nav-tab-hover-fg: #fff;
--secondary-nav-tab-hover-bg: transparent;
--secondary-nav-tab-hover-text-decoration: underline #0088ff 2px;
--secondary-nav-tab-menu-bg: #0c0e15;
--secondary-nav-tab-menu-bg: #08090f;
--secondary-nav-tab-menu-fg: inherit;
--secondary-nav-tab-menu-border: none;
--secondary-nav-tab-menu-border-radius: 6px;
Expand Down Expand Up @@ -330,7 +331,7 @@
--torrent-group-bg: #0f111a;
--torrent-group-header-bg: #0f111a;
--torrent-group-text: #fff;
--torrent-group-text-muted: #fff;
--torrent-group-text-muted: #999999;
--torrent-group-table-stripe-even: rgba(0, 0, 0, 0.18);
--torrent-group-table-stripe-odd: rgba(0, 0, 0, 0.1);
--torrent-group-hover-brightness-emphasis: 1.13;
Expand Down Expand Up @@ -560,7 +561,7 @@ a {
}

.text-muted {
color: #0e111c;
color: #808080;
}

hr {
Expand Down
1 change: 1 addition & 0 deletions resources/sass/themes/_nord.scss
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@
--scrollbar-color: #ffffff19;

--secondary-nav-bg: #242933;
--secondary-nav-box-shadow: none;
--secondary-nav-tab-fg: #d8dee9;
--secondary-nav-tab-bg: inherit;
--secondary-nav-tab-active-text-decoration: transparent #81a1c1 2px;
Expand Down
1 change: 1 addition & 0 deletions resources/sass/themes/_revel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@
--scrollbar-color: #ffffff19;

--secondary-nav-bg: #292929;
--secondary-nav-box-shadow: none;
--secondary-nav-tab-fg: #aaa;
--secondary-nav-tab-bg: inherit;
--secondary-nav-tab-active-text-decoration: none;
Expand Down
6 changes: 4 additions & 2 deletions resources/views/Staff/donation/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<th>Upload #</th>
<th>Invite #</th>
<th>Bonus #</th>
<th>Lenght</th>
<th>Length</th>
<th>Status</th>
<th>{{ __('common.actions') }}</th>
</tr>
Expand All @@ -51,7 +51,9 @@
<td>
<x-user_tag :user="$donation->user" :anon="false" />
</td>
<td>{{ $donation->transaction }}</td>
<td style="max-width: 80ch; word-wrap: break-word; white-space: normal">
{{ $donation->transaction }}
</td>
<td
class="{{ $donation->package->trashed() ? 'text-danger' : '' }}"
title="{{ $donation->package->trashed() ? 'Package has been deleted' : '' }}"
Expand Down

0 comments on commit 64d08ec

Please sign in to comment.