Merge pull request #74 from doki-theme/newCodeView

Some New Code View Support
doki-theme · Mar 25, 2023 · 2be8f89 · 2be8f89
2 parents a1c20cd + 32c07c8
commit 2be8f89
Show file tree

Hide file tree

Showing 95 changed files with 6,049 additions and 793 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ generatedThemes/*.json
 buildSrc/temp/
 
 /masterThemes
+.DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Changelog
 ---
+# 88.5-1.1.0 [Initial New View Support]
+
+- Added some support for the `Light Default` and `Dark Default` GitHub new UI themes.
+
 # 88.1-1.0.2 [Darling]
 
 Best Girl just got _better_. ❤️

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Alex Simons
+Copyright (c) 2023 Alex Simons
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/buildSrc/assets/templates/tempCss.css.txt b/buildSrc/assets/templates/tempCss.css.txt
@@ -42,8 +42,15 @@
     :root {
       --color-previewable-comment-form-bg: {{textEditorBackground}} !important;
       --color-avatar-bg: {{textEditorBackground}} !important;
+      --color-btn-primary-bg: {{accentColor}} !important;
+      --color-btn-primary-hover-bg: {{accentColor}} !important;
+      --color-btn-primary-fg: {{defaultButtonColor|selectionForeground}} !important;
+      --color-btn-primary-icon: {{defaultButtonColor|selectionForeground}} !important;
       --color-fg-default: {{foregroundColor}} !important;
-      --color-fg-muted: {{foregroundColor}}AA !important;
+      --color-btn-text: {{buttonFont}} !important;
+      --color-attention-subtle: {{fileYellow}}99 !important;
+      --color-attention-muted: {{fileYellow}}99 !important;
+      --color-accent-subtle: {{accentColor}}AA !important;
       --color-auto-gray-3: {{textEditorBackground}} !important;
       --color-auto-gray-1: {{textEditorBackground}} !important;
       --color-avatar-border: #00000000 !important;
@@ -61,6 +68,8 @@
       --color-checks-step-header-open-bg: {{caretRow}} !important;
       --color-bg-discussions-row-emoji-box: {{buttonColor}} !important;
       --color-current-user-tip-border: {{buttonColor}} !important;
+      --color-btn-bg: {{buttonColor}} !important;
+      --color-fg-muted: {{infoForeground}} !important;
       --color-underlinenav-counter-text: {{foregroundColor}} !important;
       --color-text-primary: {{keyColor}} !important;
       --color-text-link: {{accentColor}} !important;
@@ -106,6 +115,10 @@
   color: {{lineNumberColor}} !important;
 }
 
+span.Button-label:hover {
+      color: {{defaultButtonColor|selectionForeground}};
+}
+
     .suggester li:hover .octicon,
     .suggester li[aria-selected="true"] .octicon {
       fill: {{defaultButtonColor|selectionForeground}};
@@ -129,6 +142,10 @@
         opacity: 1 !important;
     }
 
+    .header-search-button.placeholder {
+    color: {{infoForeground}}!important;
+    }
+
     input:-webkit-autofill,
     input:-webkit-autofill:hover,
     input:-webkit-autofill:focus,
@@ -201,6 +218,46 @@
       background-color: {{buttonColor}};
     }
 
+
+    /* new ui junk */
+
+    .koyZg th,
+    .PjhnZ th,
+    .ekYzge
+    {
+      background-color: {{headerColor}} !important;
+    }
+
+    .kVpYHc {
+    border: {{borderColor}} !important;
+    }
+
+    .kMwSDe .segmentedControl-content {
+       background-color: {{buttonColor}} !important;
+       border-color: {{accentColor}} !important;
+    }
+
+    .gZAWpy,
+    .bjLiTB,
+    .cNspDo, .dCpkrR, .edeeWf, .gHfWgt, .hImDzR, .cFcYmG {
+       background-color: {{buttonColor}} !important;
+    }
+
+    .bxqzVV[aria-expanded="true"],
+    .hImDzR[aria-expanded="true"] {
+      background-color: {{highlightColor}} !important;
+    }
+
+    .beVJOq,
+    .cYvszO {
+       background-color: {{secondaryBackground}} !important;
+       border: {{borderColor}} !important;
+    }
+
+    .kGYPAT {
+    color: {{accentColor}} !important;
+    }
+
     /* end doki addons */
 
   /* source #0: "transparent" */
