Skip to content

Commit

Permalink
Merge pull request #97 from accrazed/More-Fixes
Browse files Browse the repository at this point in the history
Theming for report and forward popups
  • Loading branch information
accrazed authored Nov 13, 2024
2 parents ea64554 + 480c7c1 commit 59f2174
Show file tree
Hide file tree
Showing 14 changed files with 310 additions and 59 deletions.
1 change: 1 addition & 0 deletions NieR-Cursor.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
.contents_f9f2ca,
textarea,
.textAreaSlate_d0696b div div,
.textAreaSlate_bdf0de div div,
input {
cursor: url("https://accrazed.github.io/YoRHA-UI-BetterDiscord/assets/cursors/Hack_Text_Select_v2.cur"), default !important;
}
Expand Down
193 changes: 162 additions & 31 deletions NieR-Import.theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -571,44 +571,39 @@ body,
padding-top: 4px;
}

.emojiRowText-2j4TNM {
.emojiRowText_dc1809 {
color: var(--color-mid);
}

.theme-dark .emojiAliasPlaceholder-3H_iZA {
.theme-dark .emojiAliasPlaceholder_dc1809 {
color: var(--color-low);
}

.theme-dark .emojiAliasInput-1y-NBz .emojiInput-1aLNse,
.input-2g-os5 {
.theme-dark .emojiRow_dc1809 .emojiAliasInput_dc1809 > .input_f8bc55 {
background-color: var(--color-high);
border-radius: 0;
border: 2px solid var(--color-low);
color: var(--color-low);
}
.theme-dark .emojiAliasInput-1y-NBz .emojiInput-1aLNse:hover,
.input-2g-os5:hover {
border-color: var(--color-mid);
.theme-dark .emojiRow_dc1809 .emojiAliasInput_dc1809 > .input_f8bc55:hover {
border-color: var(--color-high);
}
.theme-dark .emojiAliasInput-1y-NBz .emojiInput-1aLNse.focused-1AtTHC, .theme-dark .emojiAliasInput-1y-NBz .emojiInput-1aLNse:focus,
.input-2g-os5.focused-1AtTHC,
.input-2g-os5:focus {
.theme-dark .emojiRow_dc1809 .emojiAliasInput_dc1809 > .input_f8bc55:focus {
border-color: var(--color-alert);
}
.theme-dark .emojiAliasInput-1y-NBz .emojiInput-1aLNse::-webkit-input-placeholder, .input-2g-os5::-webkit-input-placeholder {
.theme-dark .emojiRow_dc1809 .emojiAliasInput_dc1809 > .input_f8bc55::-webkit-input-placeholder {
color: var(--color-mid);
}
.theme-dark .emojiAliasInput-1y-NBz .emojiInput-1aLNse::-moz-placeholder, .input-2g-os5::-moz-placeholder {
.theme-dark .emojiRow_dc1809 .emojiAliasInput_dc1809 > .input_f8bc55::-moz-placeholder {
color: var(--color-mid);
}
.theme-dark .emojiAliasInput-1y-NBz .emojiInput-1aLNse:-ms-input-placeholder, .input-2g-os5:-ms-input-placeholder {
.theme-dark .emojiRow_dc1809 .emojiAliasInput_dc1809 > .input_f8bc55:-ms-input-placeholder {
color: var(--color-mid);
}
.theme-dark .emojiAliasInput-1y-NBz .emojiInput-1aLNse::-ms-input-placeholder, .input-2g-os5::-ms-input-placeholder {
.theme-dark .emojiRow_dc1809 .emojiAliasInput_dc1809 > .input_f8bc55::-ms-input-placeholder {
color: var(--color-mid);
}
.theme-dark .emojiAliasInput-1y-NBz .emojiInput-1aLNse::placeholder,
.input-2g-os5::placeholder {
.theme-dark .emojiRow_dc1809 .emojiAliasInput_dc1809 > .input_f8bc55::placeholder {
color: var(--color-mid);
}

Expand Down Expand Up @@ -884,7 +879,7 @@ body,
margin: 0;
}

.colorStreamerMode_cb7f84,
.notice_be03aa.colorStreamerMode_be03aa,
.akaBadge__27cd4 {
-webkit-box-shadow: none;
box-shadow: none;
Expand Down Expand Up @@ -1765,20 +1760,17 @@ foreignObject[mask="url(#svg-mask-status-dnd)"] .status-2DiCMd {
height: 353px !important;
}

.theme-dark .mentioned_d5deea .mention.interactive:hover {
color: var(--color-low);
}
.theme-dark .mentioned_d5deea .anchor_af404b {
text-shadow: 1px 1px 2px var(--color-low), 0 0 25px var(--color-high), 0 0 5px var(--color-alert);
}
.theme-dark .wrapper_bf1b19 {
.theme-dark .wrapper_bf1b19.interactive {
background: var(--color-alert-trans);
color: var(--color-high);
border-radius: 0px;
}
.theme-dark .wrapper_bf1b19:hover {
.theme-dark .wrapper_bf1b19.interactive:hover {
color: var(--color-alert);
background: var(--color-high);
text-decoration: none;
}

.mouse-mode.full-motion .replying_d5deea, .mouse-mode.full-motion .replying_d5deea:hover {
Expand Down Expand Up @@ -1873,11 +1865,15 @@ foreignObject[mask="url(#svg-mask-status-dnd)"] .status-2DiCMd {
}

.container_a6d69a,
.container_d1c246,
.container_d1c246:not(.container_d1c246.floating_d1c246),
.theme-dark .form_a7d72e:before {
background: transparent;
}

.container_d1c246.floating_d1c246 {
background-color: var(--color-high-mid);
}

.channelTextArea_d0696b {
width: 100%;
}
Expand Down Expand Up @@ -2270,7 +2266,7 @@ foreignObject[mask="url(#svg-mask-status-dnd)"] .status-2DiCMd {
color: var(--color-low) !important;
}

.chat_d6c7e0:before {
.chat_f57fdc:before {
display: none;
}

Expand Down Expand Up @@ -2354,6 +2350,35 @@ strong {
display: none;
}

.scroller_fea3ef.none_c49869.scrollerBase_c49869 .tutorialContainer_f9623d .listItem_c96c45 {
height: 57px;
}
.scroller_fea3ef.none_c49869.scrollerBase_c49869 .tutorialContainer_f9623d .listItem_c96c45 .pill_f9623d,
.scroller_fea3ef.none_c49869.scrollerBase_c49869 .tutorialContainer_f9623d .listItem_c96c45 .item_c4cd66 {
height: 57px !important;
}
.scroller_fea3ef.none_c49869.scrollerBase_c49869 .tutorialContainer_f9623d .listItem_c96c45 .wrapperSimple_c5f96a {
height: 57px;
}
.scroller_fea3ef.none_c49869.scrollerBase_c49869 div:has(.listItem_c96c45 .pill_f36a5a) {
height: 55px !important;
padding-bottom: 0px;
margin-bottom: 12px;
}
.scroller_fea3ef.none_c49869.scrollerBase_c49869 div:has(.listItem_c96c45 .pill_f36a5a):before {
content: "";
position: absolute;
bottom: -4px; /* Position the pseudo-element at the bottom */
left: 50%; /* Start at the center of the container */
width: 75%; /* 75% width from the center */
-webkit-transform: translateX(-50%);
transform: translateX(-50%); /* Offset by 50% to keep it centered */
border-bottom: 2px solid var(--color-low-trans); /* Your border style */
}
.scroller_fea3ef.none_c49869.scrollerBase_c49869 .listItem_c96c45:has(.guildSeparator_d0c57e) {
display: none;
}

.wrapperSimple_c5f96a {
border-radius: 0;
}
Expand Down Expand Up @@ -2750,14 +2775,14 @@ strong {
background-repeat: no-repeat;
}

.theme-dark .scroller_c47fa9,
.scroller_c47fa9.scroller_c47fa9,
.scroller_ad8f79,
.scroller__244e5,
.applicationStore_cecc86,
.nowPlayingColumn_c2739c,
.container_bf550a,
.theme-dark .inset_ac5d22,
.theme-dark .container_c2739c {
.container_c2739c.container_c2739c {
background-color: transparent;
}

Expand Down Expand Up @@ -3079,7 +3104,7 @@ strong {
height: 100%;
background-size: 5px 5px;
background-image: linear-gradient(90deg, transparent, transparent 4px, rgba(0, 0, 0, 0.07) 5px), linear-gradient(transparent, transparent 4px, rgba(0, 0, 0, 0.07) 5px);
z-index: 10000;
z-index: 1500;
opacity: 0.75;
-webkit-user-select: none;
-moz-user-select: none;
Expand Down Expand Up @@ -4528,7 +4553,8 @@ foreignObject[mask="url(#svg-mask-status-offline)"] .status_c7d26b {
display: none;
}
.theme-dark .focusLock_f9a4c9 .modalCloseButton_e1cc86,
.theme-dark .focusLock_f9a4c9 .modalClose_e5da2b {
.theme-dark .focusLock_f9a4c9 .modalClose_e5da2b,
.theme-dark .focusLock_f9a4c9 .closeButton_e89716 {
z-index: 2;
color: var(--color-high);
top: 4px;
Expand Down Expand Up @@ -4611,6 +4637,98 @@ foreignObject[mask="url(#svg-mask-status-offline)"] .status_c7d26b {
letter-spacing: 4px;
color: var(--color-high);
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9:has(> .header_d0585c) {
width: 600px;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_d0585c.header_d0585c {
padding: 4px 12px 4px 12px;
background-color: var(--color-low);
border-radius: 0px;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_d0585c.header_d0585c .titleLine_d0585c {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-ms-flex-direction: row;
flex-direction: row;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_d0585c.header_d0585c .titleLine_d0585c .title_d0585c {
-ms-grid-column: 2;
grid-column: 2;
margin: 0 0 0 12px;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_d0585c.header_d0585c .titleLine_d0585c .title_d0585c .defaultColor_a595eb,
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_d0585c.header_d0585c .titleLine_d0585c .title_d0585c .defaultColor_e42ec6 {
margin-left: 0 !important;
color: var(--color-high) !important;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_d0585c.header_d0585c .titleLine_d0585c .closeButton_d0585c {
z-index: 2;
color: var(--color-high);
top: 4px;
right: 4px;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_d0585c.header_d0585c .container_c18ec9 {
-ms-grid-column: 1;
-ms-grid-column-span: 2;
grid-column: 1/span 2;
color: var(--color-high) !important;
text-align: left;
padding: 0px;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_d0585c.header_d0585c::before {
content: none;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_d0585c.header_d0585c .titleLine_d0585c::before {
-ms-grid-column: 1;
grid-column: 1;
display: block;
content: "";
height: 16px;
width: 16px;
max-height: 16px;
max-width: 16px;
min-height: 16px;
min-width: 16px;
background-color: var(--color-high);
-ms-grid-row-align: center;
align-self: center;
-ms-grid-column-align: center;
justify-self: center;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_e89716 {
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-ms-flex-direction: row;
flex-direction: row;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_e89716 .defaultColor_e42ec6,
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_e89716 .text-md\/normal_dc00ef {
color: var(--color-high) !important;
text-align: left;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_e89716 .defaultColor_e42ec6:not(.text-md\/normal_dc00ef),
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .header_e89716 .text-md\/normal_dc00ef:not(.text-md\/normal_dc00ef) {
text-transform: uppercase;
letter-spacing: 4px;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .headerContainer_b58b14 {
display: -ms-grid;
display: grid;
}
.theme-dark .focusLock_f9a4c9 .small_f9a4c9 .headerContainer_b58b14::before {
-ms-grid-column: 1;
grid-column: 1;
}
.theme-dark .focusLock_f9a4c9 .modalSize_e1cc86 .segmentContainer_d7ec26 .divider_bcb954 {
display: none;
}
Expand Down Expand Up @@ -4714,6 +4832,7 @@ foreignObject[mask="url(#svg-mask-status-offline)"] .status_c7d26b {
opacity: 0;
-webkit-transition: opacity 0.175s ease-in-out;
transition: opacity 0.175s ease-in-out;
pointer-events: none;
}
.theme-dark .focusLock_f9a4c9 .footer_f9a4c9 .lookFilled_dd4f85:hover::before,
.theme-dark .focusLock_f9a4c9 .footer_f9a4c9 .lookLink_dd4f85:hover::before {
Expand Down Expand Up @@ -4749,12 +4868,14 @@ foreignObject[mask="url(#svg-mask-status-offline)"] .status_c7d26b {
color: var(--color-low);
margin: 0 0 0 12px;
}
.theme-dark .focusLock_f9a4c9 .footer_f9a4c9 :hover:not(.checkboxWrapper_f6cde8, .checkboxWrapper_f6cde8 *) {
.theme-dark .focusLock_f9a4c9 .footer_f9a4c9 .lookFilled_dd4f85:hover:not(.checkboxWrapper_f6cde8, .checkboxWrapper_f6cde8 *),
.theme-dark .focusLock_f9a4c9 .footer_f9a4c9 .lookLink_dd4f85:hover:not(.checkboxWrapper_f6cde8, .checkboxWrapper_f6cde8 *) {
-webkit-box-shadow: 3px 3px var(--color-mid-trans);
box-shadow: 3px 3px var(--color-mid-trans);
background-color: var(--color-low) !important;
}
.theme-dark .focusLock_f9a4c9 .footer_f9a4c9 :hover:not(.checkboxWrapper_f6cde8, .checkboxWrapper_f6cde8 *) .contents_dd4f85 {
.theme-dark .focusLock_f9a4c9 .footer_f9a4c9 .lookFilled_dd4f85:hover:not(.checkboxWrapper_f6cde8, .checkboxWrapper_f6cde8 *) .contents_dd4f85,
.theme-dark .focusLock_f9a4c9 .footer_f9a4c9 .lookLink_dd4f85:hover:not(.checkboxWrapper_f6cde8, .checkboxWrapper_f6cde8 *) .contents_dd4f85 {
pointer-events: none;
color: var(--color-high) !important;
}
Expand All @@ -4763,6 +4884,16 @@ foreignObject[mask="url(#svg-mask-status-offline)"] .status_c7d26b {
-ms-flex: none;
flex: none;
}
.theme-dark .focusLock_f9a4c9 .footer_f9a4c9.footerWithMessage_d0585c {
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
padding: 0;
}
.theme-dark .focusLock_f9a4c9 .footer_f9a4c9.footerWithMessage_d0585c .textArea_bdf0de {
background-color: var(--color-mid-trans);
}

.layer_d4b6c5,
.scroller_ff90b2,
Expand Down
2 changes: 1 addition & 1 deletion NightImport.theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
--color-high: rgb(87, 84, 74);
--color-high-mid: rgb(53, 53, 50);
--color-low: rgb(217, 215, 206);
--color-mid: rgb(60, 60, 60);
--color-mid: rgb(151, 147, 129);
--color-alert: rgb(205, 102, 77);
--color-high-trans: rgba(87, 84, 74, 0.6);
--color-low-trans: rgba(217, 213, 195, 0.8);
Expand Down
1 change: 1 addition & 0 deletions src/_cursor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
.contents_f9f2ca,
textarea,
.textAreaSlate_d0696b div div,
.textAreaSlate_bdf0de div div,
input {
cursor: url('https://accrazed.github.io/YoRHA-UI-BetterDiscord/assets/cursors/Hack_Text_Select_v2.cur'),
default !important;
Expand Down
12 changes: 4 additions & 8 deletions src/app/_app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ body,
.wordmarkWindows_a934d8 {
color: transparent;
}

.wordmarkWindows_a934d8::before {
content: 'For the Glory of Mankind';
font-size: 12px;
Expand Down Expand Up @@ -58,23 +57,20 @@ body,
padding-top: 4px;
}
// Input text
.emojiRowText-2j4TNM {
.emojiRowText_dc1809 {
color: $mid;
}
.theme-dark .emojiAliasPlaceholder-3H_iZA {
.theme-dark .emojiAliasPlaceholder_dc1809 {
color: $low;
}
.theme-dark .emojiAliasInput-1y-NBz .emojiInput-1aLNse,
.input-2g-os5 {
.theme-dark .emojiRow_dc1809 .emojiAliasInput_dc1809 > .input_f8bc55 {
background-color: $high;
border-radius: 0;
border: 2px solid $low;
color: $low;

&:hover {
border-color: $mid;
border-color: $high;
}
&.focused-1AtTHC,
&:focus {
border-color: $alert;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
@include titlify(3px, 4px);
margin: 0;
}
.colorStreamerMode_cb7f84, // Streamer mode Notif
.notice_be03aa.colorStreamerMode_be03aa, // Streamer mode Notif
.akaBadge__27cd4 // AKA badge
{
box-shadow: none;
Expand Down
Loading

0 comments on commit 59f2174

Please sign in to comment.