add One Dark Mix theme

Binaryify · Jun 11, 2022 · 4bb114b · 4bb114b
1 parent e31f42b
commit 4bb114b
Show file tree

Hide file tree

Showing 10 changed files with 2,371 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # CHANGELOG
+## 3.14.0 | 2022.06.11
+- Add "One Dark Mix" theme
+
 ## 3.13.29 | 2022.05.13
 - Fixed flat theme debugging statusbar's hover background error [#374](https://github.com/Binaryify/OneDark-Pro/issues/374)
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "material-theme",
   "displayName": "One Dark Pro",
   "description": "Atom‘s iconic One Dark theme for Visual Studio Code",
-  "version": "3.13.29",
+  "version": "3.14.0",
   "publisher": "zhuangtongfa",
   "license": "MIT",
   "bugs": {
@@ -117,6 +117,11 @@
         "label": "One Dark Pro Darker",
         "uiTheme": "vs-dark",
         "path": "./themes/OneDark-Pro-darker.json"
+      },
+      {
+        "label": "One Dark Pro Mix",
+        "uiTheme": "vs-dark",
+        "path": "./themes/OneDark-Pro-mix.json"
       }
     ],
     "configuration": {
@@ -138,6 +143,7 @@
             "VS Code",
             "Just Black",
             "One Dark Pro Darker",
+            "One Dark Pro Mix",
             "Ocean",
             "Tokyo",
             "Retro",

diff --git a/scripts/generate-theme.ts b/scripts/generate-theme.ts
@@ -3,6 +3,7 @@ import { Theme } from '../src/themes/Theme'
 import * as defaultSettings from '../src/defaultConfig.json'
 import * as flatConfig from '../src/flatConfig.json'
 import * as darkerConfig from '../src/darkerConfig.json'
+import * as mixConfig from '../src/mixConfig.json'
 import { promises as fs } from 'fs'
 
 export function writeFile(path: string, data: unknown): Promise<void> {
@@ -24,5 +25,10 @@ async function main() {
     join(__dirname, '..', 'themes', 'OneDark-Pro-darker.json'),
     await Theme.init(darkerConfig)
   )
+
+  writeFile(
+    join(__dirname, '..', 'themes', 'OneDark-Pro-mix.json'),
+    await Theme.init(mixConfig)
+  )
 }
 main()
diff --git a/scss/atom-one-dark-inside.scss b/scss/atom-one-dark-inside.scss
@@ -18,6 +18,7 @@ hue-6-2: #e6c07b
 
 */
 .vscode-dark {
+  &[data-vscode-theme-name='One Dark Pro Mix'],
   &[data-vscode-theme-name='One Dark Pro Flat'],
   &[data-vscode-theme-name='One Dark Pro Darker'],
   &[data-vscode-theme-name='One Dark Pro'] {

diff --git a/scss/base-inside.scss b/scss/base-inside.scss
@@ -1,4 +1,5 @@
 .vscode-dark {
+  &[data-vscode-theme-name='One Dark Pro Mix'],
   &[data-vscode-theme-name='One Dark Pro Flat'],
   &[data-vscode-theme-name='One Dark Pro Darker'],
   &[data-vscode-theme-name='One Dark Pro'] {

diff --git a/scss/markdown-inside.scss b/scss/markdown-inside.scss
@@ -5,6 +5,7 @@
     format('woff');
 }
 .vscode-dark {
+  &[data-vscode-theme-name='One Dark Pro Mix'],
   &[data-vscode-theme-name='One Dark Pro Flat'],
   &[data-vscode-theme-name='One Dark Pro Darker'],
   &[data-vscode-theme-name='One Dark Pro'] {

diff --git a/src/mixConfig.json b/src/mixConfig.json
@@ -0,0 +1,6 @@
+{
+    "bold": true,
+    "editorTheme": "One Dark Pro Mix",
+    "italic": false,
+    "vivid": false
+}
diff --git a/src/themes/data/oneDarkProMix.ts b/src/themes/data/oneDarkProMix.ts
@@ -0,0 +1,141 @@
+export default {
+  'activityBar.background': '#21252b',
+  'activityBar.foreground': '#d7dae0',
+  'activityBarBadge.background': '#4d78cc',
+  'activityBarBadge.foreground': '#f8fafd',
+  'badge.background': '#282c34',
+  'button.background': '#404754',
+  'button.secondaryBackground': '#30333d',
+  'button.secondaryForeground': '#c0bdbd',
+  'checkbox.border': '#404754',
+  'debugToolBar.background': '#21252bf',
+  descriptionForeground: '#abb2bf',
+  'diffEditor.insertedTextBackground': '#00809b33',
+  'dropdown.background': '#21252b',
+  'dropdown.border': '#21252b',
+  'editor.background': '#282c34',
+  'editor.findMatchBackground': '#42557b',
+  'editor.findMatchBorder': '#457dff',
+  'editor.findMatchHighlightBackground': '#6199ff2f',
+  'editor.foreground': '#abb2bf',
+  "editorBracketHighlight.foreground1": "#d19a66",
+  "editorBracketHighlight.foreground2": "#c678dd",
+  "editorBracketHighlight.foreground3": "#56b6c2",
+  'editorHoverWidget.highlightForeground': '#61afef',
+  'editorInlayHint.foreground': '#abb2bf',
+  'editorInlayHint.background': '#2c313c',
+  'editor.lineHighlightBackground': '#2c313c',
+  'editorLineNumber.activeForeground': '#abb2bf',
+  'editorGutter.addedBackground': '#109868',
+  'editorGutter.deletedBackground': '#9A353D',
+  'editorGutter.modifiedBackground': '#948B60',
+  'editorOverviewRuler.addedBackground': '#109868',
+  'editorOverviewRuler.deletedBackground': '#9A353D',
+  'editorOverviewRuler.modifiedBackground': '#948B60',
+  'editor.selectionBackground': '#67769660',
+  'editor.selectionHighlightBackground': '#ffffff10',
+  'editor.selectionHighlightBorder': '#dddddd',
+  'editor.wordHighlightBackground': '#d2e0ff2f',
+  'editor.wordHighlightBorder': '#7f848e',
+  'editor.wordHighlightStrongBackground': '#abb2bf26',
+  'editor.wordHighlightStrongBorder': '#7f848e',
+  'editorActiveLineNumber.foreground': '#737984',
+  'editorBracketMatch.background': '#515a6b',
+  'editorBracketMatch.border': '#515a6b',
+  'editorCursor.background': '#ffffffc9',
+  'editorCursor.foreground': '#528bff',
+  'editorError.foreground': '#c24038',
+  'editorGroup.background': '#181a1f',
+  'editorGroup.border': '#181a1f',
+  'editorGroupHeader.tabsBackground': '#21252b',
+  'editorHoverWidget.background': '#21252b',
+  'editorHoverWidget.border': '#181a1f',
+  'editorIndentGuide.activeBackground': '#c8c8c859',
+  'editorIndentGuide.background': '#3b4048',
+  'editorLineNumber.foreground': '#495162',
+  'editorMarkerNavigation.background': '#21252b',
+  'editorRuler.foreground': '#abb2bf26',
+  'editorSuggestWidget.background': '#21252b',
+  'editorSuggestWidget.border': '#181a1f',
+  'editorSuggestWidget.selectedBackground': '#2c313a',
+  'editorWarning.foreground': '#d19a66',
+  'editorWhitespace.foreground': '#3b4048',
+  'editorWidget.background': '#21252b',
+  focusBorder: '#3e4452c3',
+  'gitDecoration.ignoredResourceForeground': '#636b78',
+  'input.background': '#1d1f23',
+  'list.activeSelectionBackground': '#2c313a',
+  'list.activeSelectionForeground': '#d7dae0',
+  'list.focusBackground': '#323842',
+  'list.focusForeground': '#f0f0f0',
+  'list.highlightForeground': '#c5c5c5',
+  'list.hoverBackground': '#2c313a',
+  'list.hoverForeground': '#fff',
+  'list.inactiveSelectionBackground': '#323842',
+  'list.inactiveSelectionForeground': '#d7dae0',
+  'list.warningForeground': '#d19a66',
+  'menu.foreground': '#abb2bf',
+  'menu.separatorBackground': '#343a45',
+  'minimapGutter.addedBackground': '#109868',
+  'minimapGutter.deletedBackground': '#9A353D',
+  'minimapGutter.modifiedBackground': '#948B60',
+  "panel.border": "#3e4452",
+  'panelSectionHeader.background': '#21252b',
+  'peekViewEditor.background': '#1b1d23',
+  'peekViewEditor.matchHighlightBackground': '#29244b',
+  'peekViewResult.background': '#22262b',
+  'scrollbar.shadow': '#23252c',
+  'scrollbarSlider.activeBackground': '#747d9180',
+  'scrollbarSlider.background': '#4e566660',
+  'scrollbarSlider.hoverBackground': '#5a637580',
+  'settings.focusedRowBackground': '#282c34',
+  'settings.headerForeground': '#fff',
+  'sideBar.background': '#21252b',
+  'sideBar.foreground': '#abb2bfc4',
+  'sideBarSectionHeader.background': '#21252b',
+  'sideBarSectionHeader.foreground': '#abb2bf',
+  'statusBar.background': '#21252b',
+  'statusBar.debuggingBackground': '#cc6633',
+  'statusBar.debuggingBorder': '#ff000000',
+  'statusBar.debuggingForeground': '#ffffff',
+  'statusBar.foreground': '#9da5b4',
+  'statusBar.noFolderBackground': '#21252b',
+  'statusBarItem.remoteBackground': '#4d78cc',
+  'statusBarItem.remoteForeground': '#f8fafd',
+  'tab.activeBackground': '#282c34',
+  'tab.activeForeground': '#dcdcdc',
+  'tab.border': '#181a1f',
+  'tab.hoverBackground': '#323842',
+  'tab.inactiveBackground': '#21252b',
+  'tab.unfocusedHoverBackground': '#323842',
+  'terminal.ansiBlack': '#3f4451',
+  'terminal.ansiBlue': '#4aa5f0',
+  'terminal.ansiBrightBlack': '#4f5666',
+  'terminal.ansiBrightBlue': '#4dc4ff',
+  'terminal.ansiBrightCyan': '#4cd1e0',
+  'terminal.ansiBrightGreen': '#a5e075',
+  'terminal.ansiBrightMagenta': '#de73ff',
+  'terminal.ansiBrightRed': '#ff616e',
+  'terminal.ansiBrightWhite': '#d7dae0',
+  'terminal.ansiBrightYellow': '#f0a45d',
+  'terminal.ansiCyan': '#42b3c2',
+  'terminal.ansiGreen': '#8cc265',
+  'terminal.ansiMagenta': '#c162de',
+  'terminal.ansiRed': '#e05561',
+  'terminal.ansiWhite': '#e6e6e6',
+  'terminal.ansiYellow': '#d18f52',
+  'terminal.background': '#282c34',
+  'terminal.border': '#3e4452',
+  'terminal.foreground': '#abb2bf',
+  'terminal.selectionBackground': '#abb2bf30',
+  'textBlockQuote.background': '#2e3440',
+  'textBlockQuote.border': '#4b5362',
+  'textLink.foreground': '#61afef',
+  'textPreformat.foreground': '#d19a66',
+  'titleBar.activeBackground': '#21252b',
+  'titleBar.activeForeground': '#9da5b4',
+  'titleBar.inactiveBackground': '#21252b',
+  'titleBar.inactiveForeground': '#6b717d',
+  'walkThrough.embeddedEditorBackground': '#2e3440',
+  'welcomePage.buttonHoverBackground': '#404754',
+}
diff --git a/src/themes/themeData.ts b/src/themes/themeData.ts
@@ -53,6 +53,7 @@ export default {
     'One Dark Pro': () => import('./data/oneDarkPro'),
     'One Dark Pro Flat': () => import('./data/oneDarkProFlat'),
     'One Dark Pro Darker': () => import('./data/oneDarkProDarker'),
+    'One Dark Pro Mix': () => import('./data/oneDarkProMix'),
     Panda: () => import('./data/panda'),
     Solarized: () => import('./data/solarized'),
     'Solarized Flat': () => import('./data/solarizedFlat'),