Skip to content

Commit 2be8f89

Browse files
UnthrottledUnthrottled
authored
Merge pull request #74 from doki-theme/newCodeView
Some New Code View Support
2 parents a1c20cd + 32c07c8 commit 2be8f89

95 files changed

Lines changed: 6049 additions & 793 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ generatedThemes/*.json
1111
buildSrc/temp/
1212

1313
/masterThemes
14+
.DS_Store

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Changelog
22
---
3+
# 88.5-1.1.0 [Initial New View Support]
4+
5+
- Added some support for the `Light Default` and `Dark Default` GitHub new UI themes.
6+
37
# 88.1-1.0.2 [Darling]
48

59
Best Girl just got _better_. ❤️

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 Alex Simons
3+
Copyright (c) 2023 Alex Simons
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎buildSrc/assets/templates/tempCss.css.txt‎

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,15 @@
4242
:root {
4343
--color-previewable-comment-form-bg: {{textEditorBackground}} !important;
4444
--color-avatar-bg: {{textEditorBackground}} !important;
45+
--color-btn-primary-bg: {{accentColor}} !important;
46+
--color-btn-primary-hover-bg: {{accentColor}} !important;
47+
--color-btn-primary-fg: {{defaultButtonColor|selectionForeground}} !important;
48+
--color-btn-primary-icon: {{defaultButtonColor|selectionForeground}} !important;
4549
--color-fg-default: {{foregroundColor}} !important;
46-
--color-fg-muted: {{foregroundColor}}AA !important;
50+
--color-btn-text: {{buttonFont}} !important;
51+
--color-attention-subtle: {{fileYellow}}99 !important;
52+
--color-attention-muted: {{fileYellow}}99 !important;
53+
--color-accent-subtle: {{accentColor}}AA !important;
4754
--color-auto-gray-3: {{textEditorBackground}} !important;
4855
--color-auto-gray-1: {{textEditorBackground}} !important;
4956
--color-avatar-border: #00000000 !important;
@@ -61,6 +68,8 @@
6168
--color-checks-step-header-open-bg: {{caretRow}} !important;
6269
--color-bg-discussions-row-emoji-box: {{buttonColor}} !important;
6370
--color-current-user-tip-border: {{buttonColor}} !important;
71+
--color-btn-bg: {{buttonColor}} !important;
72+
--color-fg-muted: {{infoForeground}} !important;
6473
--color-underlinenav-counter-text: {{foregroundColor}} !important;
6574
--color-text-primary: {{keyColor}} !important;
6675
--color-text-link: {{accentColor}} !important;
@@ -106,6 +115,10 @@
106115
color: {{lineNumberColor}} !important;
107116
}
108117

118+
span.Button-label:hover {
119+
color: {{defaultButtonColor|selectionForeground}};
120+
}
121+
109122
.suggester li:hover .octicon,
110123
.suggester li[aria-selected="true"] .octicon {
111124
fill: {{defaultButtonColor|selectionForeground}};
@@ -129,6 +142,10 @@
129142
opacity: 1 !important;
130143
}
131144

145+
.header-search-button.placeholder {
146+
color: {{infoForeground}}!important;
147+
}
148+
132149
input:-webkit-autofill,
133150
input:-webkit-autofill:hover,
134151
input:-webkit-autofill:focus,
@@ -201,6 +218,46 @@
201218
background-color: {{buttonColor}};
202219
}
203220

221+
222+
/* new ui junk */
223+
224+
.koyZg th,
225+
.PjhnZ th,
226+
.ekYzge
227+
{
228+
background-color: {{headerColor}} !important;
229+
}
230+
231+
.kVpYHc {
232+
border: {{borderColor}} !important;
233+
}
234+
235+
.kMwSDe .segmentedControl-content {
236+
background-color: {{buttonColor}} !important;
237+
border-color: {{accentColor}} !important;
238+
}
239+
240+
.gZAWpy,
241+
.bjLiTB,
242+
.cNspDo, .dCpkrR, .edeeWf, .gHfWgt, .hImDzR, .cFcYmG {
243+
background-color: {{buttonColor}} !important;
244+
}
245+
246+
.bxqzVV[aria-expanded="true"],
247+
.hImDzR[aria-expanded="true"] {
248+
background-color: {{highlightColor}} !important;
249+
}
250+
251+
.beVJOq,
252+
.cYvszO {
253+
background-color: {{secondaryBackground}} !important;
254+
border: {{borderColor}} !important;
255+
}
256+
257+
.kGYPAT {
258+
color: {{accentColor}} !important;
259+
}
260+
204261
/* end doki addons */
205262

