Skip to content

Commit

Permalink
Merge pull request #81 from accrazed/Fixes
Browse files Browse the repository at this point in the history
Various Fixes
  • Loading branch information
accrazed authored Jul 30, 2024
2 parents 8e1df1a + e7e978e commit d6c97f9
Show file tree
Hide file tree
Showing 9 changed files with 117 additions and 45 deletions.
7 changes: 5 additions & 2 deletions src/_cursor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
default !important;
}
// Text
.timestamp_f9f2ca.latin24CompactTimeStamp_f9f2ca,
.timestamp_f9f2ca,
.searchBar-zdmu7v,
.contents_f9f2ca,
textarea,
Expand All @@ -20,7 +20,7 @@ input {
// Pointer
a,
button,
.folder-21wGz3,
.folder_bc7085, //Server Folders
.item-3eFBNF,
.css-gvi9bl-control,
.css-rzbxvl-option,
Expand All @@ -46,6 +46,9 @@ button,
.channelTabs-newTab, //Channel tabs Plugin
.channelTabs-closeTab, //Channel Tabs Plugin
.themed_a0, //I forgot what this one was
.peopleListItem_d51464, //Friends list
.voiceSectionDetails_cd82a7, //active now section in friends list
.applicationStreamingHoverWrapper_cd82a7, //hovering over stream in active now section
[role='button'],
[role='button'] header,
[type='checkbox'],
Expand Down
28 changes: 6 additions & 22 deletions src/channels/_public-channels.scss
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,16 @@
height: 100%;
}
.linkTop_d8bfb3,
.linkBottom_d8bfb3 { //Technically doesn't have a hover animation, uses the selection animation instead
.linkBottom_d8bfb3 { //Technically doesn't have a hover animation, uses the selected channel animation instead
animation-name: pulsingBackground;
animation-duration: 2.5s;
animation-iteration-count: infinite;
transform: scaleX(1);
}
}

}
.list_a478e5 { //Container that holds users in the VC
margin-top: 1.5px; //fix for some awkward bumping between the borders
}

// Voice channel limits
Expand All @@ -266,7 +268,7 @@
border-right-color: $alert;
}
}
.base__5ed84 {
.base_a4d4d9 {
border-radius: 0;
}
// Thread splines
Expand All @@ -289,22 +291,4 @@
margin-left: 0;
}

