Rlease 1.4.0

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## Release - 1.4.0
+
+- 5th public release.
+
+### Added in 1.4.0
+
+- Merge Conflict colors.
+
+### Updated in 1.4.0
+
+- None
+
+### Removed in 1.4.0
+
+- None.
+
 ## Release - 1.3.0
 
 - 4th public release.

README.md

@@ -23,68 +23,98 @@ A dark color theme for Visual Studio Code with a full black UI. -->
 
 <br/><br/>
 
+## Features
+
+### Implemented Theme Colors (UI)
+
+[x] Base colors
+
+
 ## Available Variants
 
-`Styx` - Default variant
-<div align="center">
+<figure align="center" class="image">
 	<img alt="styx-preview" src="https://raw.githubusercontent.com/hshhrr/vscode-styx/main/assets/previews/styx-preview.png?raw=true">
-</div>
+  	<figcaption>Styx</figcaption>
+</figure>
 
-<br/>
-
-`Styx+` - Default variant with colored brackets
-<div align="center">
+<figure align="center" class="image">
 	<img alt="styx-plus-preview" src="https://raw.githubusercontent.com/hshhrr/vscode-styx/main/assets/previews/styx-plus-preview.png?raw=true">
-</div>
+  	<figcaption>Styx+</figcaption>
+</figure>
 