206263
/* source #0: "transparent" */
@@ -16338,8 +16395,10 @@ select:-webkit-autofill:focus {
1633816395
.auto-search-group input[type="text"][aria-label] {
1633916396
background: {{textEditorBackground}};
1634016397
}
16398+
16399+
1634116400
/* focus hightlight */
16342-
a:focus, button:focus, [tabindex] {
16401+
a:focus, button:focus {
1634316402
outline-color: /*[[base-color]]*/ {{accentColor}} !important;
1634416403
}
1634516404
input.focus[type="text"], #adv_code_search .focus.search-page-label,

‎buildSrc/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@types/jest": "^26.0.0",
1313
"@types/lodash": "^4.14.157",
1414
"copy-webpack-plugin": "^6.0.2",
15-
"doki-build-source": "84.2.4",
15+
"doki-build-source": "84.2.7",
1616
"fetch-css": "^3.0.1",
1717
"jest": "^26.0.1",
1818
"lodash": "^4.17.21",

‎buildSrc/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2315,10 +2315,10 @@ discontinuous-range@1.0.0:
23152315
resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
23162316
integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
23172317

2318-
doki-build-source@84.2.4:
2319-
version "84.2.4"
2320-
resolved "https://registry.yarnpkg.com/doki-build-source/-/doki-build-source-84.2.4.tgz#886e9be23447a0088928be92c6b3f8e032bb12f1"
2321-
integrity sha512-Nt8huxBM+92df4eGjRs1XX2lkkVmrnor8KJ1HQRRgDVC8Gq+mXTFfbg8EBM40Aj4tGE+iS9L1wjQB9bsjCtqDQ==
2318+
doki-build-source@84.2.7:
2319+
version "84.2.7"
2320+
resolved "https://registry.yarnpkg.com/doki-build-source/-/doki-build-source-84.2.7.tgz#ef84454522831cde620a592a579f9d3579b21dc2"
2321+
integrity sha512-gQLMqpFFKI/uGRHQdlyIT/pVMyMv3LybF7zZynXtJAzNGWbG4BOHNwGFRcJaTtvL+uEJZE/6vsjLXPk0qaG4SA==
23222322

23232323
dom-serializer@0:
23242324
version "0.2.2"

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "doki-theme-github",
3-
"version": "88.1.1",
3+
"version": "88.1.2",
44
"dependencies": {
55
}
66
}

‎themes/aqua.user.css‎

Lines changed: 62 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* ==UserStyle==
22
@name Doki-Theme: Aqua
33
@namespace github.com/doki-theme
4-
@version 88.1.1
4+
@version 88.1.2
55
@description Cute anime themes for GitHub
66
@author Unthrottled
77
@license MIT
@@ -42,8 +42,15 @@
4242
:root {
4343
--color-previewable-comment-form-bg: #262940 !important;
4444
--color-avatar-bg: #262940 !important;
45+
--color-btn-primary-bg: #578CDA !important;
46+
--color-btn-primary-hover-bg: #578CDA !important;
47+
--color-btn-primary-fg: #fbfbfb !important;
48+
--color-btn-primary-icon: #fbfbfb !important;
4549
--color-fg-default: #bbbbbb !important;
46-
--color-fg-muted: #bbbbbbAA !important;
50+
--color-btn-text: #838daa !important;
51+
--color-attention-subtle: #43444199 !important;
52+
--color-attention-muted: #43444199 !important;
53+
--color-accent-subtle: #578CDAAA !important;
4754
--color-auto-gray-3: #262940 !important;
4855
--color-auto-gray-1: #262940 !important;
4956
--color-avatar-border: #00000000 !important;
@@ -61,6 +68,8 @@
6168
--color-checks-step-header-open-bg: #2d3047 !important;
6269
--color-bg-discussions-row-emoji-box: #31374b !important;
6370
--color-current-user-tip-border: #31374b !important;
71+
--color-btn-bg: #31374b !important;
72+
--color-fg-muted: #7b8bab !important;
6473
--color-underlinenav-counter-text: #bbbbbb !important;
6574
--color-text-primary: #6893f3 !important;
6675
--color-text-link: #578CDA !important;
@@ -106,6 +115,10 @@
106115
color: #61647b !important;
107116
}
108117

118+
span.Button-label:hover {
119+
color: #fbfbfb;
120+
}
121+
109122
.suggester li:hover .octicon,
110123
.suggester li[aria-selected="true"] .octicon {
111124
fill: #fbfbfb;
@@ -129,6 +142,10 @@
129142
opacity: 1 !important;
130143
}
131144

145+
.header-search-button.placeholder {
146+
color: #7b8bab!important;
147+
}
148+
132149
input:-webkit-autofill,
133150
input:-webkit-autofill:hover,
134151
input:-webkit-autofill:focus,
@@ -201,6 +218,46 @@
201218
background-color: #31374b;
202219
}
203220