//Mention badge and unread coloring for threads (wtf discord, why is this so hard)
.typeThread_d8bfb3 {
.name_d8bfb3 {
position: absolute;
left: 1px;
max-width: 175px;
text-align: left;
&.overflow_c74e70 {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
.mentionsBadge_e2a798 {
position: absolute;
padding-left: 121px;
z-index: 1;
}
}

63 changes: 46 additions & 17 deletions src/chat/_embeds.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Embed card
.embedFull_ad0b71,
.embedFull_b0068a,
.messageContent_f9f2ca pre {
@include boxify($high, $mid, 4px);

Expand All @@ -22,48 +22,70 @@
}
}
// File attachments
.wrapperAudio_f316dd.newMosaicStyle_f316dd,
.attachment_a4623d.newMosaicStyle_a4623d,
.wrapperAudio_f72aac.newMosaicStyle_f72aac,
.attachment_b52bef.newMosaicStyle_b52bef,
.messageAttachmentMediaMosaic__67262 {
border-radius: 0;
}
.attachment_a4623d {
.attachment_b52bef {
margin-left: 13px;
border-radius: 0;
box-shadow: -3px 0 0 var(--color-low), -9px 0 0 var(--color-high), -21px 0 0 var(--color-low),
-18px 3px 0 var(--color-mid), 3px 3px 0 var(--color-mid);

.metadata_a4623d {
.metadata_b52bef {
color: $low;
}
}
// Audio
.wrapperAudio_f316dd.newMosaicStyle_f316dd {
.wrapperAudio_f72aac.newMosaicStyle_f72aac {
@include boxify($high, $mid, 3px);

.audioControls_f316dd,
.videoControls_f316dd {
.audioControls_f72aac,
.videoControls_f72aac {
background-color: $high;
border-radius: 0;
border: 1px solid $low;
}

.mediaBarWrapper_f7877e,
.mediaBarWrapper_f7877e:after,
.mediaBarWrapper_f7877e:before {
.mediaBarWrapper_d12f5a,
.mediaBarWrapper_d12f5a:after,
.mediaBarWrapper_d12f5a:before {
background-color: $mid;
}
}
// Images and Videos
.imageWrapper__178ee:not(.embedImage_ad0b71) {
.visualMediaItemContainer_cda674:not(.embedImage_ad0b71),
.inlineMediaEmbed_b0068a.embed_b0068a {
@include boxify($high, $mid, 4px);
width:fit-content;
margin-bottom: -2px;
}
.mediaAttachmentsContainer__242e2,
.oneByOneGridSingle_cda674,
.wrapper_f316dd,
.video_f316dd {
border-radius: 0;
.visualMediaItemContainer_cda674,
.oneByOneGrid_cda674,
.mosaicItem_e5c1dc,
.imageWrapper_d4597d,
.embed_b0068a,
.embedMedia_b0068a,
.wrapper_f72aac,
.video_f72aac {
border-radius: 0 !important;
}
.visualMediaItemContainer_cda674{
.wrapper_f72aac {
.videoControls_f72aac {
width: 99.9%;
.controlIcon_f72aac,
.controlIcon_ef18ee {
color: $high-trans !important;
}
}
.durationTimeWrapper_f72aac {
color: $high-trans;
}
}
}

// Spotify Listen-Along
.theme-dark .invite_f61cb8 {
@include boxify($high, $mid, 3px);
Expand All @@ -77,3 +99,10 @@
color: $alert;
}
}

//Spotify Song Embed
.embedSpotify_b0068a {
.encore-dark-theme {
border-radius: 0rem !important;
}
}
20 changes: 20 additions & 0 deletions src/chat/_threads.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,23 @@
.browser_f542fc {
@include boxify($high, $mid, 3px);
}

//Mention badge and unread coloring for threads (wtf discord, why is this so hard)
.typeThread_d8bfb3 {
.name_d8bfb3 {
position: absolute;
left: 1px;
max-width: 175px;
text-align: left;
&.overflow_c74e70 {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
.mentionsBadge_e2a798 {
position: absolute;
padding-left: 121px;
z-index: 1;
}
}
6 changes: 4 additions & 2 deletions src/home/_friends.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,16 @@
color: $low;
background: $high;
}
.text-sm\/normal_dc00ef,
.defaultColor_a595eb,
.base_d0da3e,
.defaultColor_a595eb,
span,
.colorHeaderSecondary_fbc755,
.colorStandard_fbc755 {
color: $high;
}
.text-sm\/normal_dc00ef { // smaller text for active now (game name etc)
color: $high !important; //using important was necessary as it failed to invert colors due to a global variable
}
.section_cd82a7 div {
color: $low;
}
Expand Down
7 changes: 7 additions & 0 deletions src/plugin-support/_allcalltimer.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.voiceUser_cdc675:hover {
.content_cdc675{
.timeCounter {
color: $high !important;
}
}
}
3 changes: 2 additions & 1 deletion src/plugin-support/import.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
@import 'click-to-chat';
@import 'better-role-dot';
@import 'server-count';
@import 'friend-notif';
@import 'friend-notif';
@import 'allcalltimer.scss'
24 changes: 23 additions & 1 deletion src/popouts/_user-popout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
}

// profile picture clickable area
.clickable_cc54d6 {
.clickable_f94206 {
border: 2px solid $low;
display: flex;
align-items: center;
Expand All @@ -102,6 +102,13 @@
margin: 0 0.5em;
padding: 0.5em;
background: $high;
.activity_cd74cc { //activites (takes on profile theme color and can cause conflict with colors)
border-top: 1px solid;
border-bottom: 1px solid;
border-color: $low;
border-radius: 0px;
background-color: transparent;
}
}
.footer_d5223c {
margin: 0;
Expand All @@ -113,4 +120,19 @@
background: $high;
border-radius: 0;
}

//user popout bottom left
.body_ad5fac {
border: 2px solid $low;
margin: 0 0.5em;
padding: 0.5em;
background: $high;
.activity_cd74cc { //activites (takes on profile theme color and can cause conflict with colors)
border-top: 1px solid;
border-bottom: 1px solid;
border-color: $low;
border-radius: 0px;
background-color: transparent;
}
}
}
4 changes: 4 additions & 0 deletions src/settings/_general-settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,7 @@
.side_a0 .separator_a0 {
visibility: hidden;
}

.radioIconForeground_eb92a8 { //dot in the center of selected setting
fill: var(--color-alert)
}

0 comments on commit d6c97f9

Please sign in to comment.