-<br/>
-
-`Styx Dracula` - [Dracula Official](https://marketplace.visualstudio.com/items?itemName=dracula-theme.theme-dracula) inspired variant
-<div align="center">
+<figure align="center" class="image">
 	<img alt="styx-dracula-preview" src="https://raw.githubusercontent.com/hshhrr/vscode-styx/main/assets/previews/styx-dracula-preview.png?raw=true">
-</div>
-
-<br/>
+  	<figcaption>Styx Dracula</figcaption>
+</figure>
 
-`Styx Fleet` - [JetBrains Fleet](https://www.jetbrains.com/fleet/) inspired variant
-<div align="center">
+<figure align="center" class="image">
 	<img alt="styx-fleet-preview" src="https://raw.githubusercontent.com/hshhrr/vscode-styx/main/assets/previews/styx-fleet-preview.png?raw=true">
-</div>
-
-<br/>
+  	<figcaption>Styx Fleet</figcaption>
+</figure>
 
-`Styx Material` - [Material Theme](https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme) inspired variant
-<div align="center">
+<figure align="center" class="image">
 	<img alt="styx-material-preview" src="https://raw.githubusercontent.com/hshhrr/vscode-styx/main/assets/previews/styx-material-preview.png?raw=true">
-</div>
-
-<br/>
+  	<figcaption>Styx Material</figcaption>
+</figure>
 
-`Styx Monokai` - [Monokai Pro](https://marketplace.visualstudio.com/items?itemName=monokai.theme-monokai-pro-vscode) inspired variant
-<div align="center">
+<figure align="center" class="image">
 	<img alt="styx-monokai-preview" src="https://raw.githubusercontent.com/hshhrr/vscode-styx/main/assets/previews/styx-monokai-preview.png?raw=true">
-</div>
+  	<figcaption>Styx Monokai</figcaption>
+</figure>
 
-<br/>
-
-`Styx VSCode` - [VSCode Drak+ v2](https://code.visualstudio.com/) inspired variant
-
-<div align="center">
+<figure align="center" class="image">
 	<img alt="styx-vscode-preview" src="https://raw.githubusercontent.com/hshhrr/vscode-styx/main/assets/previews/styx-vscode-preview.png?raw=true">
-	<!-- <em>image_caption</em> -->
-</div>
+  	<figcaption>Styx VSCode</figcaption>
+</figure>
 
 <br/>
 
 ## Appendix
 
 ### Additional Resources
+
 - `Font` - [JetBrains Mono](https://www.jetbrains.com/lp/mono/)
 - `File Icon Theme` - [Quill Icons](https://marketplace.visualstudio.com/items?itemName=cdonohue.quill-icons)
 - `Product Icon theme` - [Carbon Product Icons](https://marketplace.visualstudio.com/items?itemName=antfu.icons-carbon)
 
 ### Installation
-Theme can be installed from it's Visual Studio Marketplace page - [[Styx](https://marketplace.visualstudio.com/items?itemName=hshhrr.styx)], or just download the packaged extension from github releases and use the following snippet to install.
+
+3 ways to install the theme extension -
+
+- Theme can be installed from it's Visual Studio Marketplace page - [Styx](https://marketplace.visualstudio.com/items?itemName=hshhrr.styx).
+
+- Install the theme from command prompt using this command
+
+```powershell
+ext install styx
+```
+
+- Download the packaged extension from [GitHub releases](https://github.com/hshhrr/vscode-styx/releases) or Visual Studio Marketplace page - [Styx](https://marketplace.visualstudio.com/items?itemName=hshhrr.styx), and install using following command
+
 ```powershell
-code --install-extension styx-1.0.0.vsix
+code --install-extension styx-1.4.0.vsix
 ```
+
+### Inspirations
+
+This theme is inspired from a few great (some are age old at this point, some are new) themes or color schemes. You may want to check them out -
+
+- [Dracula Official](https://marketplace.visualstudio.com/items?itemName=dracula-theme.theme-dracula)
+
+- [Jetbrains Fleet Theme](https://marketplace.visualstudio.com/items?itemName=MichaelZhou.fleet-theme), [JetBrains Fleet](https://www.jetbrains.com/fleet/)
+
+- [Material Theme](https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme)
+
+- [Monokai Pro](https://marketplace.visualstudio.com/items?itemName=monokai.theme-monokai-pro-vscode)
+
+- [VSCode Drak+ v2](https://code.visualstudio.com/)
+
+- [Min Theme](https://marketplace.visualstudio.com/items?itemName=miguelsolorio.min-theme)
+
+- [Panda Theme](https://marketplace.visualstudio.com/items?itemName=tinkertrain.theme-panda)
+
+- [Ancient One Dark](https://marketplace.visualstudio.com/items?itemName=uetchy.ancient-one-dark)
+
+- [Moegi Theme](https://marketplace.visualstudio.com/items?itemName=ddiu8081.moegi-theme)
+
+- [Lotus Theme](https://plugins.jetbrains.com/plugin/14369-lotus-theme)

package.json

@@ -3,7 +3,7 @@
   "displayName": "Styx",
   "description": "Pitch Black theme for Visual Studio Code.",
   "publisher": "hshhrr",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "icon": "assets/styx.png",
   "galleryBanner": {
     "color": "#0D1117",

src/colors.py

@@ -33,12 +33,12 @@ class BaseColors:
     pa2: str = get_shade(pa0, 80, 20)
 
     # Secondary Accent
-    sa0: str = hsv2hex(210, 50, 100)
-    sa1: str = get_shade(sa0, 80, 35)
-    sa2: str = get_shade(sa0, 80, 15)
+    sa0: str = hsv2hex(210, 40, 100)
+    sa1: str = get_shade(sa0, 80, 40)
+    sa2: str = get_shade(sa0, 80, 20)
 
     # Warning Accent
-    wa0: str = hsv2hex(45, 35, 100)
+    wa0: str = hsv2hex(55, 45, 100)
     wa1: str = get_shade(wa0, 80, 35)
     wa2: str = get_shade(wa0, 80, 15)
 
@@ -48,7 +48,7 @@ class BaseColors:
     da2: str = get_shade(da0, 60, 20)
 
     # Error Accent
-    ea0: str = hsv2hex(0, 50, 100)
+    ea0: str = hsv2hex(0, 55, 100)
     ea1: str = get_shade(ea0, 80, 35)
     ea2: str = get_shade(ea0, 80, 15)
 

src/common.py

@@ -385,24 +385,24 @@ def get_ui_colors() -> dict:
         "peekViewTitleLabel.foreground": bc.fg0,
 
         # <<- Merge conflicts colors ->>
-        # "merge.currentHeaderBackground": bc.red,
-        # "merge.currentContentBackground": bc.red,
-        # "merge.incomingHeaderBackground": bc.red,
-        # "merge.incomingContentBackground": bc.red,
+        "merge.currentHeaderBackground": bc.pa1 + "90",
+        "merge.currentContentBackground": bc.pa2 + "90",
+        "merge.incomingHeaderBackground": bc.sa1 + "90",
+        "merge.incomingContentBackground": bc.sa2 + "90",
         # "merge.border": bc.red,
         # "merge.commonContentBackground": bc.red,
         # "merge.commonHeaderBackground": bc.red,
         # "editorOverviewRuler.currentContentForeground": bc.red,
         # "editorOverviewRuler.incomingContentForeground": bc.red,
         # "editorOverviewRuler.commonContentForeground": bc.red,
-        # "mergeEditor.change.background": bc.red,
-        # "mergeEditor.change.word.background": bc.red,
-        # "mergeEditor.conflict.unhandledUnfocused.border": bc.red,
-        # "mergeEditor.conflict.unhandledFocused.border": bc.red,
-        # "mergeEditor.conflict.handledUnfocused.border": bc.red,
-        # "mergeEditor.conflict.handledFocused.border": bc.red,
-        # "mergeEditor.conflict.handled.minimapOverViewRuler": bc.red,
-        # "mergeEditor.conflict.unhandled.minimapOverViewRuler": bc.red,
+        "mergeEditor.change.background": bc.pa2 + "90",
+        "mergeEditor.change.word.background": bc.pa1 + "90",
+        "mergeEditor.conflict.unhandledUnfocused.border": bc.wa1,
+        "mergeEditor.conflict.unhandledFocused.border": bc.wa1,
+        "mergeEditor.conflict.handledUnfocused.border": bc.pa1,
+        "mergeEditor.conflict.handledFocused.border": bc.pa1,
+        "mergeEditor.conflict.handled.minimapOverViewRuler": bc.pa1,
+        "mergeEditor.conflict.unhandled.minimapOverViewRuler": bc.wa1,
         # "mergeEditor.conflictingLines.background": bc.red,
         # "mergeEditor.changeBase.background": bc.red,
         # "mergeEditor.changeBase.word.background": bc.red,