@@ -16338,8 +16395,10 @@ select:-webkit-autofill:focus {
 .auto-search-group input[type="text"][aria-label] {
     background: {{textEditorBackground}};
 }
+
+
 /* focus hightlight */
-a:focus, button:focus, [tabindex] {
+a:focus, button:focus {
     outline-color: /*[[base-color]]*/ {{accentColor}} !important;
 }
 input.focus[type="text"], #adv_code_search .focus.search-page-label,

diff --git a/buildSrc/package.json b/buildSrc/package.json
@@ -12,7 +12,7 @@
     "@types/jest": "^26.0.0",
     "@types/lodash": "^4.14.157",
     "copy-webpack-plugin": "^6.0.2",
-    "doki-build-source": "84.2.4",
+    "doki-build-source": "84.2.7",
     "fetch-css": "^3.0.1",
     "jest": "^26.0.1",
     "lodash": "^4.17.21",

diff --git a/buildSrc/yarn.lock b/buildSrc/yarn.lock
@@ -2315,10 +2315,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
   integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
 
-[email protected].4:
-  version "84.2.4"
-  resolved "https://registry.yarnpkg.com/doki-build-source/-/doki-build-source-84.2.4.tgz#886e9be23447a0088928be92c6b3f8e032bb12f1"
-  integrity sha512-Nt8huxBM+92df4eGjRs1XX2lkkVmrnor8KJ1HQRRgDVC8Gq+mXTFfbg8EBM40Aj4tGE+iS9L1wjQB9bsjCtqDQ==
+[email protected].7:
+  version "84.2.7"
+  resolved "https://registry.yarnpkg.com/doki-build-source/-/doki-build-source-84.2.7.tgz#ef84454522831cde620a592a579f9d3579b21dc2"
+  integrity sha512-gQLMqpFFKI/uGRHQdlyIT/pVMyMv3LybF7zZynXtJAzNGWbG4BOHNwGFRcJaTtvL+uEJZE/6vsjLXPk0qaG4SA==
 
 dom-serializer@0:
   version "0.2.2"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "doki-theme-github",
-  "version": "88.1.1",
+  "version": "88.1.2",
   "dependencies": {
   }
 }
diff --git a/themes/aqua.user.css b/themes/aqua.user.css
@@ -1,7 +1,7 @@
 /* ==UserStyle==
 @name           Doki-Theme: Aqua
 @namespace      github.com/doki-theme
-@version        88.1.1
+@version        88.1.2
 @description    Cute anime themes for GitHub
 @author         Unthrottled
 @license        MIT
@@ -42,8 +42,15 @@
     :root {
       --color-previewable-comment-form-bg: #262940 !important;
       --color-avatar-bg: #262940 !important;
+      --color-btn-primary-bg: #578CDA !important;
+      --color-btn-primary-hover-bg: #578CDA !important;
+      --color-btn-primary-fg: #fbfbfb !important;
+      --color-btn-primary-icon: #fbfbfb !important;
       --color-fg-default: #bbbbbb !important;
-      --color-fg-muted: #bbbbbbAA !important;
+      --color-btn-text: #838daa !important;
+      --color-attention-subtle: #43444199 !important;
+      --color-attention-muted: #43444199 !important;
+      --color-accent-subtle: #578CDAAA !important;
       --color-auto-gray-3: #262940 !important;
       --color-auto-gray-1: #262940 !important;
       --color-avatar-border: #00000000 !important;
@@ -61,6 +68,8 @@
       --color-checks-step-header-open-bg: #2d3047 !important;
       --color-bg-discussions-row-emoji-box: #31374b !important;
       --color-current-user-tip-border: #31374b !important;
+      --color-btn-bg: #31374b !important;
+      --color-fg-muted: #7b8bab !important;
       --color-underlinenav-counter-text: #bbbbbb !important;
       --color-text-primary: #6893f3 !important;
       --color-text-link: #578CDA !important;
@@ -106,6 +115,10 @@
   color: #61647b !important;
 }
 
+span.Button-label:hover {
+      color: #fbfbfb;
+}
+
     .suggester li:hover .octicon,
     .suggester li[aria-selected="true"] .octicon {
       fill: #fbfbfb;
@@ -129,6 +142,10 @@
         opacity: 1 !important;
     }
 
+    .header-search-button.placeholder {
+    color: #7b8bab!important;
+    }
+
     input:-webkit-autofill,
     input:-webkit-autofill:hover,
     input:-webkit-autofill:focus,
@@ -201,6 +218,46 @@
       background-color: #31374b;
     }
 
+
+    /* new ui junk */
+
+    .koyZg th,
+    .PjhnZ th,
+    .ekYzge
+    {
+      background-color: #2a2d44 !important;
+    }
+
+    .kVpYHc {
+    border: #2a334b !important;
+    }
+
+    .kMwSDe .segmentedControl-content {
+       background-color: #31374b !important;
+       border-color: #578CDA !important;
+    }
+
+    .gZAWpy,
+    .bjLiTB,
+    .cNspDo, .dCpkrR, .edeeWf, .gHfWgt, .hImDzR, .cFcYmG {
+       background-color: #31374b !important;
+    }
+
+    .bxqzVV[aria-expanded="true"],
+    .hImDzR[aria-expanded="true"] {
+      background-color: #2d3047 !important;
+    }
+
+    .beVJOq,
+    .cYvszO {
+       background-color: #242942 !important;
+       border: #2a334b !important;
+    }
+
+    .kGYPAT {
+    color: #578CDA !important;
+    }
+
     /* end doki addons */
 
   /* source #0: "transparent" */
@@ -16338,8 +16395,10 @@ select:-webkit-autofill:focus {
 .auto-search-group input[type="text"][aria-label] {
     background: #262940;
 }
+
+
 /* focus hightlight */
-a:focus, button:focus, [tabindex] {
+a:focus, button:focus {
     outline-color: /*[[base-color]]*/ #578CDA !important;
 }
 input.focus[type="text"], #adv_code_search .focus.search-page-label,

diff --git a/themes/astolfo.user.css b/themes/astolfo.user.css
@@ -1,7 +1,7 @@
 /* ==UserStyle==
 @name           Doki-Theme: Astolfo
 @namespace      github.com/doki-theme
-@version        88.1.1
+@version        88.1.2
 @description    Cute anime themes for GitHub
 @author         Unthrottled
 @license        MIT
@@ -42,8 +42,15 @@
     :root {
       --color-previewable-comment-form-bg: #1a1c19 !important;
       --color-avatar-bg: #1a1c19 !important;
+      --color-btn-primary-bg: #d58d9c !important;
+      --color-btn-primary-hover-bg: #d58d9c !important;
+      --color-btn-primary-fg: #fbfbfb !important;
+      --color-btn-primary-icon: #fbfbfb !important;
       --color-fg-default: #bbbbbb !important;
-      --color-fg-muted: #bbbbbbAA !important;
+      --color-btn-text: #a7a7a7 !important;
+      --color-attention-subtle: #33331a99 !important;
+      --color-attention-muted: #33331a99 !important;
+      --color-accent-subtle: #d58d9cAA !important;
       --color-auto-gray-3: #1a1c19 !important;
       --color-auto-gray-1: #1a1c19 !important;
       --color-avatar-border: #00000000 !important;
@@ -61,6 +68,8 @@
       --color-checks-step-header-open-bg: #20221f !important;
       --color-bg-discussions-row-emoji-box: #242422 !important;
       --color-current-user-tip-border: #242422 !important;
+      --color-btn-bg: #242422 !important;
+      --color-fg-muted: #957a4d !important;
       --color-underlinenav-counter-text: #bbbbbb !important;
       --color-text-primary: #f6ebb7 !important;
       --color-text-link: #d58d9c !important;
@@ -106,6 +115,10 @@
   color: #8e856e !important;
 }
 
+span.Button-label:hover {
+      color: #fbfbfb;
+}
+
     .suggester li:hover .octicon,
     .suggester li[aria-selected="true"] .octicon {
       fill: #fbfbfb;
@@ -129,6 +142,10 @@
         opacity: 1 !important;
     }
 
+    .header-search-button.placeholder {
+    color: #957a4d!important;
+    }
+
     input:-webkit-autofill,
     input:-webkit-autofill:hover,
     input:-webkit-autofill:focus,
@@ -201,6 +218,46 @@
       background-color: #242422;
     }
 
+
+    /* new ui junk */
+
+    .koyZg th,
+    .PjhnZ th,
+    .ekYzge
+    {
+      background-color: #181917 !important;
+    }
+
+    .kVpYHc {
+    border: #212220 !important;
+    }
+
+    .kMwSDe .segmentedControl-content {
+       background-color: #242422 !important;
+       border-color: #d58d9c !important;
+    }
+
+    .gZAWpy,
+    .bjLiTB,
+    .cNspDo, .dCpkrR, .edeeWf, .gHfWgt, .hImDzR, .cFcYmG {
+       background-color: #242422 !important;
+    }
+
+    .bxqzVV[aria-expanded="true"],
+    .hImDzR[aria-expanded="true"] {
+      background-color: #241517 !important;
+    }
+
+    .beVJOq,
+    .cYvszO {
+       background-color: #141513 !important;
+       border: #212220 !important;
+    }
+
+    .kGYPAT {
+    color: #d58d9c !important;
+    }
+
     /* end doki addons */
 
   /* source #0: "transparent" */
@@ -16338,8 +16395,10 @@ select:-webkit-autofill:focus {
 .auto-search-group input[type="text"][aria-label] {
     background: #1a1c19;
 }
+
+
 /* focus hightlight */
-a:focus, button:focus, [tabindex] {
+a:focus, button:focus {
     outline-color: /*[[base-color]]*/ #d58d9c !important;
 }
 input.focus[type="text"], #adv_code_search .focus.search-page-label,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,4 @@ generatedThemes/*.json
		buildSrc/temp/

		/masterThemes
		.DS_Store