diff --git a/src/color_overrides.scss b/src/color_overrides.scss index 73de790..3d76036 100644 --- a/src/color_overrides.scss +++ b/src/color_overrides.scss @@ -1182,35 +1182,43 @@ code.inline, color: #{colors.$c7} !important; } .hljs-ansi-foreground-black .hljs-ansi-style-bold, -.hljs-ansi-foreground-black.hljs-ansi-style-bold { +.hljs-ansi-foreground-black.hljs-ansi-style-bold, +.hljs-ansi-foreground-black-bright { color: #{colors.$c8} !important; } .hljs-ansi-foreground-red .hljs-ansi-style-bold, -.hljs-ansi-foreground-red.hljs-ansi-style-bold { +.hljs-ansi-foreground-red.hljs-ansi-style-bold, +.hljs-ansi-foreground-red-bright { color: #{colors.$c9} !important; } .hljs-ansi-foreground-green .hljs-ansi-style-bold, -.hljs-ansi-foreground-green.hljs-ansi-style-bold { +.hljs-ansi-foreground-green.hljs-ansi-style-bold, +.hljs-ansi-foreground-green-bright { color: #{colors.$c10} !important; } .hljs-ansi-foreground-yellow .hljs-ansi-style-bold, -.hljs-ansi-foreground-yellow.hljs-ansi-style-bold { +.hljs-ansi-foreground-yellow.hljs-ansi-style-bold, +.hljs-ansi-foreground-yellow-bright { color: #{colors.$c11} !important; } .hljs-ansi-foreground-blue .hljs-ansi-style-bold, -.hljs-ansi-foreground-blue.hljs-ansi-style-bold { +.hljs-ansi-foreground-blue.hljs-ansi-style-bold, +.hljs-ansi-foreground-blue-bright { color: #{colors.$c12} !important; } .hljs-ansi-foreground-magenta .hljs-ansi-style-bold, -.hljs-ansi-foreground-magenta.hljs-ansi-style-bold { +.hljs-ansi-foreground-magenta.hljs-ansi-style-bold, +.hljs-ansi-foreground-magenta-bright { color: #{colors.$c13} !important; } .hljs-ansi-foreground-cyan .hljs-ansi-style-bold, -.hljs-ansi-foreground-cyan.hljs-ansi-style-bold { +.hljs-ansi-foreground-cyan.hljs-ansi-style-bold, +.hljs-ansi-foreground-cyan-bright { color: #{colors.$c14} !important; } .hljs-ansi-foreground-white .hljs-ansi-style-bold, -.hljs-ansi-foreground-white.hljs-ansi-style-bold { +.hljs-ansi-foreground-white.hljs-ansi-style-bold, +.hljs-ansi-foreground-white-bright { color: #{colors.$c15} !important; } .hljs-ansi-background-black { @@ -1237,3 +1245,27 @@ code.inline, .hljs-ansi-background-white { background-color: #{colors.$c7} !important; } +.hljs-ansi-background-black-bright { + background-color: #{colors.$c8} !important; +} +.hljs-ansi-background-red-bright { + background-color: #{colors.$c9} !important; +} +.hljs-ansi-background-green-bright { + background-color: #{colors.$c10} !important; +} +.hljs-ansi-background-yellow-bright { + background-color: #{colors.$c11} !important; +} +.hljs-ansi-background-blue-bright { + background-color: #{colors.$c12} !important; +} +.hljs-ansi-background-magenta-bright { + background-color: #{colors.$c13} !important; +} +.hljs-ansi-background-cyan-bright { + background-color: #{colors.$c14} !important; +} +.hljs-ansi-background-white-bright { + background-color: #{colors.$c15} !important; +} diff --git a/src/misc.scss b/src/misc.scss index 4d28300..77402e7 100644 --- a/src/misc.scss +++ b/src/misc.scss @@ -46,3 +46,13 @@ [class^="positionContainer_"]:has(#gif-picker-tab-panel) { height: calc(100vh - 128px); } + +/* unround */ +*, +[class], +*:before, +*:after, +*:hover, +::file-selector-button { + border-radius: 0px !important; +} diff --git a/src/w9x/guilds.scss b/src/w9x/guilds.scss index 87a9201..20efeea 100644 --- a/src/w9x/guilds.scss +++ b/src/w9x/guilds.scss @@ -156,9 +156,10 @@ } [class*="selected_"] > [class^="wrapper_"]:has(> svg) { - box-shadow: inset -1px -1px 0 0 var(--ThreeDHighlight), inset 1px 1px 0 0 var(--ThreeDShadow); + box-shadow: var(--PressedEdge); + background-color: var(--ThreeDPressed); &:hover { - box-shadow: inset -1px -1px 0 0 var(--ThreeDHighlight), inset 1px 1px 0 0 var(--ThreeDShadow); + box-shadow: var(--PressedEdge); } } @@ -342,7 +343,8 @@ } &:hover { - box-shadow: inset -1px -1px 0 0 var(--ThreeDShadow), inset 1px 1px 0 0 var(--ThreeDHighlight); + box-shadow: var(--HoverEdge); + background-color: var(--ThreeDFace); } } [class^="wrapperSimple_"] { @@ -362,7 +364,8 @@ [class^="circleIconButton_"] { background-color: transparent; &:hover { - box-shadow: inset -1px -1px 0 0 var(--ThreeDShadow), inset 1px 1px 0 0 var(--ThreeDHighlight); + box-shadow: var(--HoverEdge); + background-color: var(--ThreeDFace); } } @@ -447,16 +450,19 @@ image-rendering: pixelated; } &:has([class^="folder_"][aria-expanded="true"]) { - box-shadow: inset -1px -1px 0 0 var(--ThreeDShadow), inset 1px 1px 0 0 var(--ThreeDHighlight); + box-shadow: var(--PressedEdge); + background-color: var(--ThreeDPressed); } &:hover::after { - box-shadow: inset 0 1px var(--ThreeDShadow), inset -1px -1px 0 0 var(--ThreeDShadow), - inset 1px 2px 0 0 var(--ThreeDHighlight); + /*box-shadow: inset 0 1px var(--ThreeDShadow), inset -1px -1px 0 0 var(--ThreeDShadow), + inset 1px 2px 0 0 var(--ThreeDHighlight);*/ + box-shadow: inset 0 1px #282828, inset -1px -1px 0 0 #282828, inset 1px 2px 0 0 #282828; } &:has([class^="folder_"][aria-expanded="true"])::after { - box-shadow: inset 0 1px var(--ThreeDShadow), inset -1px -1px 0 0 var(--ThreeDHighlight), - inset 1px 2px 0 0 var(--ThreeDShadow); + /*box-shadow: inset 0 1px var(--ThreeDShadow), inset -1px -1px 0 0 var(--ThreeDHighlight), + inset 1px 2px 0 0 var(--ThreeDShadow);*/ + box-shadow: inset 0 1px #3a3a3a, inset -1px -1px 0 0 #3a3a3a, inset 1px 2px 0 0 #3a3a3a; } } } diff --git a/src/w9x/toolbar.scss b/src/w9x/toolbar.scss index 63a2f1d..0bdcc55 100644 --- a/src/w9x/toolbar.scss +++ b/src/w9x/toolbar.scss @@ -14,9 +14,9 @@ width: calc(100vw - var(--devtools-sidebar-width)); top: 0; left: 0; - /*box-shadow: var(--RebarBorder), inset 0 24px 0 0 var(--ThreeDFace), inset 0 25px 0 0 var(--ThreeDShadow), - inset 0 26px 0 0 var(--ThreeDHighlight), inset 0 48px 0 0 var(--ThreeDFace), inset 0 49px 0 0 var(--ThreeDShadow), - inset 0 50px 0 0 var(--ThreeDHighlight);*/ + box-shadow: var(--RebarBorder), inset 0 24px 0 0 var(--Window), inset 0 25px 0 0 var(--ThreeDShadow), + inset 0 26px 0 0 var(--ThreeDHighlight), inset 0 48px 0 0 var(--Window), inset 0 49px 0 0 var(--ThreeDShadow), + inset 0 50px 0 0 var(--ThreeDHighlight); background-color: var(--Window); } diff --git a/src/winclassic.scss b/src/winclassic.scss index 7a67033..685618c 100644 --- a/src/winclassic.scss +++ b/src/winclassic.scss @@ -73,7 +73,9 @@ --Tooltip: #1a1a1a; --TooltipText: #dedbeb; --Scrollbar: #383838; - --WindowFrame: inset -1px -1px 0 0 #121212, inset 1px 1px 0 0 #121212; + /*--WindowFrame: inset -1px -1px 0 0 #121212, inset 1px 1px 0 0 #121212;*/ + --WindowFrame: inset -1px -1px 0 0 var(--ThreeDDarkShadow), inset 1px 1px 0 0 var(--ThreeDLightShadow), + inset -2px -2px 0 0 var(--ThreeDShadow), inset 2px 2px 0 0 var(--ThreeDHighlight); --OuterEdge: inset -1px -1px 0 0 var(--ThreeDDarkShadow), inset 1px 1px 0 0 var(--ThreeDHighlight), inset -2px -2px 0 0 var(--ThreeDShadow), inset 2px 2px 0 0 var(--ThreeDLightShadow); --InnerEdge: inset -1px -1px 0 0 #3c3c3c, inset 1px 1px 0 0 #3c3c3c; @@ -82,7 +84,7 @@ --RebarTop: inset 0 1px 0 0 var(--ThreeDShadow), inset 0 2px 0 0 var(--ThreeDHighlight); --HoverEdge: inset -1px -1px 0 0 #282828, inset 1px 1px 0 0 #282828; --PressedEdge: inset -1px -1px 0 0 #3a3a3a, inset 1px 1px 0 0 #3a3a3a; - --ProgressBar: url('data:image/svg+xml,'); + --ProgressBar: url('data:image/svg+xml,'); --FontSize: 8pt; --TitlebarOffset: 3px; @@ -734,12 +736,15 @@ section[class^="panels_"] { padding: 0; margin: 3px 2px; - &::after { + /*&::after { left: 0; height: 1px; border-bottom: solid 1px var(--ThreeDHighlight); background-color: var(--ThreeDShadow); width: 100%; + }*/ + &::after { + display: none; } & > [class^="textArea_"] { @@ -763,19 +768,35 @@ section[class^="panels_"] { margin: 0; margin-bottom: 3px; border-radius: 0; - border: 1px solid transparent; + /*border: 1px solid transparent; border-top-color: var(--ThreeDShadow); border-left-color: var(--ThreeDShadow); border-bottom-color: var(--ThreeDHighlight); border-right-color: var(--ThreeDHighlight); background-color: var(--ThreeDFace); height: 14px; - width: calc(100% - 2px); + width: calc(100% - 2px);*/ + height: 8px; + width: 100%; + + background-color: #3c3c3c; + background-image: none; + mask: var(--ProgressBar); + mask-repeat: repeat-x; + + /*& > [class^="progressBar_"] { + height: 100%; + border-radius: 0; + background-color: var(--Selection); + background-image: none; + mask: var(--ProgressBar); + mask-repeat: repeat-x; + }*/ & > [class^="progressBar_"] { height: 100%; border-radius: 0; - background-color: var(--Selection); + background-color: #f7f7f7; background-image: none; mask: var(--ProgressBar); mask-repeat: repeat-x; @@ -846,12 +867,54 @@ section[class^="panels_"] { [class^="base_"] > [class^="content_"] > [class^="sidebar_"] > [class^="container_"], .overlay [class^="widget_"] > [class^="base_"] > [class^="sidebar_"] > [class^="children_"] > [class^="channelList_"] { & > [class^="scroller_"] > [class^="content_"] { - [class^="containerDefault_"] [class^="iconVisibility_"][class*="modeSelected_"] [class^="link_"] { - background-color: var(--Selection) !important; - --channel-icon: var(var(--SelectionText)) !important; + [class^="containerDefault_"] [class^="iconVisibility_"] { + &:hover [class^="link_"] { + background-color: var(--ThreeDFace) !important; + box-shadow: var(--HoverEdge); + --channel-icon: #808080 !important; - [class^="name_"] { - color: var(var(--SelectionText)) !important; + [class^="name_"] { + color: #808080 !important; + } + } + + &[class*="modeSelected_"] [class^="link_"] { + background-color: var(--ThreeDPressed) !important; + box-shadow: var(--PressedEdge); + --channel-icon: var(--SelectionText) !important; + + [class^="name_"] { + color: var(--SelectionText) !important; + } + } + } + } +} + +[class^="members_"] { + overflow: hidden auto !important; + + [class^="member_"] { + border-radius: 0; + max-width: unset; + + &:hover { + box-shadow: var(--HoverEdge); + background-color: var(--ThreeDFace); + + & > [class^="memberInner_"] { + border-radius: 0; + background-color: transparent; + } + } + + &[class*="selected_"] { + box-shadow: var(--PressedEdge); + background-color: var(--ThreeDPressed); + + & > [class^="memberInner_"] { + border-radius: 0; + background-color: transparent; } } }