221+
222+
/* new ui junk */
223+
224+
.koyZg th,
225+
.PjhnZ th,
226+
.ekYzge
227+
{
228+
background-color: #2a2d44 !important;
229+
}
230+
231+
.kVpYHc {
232+
border: #2a334b !important;
233+
}
234+
235+
.kMwSDe .segmentedControl-content {
236+
background-color: #31374b !important;
237+
border-color: #578CDA !important;
238+
}
239+
240+
.gZAWpy,
241+
.bjLiTB,
242+
.cNspDo, .dCpkrR, .edeeWf, .gHfWgt, .hImDzR, .cFcYmG {
243+
background-color: #31374b !important;
244+
}
245+
246+
.bxqzVV[aria-expanded="true"],
247+
.hImDzR[aria-expanded="true"] {
248+
background-color: #2d3047 !important;
249+
}
250+
251+
.beVJOq,
252+
.cYvszO {
253+
background-color: #242942 !important;
254+
border: #2a334b !important;
255+
}
256+
257+
.kGYPAT {
258+
color: #578CDA !important;
259+
}
260+
204261
/* end doki addons */
205262

206263
/* source #0: "transparent" */
@@ -16338,8 +16395,10 @@ select:-webkit-autofill:focus {
1633816395
.auto-search-group input[type="text"][aria-label] {
1633916396
background: #262940;
1634016397
}
16398+
16399+
1634116400
/* focus hightlight */
16342-
a:focus, button:focus, [tabindex] {
16401+
a:focus, button:focus {
1634316402
outline-color: /*[[base-color]]*/ #578CDA !important;
1634416403
}
1634516404
input.focus[type="text"], #adv_code_search .focus.search-page-label,

‎themes/astolfo.user.css‎

Lines changed: 62 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* ==UserStyle==
22
@name Doki-Theme: Astolfo
33
@namespace github.com/doki-theme
4-
@version 88.1.1
4+
@version 88.1.2
55
@description Cute anime themes for GitHub
66
@author Unthrottled
77
@license MIT
@@ -42,8 +42,15 @@
4242
:root {
4343
--color-previewable-comment-form-bg: #1a1c19 !important;
4444
--color-avatar-bg: #1a1c19 !important;
45+
--color-btn-primary-bg: #d58d9c !important;
46+
--color-btn-primary-hover-bg: #d58d9c !important;
47+
--color-btn-primary-fg: #fbfbfb !important;
48+
--color-btn-primary-icon: #fbfbfb !important;
4549
--color-fg-default: #bbbbbb !important;
46-
--color-fg-muted: #bbbbbbAA !important;
50+
--color-btn-text: #a7a7a7 !important;
51+
--color-attention-subtle: #33331a99 !important;
52+
--color-attention-muted: #33331a99 !important;
53+
--color-accent-subtle: #d58d9cAA !important;
4754
--color-auto-gray-3: #1a1c19 !important;
4855
--color-auto-gray-1: #1a1c19 !important;
4956
--color-avatar-border: #00000000 !important;
@@ -61,6 +68,8 @@
6168
--color-checks-step-header-open-bg: #20221f !important;
6269
--color-bg-discussions-row-emoji-box: #242422 !important;
6370
--color-current-user-tip-border: #242422 !important;
71+
--color-btn-bg: #242422 !important;
72+
--color-fg-muted: #957a4d !important;
6473
--color-underlinenav-counter-text: #bbbbbb !important;
6574
--color-text-primary: #f6ebb7 !important;
6675
--color-text-link: #d58d9c !important;
@@ -106,6 +115,10 @@
106115
color: #8e856e !important;
107116
}
108117

118+
span.Button-label:hover {
119+
color: #fbfbfb;
120+
}
121+
109122
.suggester li:hover .octicon,
110123
.suggester li[aria-selected="true"] .octicon {
111124
fill: #fbfbfb;
@@ -129,6 +142,10 @@
129142
opacity: 1 !important;
130143
}
131144

145+
.header-search-button.placeholder {
146+
color: #957a4d!important;
147+
}
148+
132149
input:-webkit-autofill,
133150
input:-webkit-autofill:hover,
134151
input:-webkit-autofill:focus,
@@ -201,6 +218,46 @@
201218
background-color: #242422;
202219
}
203220

221+
222+
/* new ui junk */
223+
224+
.koyZg th,
225+
.PjhnZ th,
226+
.ekYzge
227+
{
228+
background-color: #181917 !important;
229+
}
230+
231+
.kVpYHc {
232+
border: #212220 !important;
233+
}
234+
235+
.kMwSDe .segmentedControl-content {
236+
background-color: #242422 !important;
237+
border-color: #d58d9c !important;
238+
}
239+
240+
.gZAWpy,
241+
.bjLiTB,
242+
.cNspDo, .dCpkrR, .edeeWf, .gHfWgt, .hImDzR, .cFcYmG {
243+
background-color: #242422 !important;
244+
}
245+
246+
.bxqzVV[aria-expanded="true"],
247+
.hImDzR[aria-expanded="true"] {
248+
background-color: #241517 !important;
249+
}
250+
251+
.beVJOq,
252+
.cYvszO {
253+
background-color: #141513 !important;
254+
border: #212220 !important;
255+
}
256+
257+
.kGYPAT {
258+
color: #d58d9c !important;
259+
}
260+
204261
/* end doki addons */
205262

206263
/* source #0: "transparent" */
@@ -16338,8 +16395,10 @@ select:-webkit-autofill:focus {
1633816395
.auto-search-group input[type="text"][aria-label] {
1633916396
background: #1a1c19;
1634016397
}
16398+
16399+
1634116400
/* focus hightlight */
16342-
a:focus, button:focus, [tabindex] {
16401+
a:focus, button:focus {
1634316402
outline-color: /*[[base-color]]*/ #d58d9c !important;
1634416403
}
1634516404
input.focus[type="text"], #adv_code_search .focus.search-page-label,

0 commit comments

Comments
 (0)