Skip to content

Commit

Permalink
GitHub Update Fixes (#34)
Browse files Browse the repository at this point in the history
* Fixed action ui, and added copy assets

* No More github project sadness (fixes #21)

* updated timeline styles (fixes #10)

* Updated changelog and bumped version to v7.1.0
  • Loading branch information
Unthrottled authored Apr 7, 2021
1 parent d13f59b commit 28bbd4c
Show file tree
Hide file tree
Showing 52 changed files with 738 additions and 100 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
Changelog
---

# 7.1.0 [Issue Fixes]

Fixed the following issues:

- GitHub CSS Sadness [#21](https://github.com/doki-theme/doki-theme-github/issues/21)
- Timeline Styling Updates [#10](https://github.com/doki-theme/doki-theme-github/issues/21)

# 7.0.0 [Astolfo, Maika, Rias, & Rei]

## 4 New Themes
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 14 additions & 1 deletion buildSrc/assets/templates/tempCss.css.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
:root {
--color-previewable-comment-form-bg: {{textEditorBackground}} !important;
--color-avatar-bg: {{textEditorBackground}} !important;
--color-auto-gray-3: {{textEditorBackground}} !important;
--color-avatar-border: #00000000 !important;
--color-bg-canvas: {{baseBackground}} !important;
--color-bg-canvas-inset: {{baseBackground}} !important;
Expand All @@ -50,20 +51,25 @@
--color-workflow-card-bg: {{codeBlock}} !important;
--color-bg-tertiary: {{textEditorBackground}} !important;
--color-bg-secondary: {{caretRow}} !important;
--color-checks-step-header-open-bg: {{caretRow}} !important;
--color-bg-discussions-row-emoji-box: {{buttonColor}} !important;
--color-current-user-tip-border {{buttonColor}} !important;
--color-underlinenav-counter-text: {{foregroundColor}} !important;
--color-text-primary: {{keyColor}} !important;
--color-text-link: {{accentColor}} !important;
--color-shadow-large: 0 8px 24px {{accentColor}}22 !important;
--color-alert-warn-bg: {{nonProjectFileScopeColor}} !important;
--color-alert-info-bg: {{headerColor}} !important;
--color-checks-bg: {{headerColor}} !important;
--color-checks-header-border: {{headerColor}} !important;
--color-alert-error-bg: #ff000022 !important;
--color-calendar-graph-day-L1-bg: {{accentColor}}77 !important;
--color-calendar-graph-day-L2-bg: {{accentColor}}CC !important;
--color-calendar-graph-day-L3-bg: {{accentColor}}FF !important;
--color-calendar-graph-day-L4-bg: {{stopColor}} !important;
--color-verified-badge-bg: #00000000 !important;
--color-bg-overlay: {{secondaryBackground}} !important;
--color-project-sidebar-bg: {{secondaryBackground}} !important;
--color-border-primary: {{borderColor}} !important;
--color-notifications-row-read-bg: {{codeBlock}} !important;
--color-notifications-row-bg: {{caretRow}} !important;
Expand Down Expand Up @@ -126,6 +132,12 @@
justify-content: space-between;
}

.timeline-comment--caret.current-user::after {
border-color: {{borderColor}} !important;
background-image: none !important;
background: {{buttonColor}};
}

.form-control, .form-select {
box-shadow: none !important;
}
Expand Down Expand Up @@ -7496,8 +7508,9 @@
border-bottom-color: {{borderColor}};
}
/* source #5: "color: #586069" */
.Link--primary,
.timeline-comment-header .author {
color: {{foregroundColor}}CC;
color: {{accentColor}} !important;
}
/* source #5: "rgba(27,31,35,.15)" */
.timeline-comment-label {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
"overrides": {},
"laf": {},
"syntax": {},
"colors": {}
"colors": {
"defaultButtonColor": "&baseBackground&"
}
}
3 changes: 2 additions & 1 deletion buildSrc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
},
"dependencies": {},
"scripts": {
"buildThemes": "ts-node ./src/BuildThemes.ts"
"buildThemes": "ts-node ./src/BuildThemes.ts",
"copyAssets": "ts-node ./src/CopyAssets.ts"
}
}
43 changes: 43 additions & 0 deletions buildSrc/src/CopyAssets.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import { resolvePaths, walkDir } from "doki-build-source";
import path from "path";
import fs from 'fs';

const { repoDirectory } = resolvePaths(__dirname);

const dokiThemeAssets = path.resolve(
repoDirectory,
"..",
"doki-theme-assets",
"stickers",
"vscode"
);

walkDir(dokiThemeAssets).then((assetPaths) => {
const stickerAssets = assetPaths.filter(
(assetPath) => !assetPath.endsWith("checksum.txt")
);

stickerAssets.forEach((dokiStickerAssetPath) => {
const githubStickerAsset = path.resolve(
repoDirectory,
"assets",
"stickers"
);
const githubStickerPath = path.join(
githubStickerAsset,
dokiStickerAssetPath.substr(dokiThemeAssets.length)
);
const githubAssetExists = fs.existsSync(githubStickerPath);
if(!githubAssetExists) {
console.log('copying over ', dokiStickerAssetPath);

fs.mkdirSync(path.resolve(githubStickerPath, ".."), {
recursive: true,
});

fs.copyFileSync(
dokiStickerAssetPath, githubStickerPath
)
}
});
});
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "doki-theme-github",
"version": "7.0.0",
"version": "7.1.0",
"dependencies": {
}
}
17 changes: 15 additions & 2 deletions themes/aqua.user.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* ==UserStyle==
@name Doki-Theme: Aqua
@namespace github.com/doki-theme
@version 7.0.0
@version 7.1.0
@description Browse code with your waifu.
@author Unthrottled
@license MIT
Expand Down Expand Up @@ -42,6 +42,7 @@
:root {
--color-previewable-comment-form-bg: #262940 !important;
--color-avatar-bg: #262940 !important;
--color-auto-gray-3: #262940 !important;
--color-avatar-border: #00000000 !important;
--color-bg-canvas: #282b42 !important;
--color-bg-canvas-inset: #282b42 !important;
Expand All @@ -50,20 +51,25 @@
--color-workflow-card-bg: #2e3149 !important;
--color-bg-tertiary: #262940 !important;
--color-bg-secondary: #2d3047 !important;
--color-checks-step-header-open-bg: #2d3047 !important;
--color-bg-discussions-row-emoji-box: #31374b !important;
--color-current-user-tip-border #31374b !important;
--color-underlinenav-counter-text: #bbbbbb !important;
--color-text-primary: #6893f3 !important;
--color-text-link: #578CDA !important;
--color-shadow-large: 0 8px 24px #578CDA22 !important;
--color-alert-warn-bg: #2e3242 !important;
--color-alert-info-bg: #2a2d44 !important;
--color-checks-bg: #2a2d44 !important;
--color-checks-header-border: #2a2d44 !important;
--color-alert-error-bg: #ff000022 !important;
--color-calendar-graph-day-L1-bg: #578CDA77 !important;
--color-calendar-graph-day-L2-bg: #578CDACC !important;
--color-calendar-graph-day-L3-bg: #578CDAFF !important;
--color-calendar-graph-day-L4-bg: #688dee !important;
--color-verified-badge-bg: #00000000 !important;
--color-bg-overlay: #242942 !important;
--color-project-sidebar-bg: #242942 !important;
--color-border-primary: #2a334b !important;
--color-notifications-row-read-bg: #2e3149 !important;
--color-notifications-row-bg: #2d3047 !important;
Expand Down Expand Up @@ -126,6 +132,12 @@
justify-content: space-between;
}

.timeline-comment--caret.current-user::after {
border-color: #2a334b !important;
background-image: none !important;
background: #31374b;
}

.form-control, .form-select {
box-shadow: none !important;
}
Expand Down Expand Up @@ -7496,8 +7508,9 @@
border-bottom-color: #2a334b;
}
/* source #5: "color: #586069" */
.Link--primary,
.timeline-comment-header .author {
color: #bbbbbbCC;
color: #578CDA !important;
}
/* source #5: "rgba(27,31,35,.15)" */
.timeline-comment-label {
Expand Down
17 changes: 15 additions & 2 deletions themes/astolfo.user.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* ==UserStyle==
@name Doki-Theme: Astolfo
@namespace github.com/doki-theme
@version 7.0.0
@version 7.1.0
@description Browse code with your waifu.
@author Unthrottled
@license MIT
Expand Down Expand Up @@ -42,6 +42,7 @@
:root {
--color-previewable-comment-form-bg: #1a1c19 !important;
--color-avatar-bg: #1a1c19 !important;
--color-auto-gray-3: #1a1c19 !important;
--color-avatar-border: #00000000 !important;
--color-bg-canvas: #171816 !important;
--color-bg-canvas-inset: #171816 !important;
Expand All @@ -50,20 +51,25 @@
--color-workflow-card-bg: #201d1d !important;
--color-bg-tertiary: #1a1c19 !important;
--color-bg-secondary: #20221f !important;
--color-checks-step-header-open-bg: #20221f !important;
--color-bg-discussions-row-emoji-box: #242422 !important;
--color-current-user-tip-border #242422 !important;
--color-underlinenav-counter-text: #bbbbbb !important;
--color-text-primary: #f6ebb7 !important;
--color-text-link: #d58d9c !important;
--color-shadow-large: 0 8px 24px #d58d9c22 !important;
--color-alert-warn-bg: #1e2015 !important;
--color-alert-info-bg: #181917 !important;
--color-checks-bg: #181917 !important;
--color-checks-header-border: #181917 !important;
--color-alert-error-bg: #ff000022 !important;
--color-calendar-graph-day-L1-bg: #d58d9c77 !important;
--color-calendar-graph-day-L2-bg: #d58d9cCC !important;
--color-calendar-graph-day-L3-bg: #d58d9cFF !important;
--color-calendar-graph-day-L4-bg: #eecc4b !important;
--color-verified-badge-bg: #00000000 !important;
--color-bg-overlay: #141513 !important;
--color-project-sidebar-bg: #141513 !important;
--color-border-primary: #212220 !important;
--color-notifications-row-read-bg: #201d1d !important;
--color-notifications-row-bg: #20221f !important;
Expand Down Expand Up @@ -126,6 +132,12 @@
justify-content: space-between;
}

.timeline-comment--caret.current-user::after {
border-color: #212220 !important;
background-image: none !important;
background: #242422;
}

.form-control, .form-select {
box-shadow: none !important;
}
Expand Down Expand Up @@ -7496,8 +7508,9 @@
border-bottom-color: #212220;
}
/* source #5: "color: #586069" */
.Link--primary,
.timeline-comment-header .author {
color: #bbbbbbCC;
color: #d58d9c !important;
}
/* source #5: "rgba(27,31,35,.15)" */
.timeline-comment-label {
Expand Down
17 changes: 15 additions & 2 deletions themes/asuna_dark.user.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* ==UserStyle==
@name Doki-Theme: Asuna Dark
@namespace github.com/doki-theme
@version 7.0.0
@version 7.1.0
@description Browse code with your waifu.
@author Unthrottled
@license MIT
Expand Down Expand Up @@ -42,6 +42,7 @@
:root {
--color-previewable-comment-form-bg: #1b1b1b !important;
--color-avatar-bg: #1b1b1b !important;
--color-auto-gray-3: #1b1b1b !important;
--color-avatar-border: #00000000 !important;
--color-bg-canvas: #202020 !important;
--color-bg-canvas-inset: #202020 !important;
Expand All @@ -50,20 +51,25 @@
--color-workflow-card-bg: #232323 !important;
--color-bg-tertiary: #1b1b1b !important;
--color-bg-secondary: #1f1f1f !important;
--color-checks-step-header-open-bg: #1f1f1f !important;
--color-bg-discussions-row-emoji-box: #272524 !important;
--color-current-user-tip-border #272524 !important;
--color-underlinenav-counter-text: #bbbbbb !important;
--color-text-primary: #3B82BD !important;
--color-text-link: #99202c !important;
--color-shadow-large: 0 8px 24px #99202c22 !important;
--color-alert-warn-bg: #20221c !important;
--color-alert-info-bg: #1e1e1e !important;
--color-checks-bg: #1e1e1e !important;
--color-checks-header-border: #1e1e1e !important;
--color-alert-error-bg: #ff000022 !important;
--color-calendar-graph-day-L1-bg: #99202c77 !important;
--color-calendar-graph-day-L2-bg: #99202cCC !important;
--color-calendar-graph-day-L3-bg: #99202cFF !important;
--color-calendar-graph-day-L4-bg: #ab2228 !important;
--color-verified-badge-bg: #00000000 !important;
--color-bg-overlay: #1c1c1c !important;
--color-project-sidebar-bg: #1c1c1c !important;
--color-border-primary: #2a2929 !important;
--color-notifications-row-read-bg: #232323 !important;
--color-notifications-row-bg: #1f1f1f !important;
Expand Down Expand Up @@ -126,6 +132,12 @@
justify-content: space-between;
}

.timeline-comment--caret.current-user::after {
border-color: #2a2929 !important;
background-image: none !important;
background: #272524;
}

.form-control, .form-select {
box-shadow: none !important;
}
Expand Down Expand Up @@ -7496,8 +7508,9 @@
border-bottom-color: #2a2929;
}
/* source #5: "color: #586069" */
.Link--primary,
.timeline-comment-header .author {
color: #bbbbbbCC;
color: #99202c !important;
}
/* source #5: "rgba(27,31,35,.15)" */
.timeline-comment-label {
Expand Down
Loading

0 comments on commit 28bbd4c

Please sign in to comment.