Skip to content

Commit

Permalink
Update source
Browse files Browse the repository at this point in the history
  • Loading branch information
CapnKitten committed Feb 5, 2025
1 parent 880d41b commit 2b9e04a
Show file tree
Hide file tree
Showing 8 changed files with 147 additions and 173 deletions.
5 changes: 4 additions & 1 deletion Themes/Material-Discord/src/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,12 @@
}

@mixin add-icon($color, $icon, $type: 'outline') {
background-color: #{$color};
-webkit-mask-image: url(https://capnkitten.github.io/BetterDiscord/Themes/Material-Discord/files/icons/#{$type}/#{$icon}.svg);
-webkit-mask-repeat: no-repeat;

@if $color != null {
background-color: #{$color};
}
}

@mixin remove-caps($font-size, $important: false) {
Expand Down
3 changes: 3 additions & 0 deletions Themes/Material-Discord/src/_selectorPlaceholders.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1822,6 +1822,9 @@
.hasStackedBar__74017 {
@extend %channelTextAreaHasStackedBar !optional;
}
.channelAttachmentArea_b77158 {
@extend %channelAtachmentArea !optional;
}
.inner__74017 {
@extend %channelTextAreaInner !optional;
}
Expand Down
2 changes: 1 addition & 1 deletion Themes/Material-Discord/src/app/_materialYou.scss
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@
--header-secondary: hsl(
var(--accent-hue),
calc(var(--accent-saturation) * var(--saturation-modifier) * 1.4 * var(--saturation-factor)),
calc(var(--accent-lightness) * var(--lightness-modifier) * var(--ui-darkness-modifier) * var(--text-lightness-modifier) * 6.3)
calc(var(--accent-lightness) * var(--lightness-modifier) * var(--ui-darkness-modifier) * var(--text-lightness-modifier) * 5.8)
);

--text-normal: hsl(
Expand Down
39 changes: 6 additions & 33 deletions Themes/Material-Discord/src/icons/_contextMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
@each $option, $icon in $icons {
&[id="#{$option}"] {
&:after {
@include add-icon(currentColor, $icon);
@include add-icon(null, $icon);
}
}
}
Expand All @@ -349,7 +349,7 @@
@each $option, $icon in $spotifyIcons {
&[id*="user-context-#{$option}"] {
&:after {
@include add-icon(currentColor, $icon);
@include add-icon(null, $icon);
}
}
}
Expand Down Expand Up @@ -377,7 +377,7 @@
@each $option, $icon in $icons {
&##{$option} {
%menuPopoutHintContainer {
@include add-icon(currentColor, $icon);
@include add-icon(null, $icon);
}
}
}
Expand Down Expand Up @@ -507,7 +507,7 @@
@each $option, $icon in $icons {
&[id="#{$option}"] {
&:before {
@include add-icon(currentColor, $icon);
@include add-icon(null, $icon);
}
}
}
Expand Down Expand Up @@ -570,41 +570,14 @@
(icon: 'M560-320h80v-80h80v-80h-80v-80h-80v80h-80v80h80v80ZM160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h240l80 80h320q33 0 56.5 23.5T880-640v400q0 33-23.5 56.5T800-160H160Zm0-80h640v-400H447l-80-80H160v480Zm0 0v-480 480Z', remove: false),
create-event:
(icon: 'M680-80v-120H560v-80h120v-120h80v120h120v80H760v120h-80Zm-480-80q-33 0-56.5-23.5T120-240v-480q0-33 23.5-56.5T200-800h40v-80h80v80h240v-80h80v80h40q33 0 56.5 23.5T760-720v244q-20-3-40-3t-40 3v-84H200v320h280q0 20 3 40t11 40H200Zm0-480h480v-80H200v80Zm0 0v-80 80Z', remove: true),
/*active-threads:
(icon: 'M5.41,21L6.12,17H2.12L2.47,15H6.47L7.53,9H3.53L3.88,7H7.88L8.59,3H10.59L9.88,7H15.88L16.59,3H18.59L17.88,7H21.88L21.53,9H17.53L16.47,15H20.47L20.12,17H16.12L15.41,21H13.41L14.12,17H8.12L7.41,21H5.41M9.53,9L8.47,15H14.47L15.53,9H9.53Z', remove: false),*/
application-directory:
(icon: 'M240-160q-33 0-56.5-23.5T160-240q0-33 23.5-56.5T240-320q33 0 56.5 23.5T320-240q0 33-23.5 56.5T240-160Zm240 0q-33 0-56.5-23.5T400-240q0-33 23.5-56.5T480-320q33 0 56.5 23.5T560-240q0 33-23.5 56.5T480-160Zm240 0q-33 0-56.5-23.5T640-240q0-33 23.5-56.5T720-320q33 0 56.5 23.5T800-240q0 33-23.5 56.5T720-160ZM240-400q-33 0-56.5-23.5T160-480q0-33 23.5-56.5T240-560q33 0 56.5 23.5T320-480q0 33-23.5 56.5T240-400Zm240 0q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm240 0q-33 0-56.5-23.5T640-480q0-33 23.5-56.5T720-560q33 0 56.5 23.5T800-480q0 33-23.5 56.5T720-400ZM240-640q-33 0-56.5-23.5T160-720q0-33 23.5-56.5T240-800q33 0 56.5 23.5T320-720q0 33-23.5 56.5T240-640Zm240 0q-33 0-56.5-23.5T400-720q0-33 23.5-56.5T480-800q33 0 56.5 23.5T560-720q0 33-23.5 56.5T480-640Zm240 0q-33 0-56.5-23.5T640-720q0-33 23.5-56.5T720-800q33 0 56.5 23.5T800-720q0 33-23.5 56.5T720-640Z', remove: false),
privacy:
(icon: 'M420-360h120l-23-129q20-10 31.5-29t11.5-42q0-33-23.5-56.5T480-640q-33 0-56.5 23.5T400-560q0 23 11.5 42t31.5 29l-23 129Zm60 280q-139-35-229.5-159.5T160-516v-244l320-120 320 120v244q0 152-90.5 276.5T480-80Zm0-84q104-33 172-132t68-220v-189l-240-90-240 90v189q0 121 68 220t172 132Zm0-316Z', remove: false),

/*guild-profile:
(icon: 'M8,9A2,2 0 0,1 10,11A2,2 0 0,1 8,13A2,2 0 0,1 6,11A2,2 0 0,1 8,9M12,17H4V16C4,14.67 6.67,14 8,14C9.33,14 12,14.67 12,16V17M20,8H14V10H20V8M20,12H14V14H20V12M20,16H14V18H20V16M22,4H14V6H22V20H2V6H10V4H2A2,2 0 0,0 0,6V20A2,2 0 0,0 2,22H22A2,2 0 0,0 24,20V6A2,2 0 0,0 22,4M13,6H11V2H13V6Z', remove: false),
invite-people:
(icon: 'M15 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0-6c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm0 8c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4zm-6 4c.22-.72 3.31-2 6-2 2.7 0 5.8 1.29 6 2H9zm-3-3v-3h3v-2H6V7H4v3H1v2h3v3z', remove: false),
settings:
(icon: 'M19.43 12.98c.04-.32.07-.64.07-.98 0-.34-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.09-.16-.26-.25-.44-.25-.06 0-.12.01-.17.03l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.06-.02-.12-.03-.18-.03-.17 0-.34.09-.43.25l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98 0 .33.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.09.16.26.25.44.25.06 0 .12-.01.17-.03l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.06.02.12.03.18.03.17 0 .34-.09.43-.25l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zm-1.98-1.71c.04.31.05.52.05.73 0 .21-.02.43-.05.73l-.14 1.13.89.7 1.08.84-.7 1.21-1.27-.51-1.04-.42-.9.68c-.43.32-.84.56-1.25.73l-1.06.43-.16 1.13-.2 1.35h-1.4l-.19-1.35-.16-1.13-1.06-.43c-.43-.18-.83-.41-1.23-.71l-.91-.7-1.06.43-1.27.51-.7-1.21 1.08-.84.89-.7-.14-1.13c-.03-.31-.05-.54-.05-.74s.02-.43.05-.73l.14-1.13-.89-.7-1.08-.84.7-1.21 1.27.51 1.04.42.9-.68c.43-.32.84-.56 1.25-.73l1.06-.43.16-1.13.2-1.35h1.39l.19 1.35.16 1.13 1.06.43c.43.18.83.41 1.23.71l.91.7 1.06-.43 1.27-.51.7 1.21-1.07.85-.89.7.14 1.13zM12 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 6c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2z', remove: false),
insights:
(icon: 'M16,11.78L20.24,4.45L21.97,5.45L16.74,14.5L10.23,10.75L5.46,19H22V21H2V3H4V17.54L9.5,8L16,11.78Z', remove: false),
create-channel:
(icon: 'M13 7h-2v4H7v2h4v4h2v-4h4v-2h-4V7zm-1-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z', remove: false),
create-category:
(icon: 'M14 10H2v2h12v-2zm0-4H2v2h12V6zm4 8v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2 16h8v-2H2v2z', remove: false),
create-event:
(icon: 'M12 12H17V17H12V12M19 3H18V1H16V3H8V1H6V3H5C3.9 3 3 3.9 3 5V19C3 20.1 3.9 21 5 21H19C20.1 21 21 20.1 21 19V5C21 3.9 20.1 3 19 3M19 5V7H5V5H19M5 19V9H19V19H5Z', remove: true),
active-threads:
(icon: 'M5.41,21L6.12,17H2.12L2.47,15H6.47L7.53,9H3.53L3.88,7H7.88L8.59,3H10.59L9.88,7H15.88L16.59,3H18.59L17.88,7H21.88L21.53,9H17.53L16.47,15H20.47L20.12,17H16.12L15.41,21H13.41L14.12,17H8.12L7.41,21H5.41M9.53,9L8.47,15H14.47L15.53,9H9.53Z', remove: false),
notifications:
(icon: 'M12 22c1.1 0 2-.9 2-2h-4c0 1.1.9 2 2 2zm6-6v-5c0-3.07-1.63-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.64 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2zm-2 1H8v-6c0-2.48 1.51-4.5 4-4.5s4 2.02 4 4.5v6z', remove: false),
privacy:
(icon: 'M12 1L3 5v6c0 5.55 3.84 10.74 9 12 5.16-1.26 9-6.45 9-12V5l-9-4zm7 10c0 4.52-2.98 8.69-7 9.93-4.02-1.24-7-5.41-7-9.93V6.3l7-3.11 7 3.11V11zm-11.59.59L6 13l4 4 8-8-1.41-1.42L10 14.17z', remove: false),
change-nickname:
(icon: 'M14.06 9.02l.92.92L5.92 19H5v-.92l9.06-9.06M17.66 3c-.25 0-.51.1-.7.29l-1.83 1.83 3.75 3.75 1.83-1.83c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.2-.2-.45-.29-.71-.29zm-3.6 3.19L3 17.25V21h3.75L17.81 9.94l-3.75-3.75z', remove: false),
server-lockdown:
(icon: 'M12,17C10.89,17 10,16.1 10,15C10,13.89 10.89,13 12,13A2,2 0 0,1 14,15A2,2 0 0,1 12,17M18,20V10H6V20H18M18,8A2,2 0 0,1 20,10V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V10C4,8.89 4.89,8 6,8H7V6A5,5 0 0,1 12,1A5,5 0 0,1 17,6V8H18M12,3A3,3 0 0,0 9,6V8H15V6A3,3 0 0,0 12,3Z', remove: false),
(icon: 'M480-480Zm0 400q-139-35-229.5-159.5T160-516v-244l320-120 320 120v244q0 10-.5 20t-1.5 20q-9-2-18.5-3t-19.5-1q-11 0-21 1t-21 3q1-10 1.5-19.5t.5-20.5v-189l-240-90-240 90v189q0 121 68 220t172 132q21-7 41-17t39-23v94q-19 10-39 17.5T480-80Zm194 0q-14 0-24-10t-10-24v-132q0-14 10-24t24-10h6v-40q0-33 23.5-56.5T760-400q33 0 56.5 23.5T840-320v40h6q14 0 24 10t10 24v132q0 14-10 24t-24 10H674Zm46-200h80v-40q0-17-11.5-28.5T760-360q-17 0-28.5 11.5T720-320v40Z', remove: false),
report-raid:
(icon: 'M12,12H19C18.47,16.11 15.72,19.78 12,20.92V12H5V6.3L12,3.19M12,1L3,5V11C3,16.55 6.84,21.73 12,23C17.16,21.73 21,16.55 21,11V5L12,1Z', remove: false),
leave:
(icon: 'M10.09 15.59L11.5 17l5-5-5-5-1.41 1.41L12.67 11H3v2h9.67l-2.58 2.59zM19 3H5c-1.11 0-2 .9-2 2v4h2V5h14v14H5v-4H3v4c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z', remove: false)*/
(icon: 'M480-280q17 0 28.5-11.5T520-320q0-17-11.5-28.5T480-360q-17 0-28.5 11.5T440-320q0 17 11.5 28.5T480-280Zm-40-160h80v-240h-80v240ZM330-120 120-330v-300l210-210h300l210 210v300L630-120H330Zm34-80h232l164-164v-232L596-760H364L200-596v232l164 164Zm116-280Z', remove: false)
);

@each $key, $value in $icons {
Expand Down
1 change: 1 addition & 0 deletions Themes/Material-Discord/src/icons/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
@forward './headerBar';
@forward './messageActions';
@forward './panels';
@forward './sidebar';
131 changes: 131 additions & 0 deletions Themes/Material-Discord/src/icons/_sidebar.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
@use '../mixins' as *;

/*
*
* SIDEBAR ICONS
*
*/

%settingsSidebar {
%tabBarItem {
display: flex;
gap: 8px;
padding-left: 12px;

&:before {
position: relative;
content: " ";
width: 20px;
height: 20px;
top: 0;
bottom: 0;
margin: auto 0;
background-repeat: no-repeat;
background-position: center;
background-color: var(--text-normal);
@include add-icon(null, settings);
-webkit-mask-repeat: no-repeat;
opacity: 0.8;
}

img {
display: none;
}
}
}

%settingsTabBarItemContainer {
width: 100%;
}

%settingsSidebar {
%tabBarItem {
$icons: (
// USER SETTINGS

'My Account': 'person',
'Games': 'gamepad',
'Profile Customization': 'person',
'Content & Social': 'people',
'Data & Privacy': 'shield_lock_open',
'Family Center': 'people',
'Authorized Apps': 'apps',
'Sessions': 'devices',
'Connections': 'link',

'Discord Nitro': 'nitro',
'Nitro Server Boost': 'server_boost',
'Subscriptions': 'subscription',
'Library Inventory': 'gift',
'Billing': 'payment',

'Appearance': 'chat',
'Accessibility': 'accessibility',
'Voice & Video': 'mic',
'Text & Images': 'keyboard',
'Notifications': 'notifications',
'Keybinds': 'space_bar',
'Language': 'translate',
'Windows': 'windows',
'Linux': 'linux',
'Streamer Mode': 'live_tv',
'Advanced': 'integrations',

'Settings': 'settings',
'updates': 'update',
'customcss': 'code',
'plugins': 'plugins',
'themes': 'themes',
'pluginrepo': 'plugins',
'themerepo': 'themes',

'changelog': 'list',
'merchandise': 'casino',
'Hypesquad Online': 'hypesquad',
'Experiments': 'experiment',
'Developer Options': 'code',

'logout': 'exit_to_app',

// SERVER SETTINGS

'OVERVIEW': 'dashboard',
'ROLES': 'person',
'EMOJI': 'emoji',
'STICKERS': 'sticker-emoji',
'WIDGET': 'widgets',
'SOUNDBOARD': 'volume_up',
'GUILD_TEMPLATES': 'template',
'VANITY_URL': 'link',

'INTEGRATIONS': 'integrations',
'APP_DIRECTORY': 'apps',

'SAFETY': 'shield_lock_open',
'AUDIT_LOG': 'audit_log',
'BANS': 'hardware',

'COMMUNITY': 'dashboard',
'ONBOARDING': 'handshake',
'ANALYTICS': 'analytics',
'DISCOVERY': 'discovery',
'COMMUNITY_WELCOME': 'partner_program',

'ROLE_SUBSCRIPTIONS': 'monetization_on',
'GUILD_PRODUCTS': 'inventory',
'ROLE_SUBSCRIPTIONS_STORE_PAGE': 'sale',

'GUILD_PREMIUM': 'server_boost',

'MEMBERS': 'people',
'INSTANT_INVITES': 'person_add',
'DELETE': 'delete'
);

@each $tab, $icon in $icons {
&[data-tab-id="#{$tab}"]:before {
-webkit-mask-image: url(https://capnkitten.github.io/BetterDiscord/Themes/Material-Discord/files/icons/outline/#{$icon}.svg);
}
}
}
}
2 changes: 1 addition & 1 deletion Themes/Material-Discord/src/settings/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
@forward './user/';

@forward './content';
@forward './sidebar';
@forward './settings';
@forward './sidebar';
Loading

0 comments on commit 2b9e04a

Please sign in to comment.