Merge pull request #10 from josefaidt/1.5.0

1.5.0
josefaidt · Sep 2, 2018 · 24d5826 · 24d5826
2 parents 418a47b + 2608230
commit 24d5826
Show file tree

Hide file tree

Showing 8 changed files with 278 additions and 56 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,5 +5,6 @@ samples/
 copy.sh
 build/
 dist/
+img/admin
 .DS_Store
 notes.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,35 @@ All notable changes to the "rouge-theme" extension will be documented in this fi
 
 ## [Released]
 ---
+## [1.5.0] - 2018-09-02
+### Added
+- editor:
+  - settings (preview) - defined colors from existing palette
+  - panel border to match palette [trello card CvzSFwiQ](https://trello.com/c/CvzSFwiQ)
+  - paneltitle border, foreground, inactive foreground to match palette
+  - editorGroup border color set to match palette
+
+### Changed
+- editor:
+  - color consolidation: #293a57 from #444955 for better contrast
+    - list hover
+    - list inactive highlight
+    - statusbar item highlight
+    - command palette highlight
+    - welcome button hover
+    - peekViewResult selection background
+  - re-enabled activitybar border, same as sidebar #1A2335
+
+### Fixed
+- syntax:
+  - [GLOBAL/JS] decimal point [trello card tB7lQr3a](https://trello.com/c/tB7lQr3a)
+  - [SCSS] comma at-rule each [trello card BQxiiU9o](https://trello.com/c/BQxiiU9o)
+- editor:
+  - Error Foreground (i.e. "No Results") made rouge [trello card KISaJIyw](https://trello.com/c/KISaJIyw)
+  - [GLOBAL/JS] colon always green [trello card FMwErbYb](https://trello.com/c/FMwErbYb)
+  - [Markdown] small issue with <> contained items [trello card 31kJCZub](https://trello.com/c/31kJCZub)
+  - [CSS/SCSS] punctuation color match green
+
 ## [1.4.7] - 2018-08-31
 ### Added
 - editor:

diff --git a/README.md b/README.md
@@ -1,4 +1,15 @@
 # Rouge Theme for VSCode
+
+<p align="center">
+  <a href="https://github.com/josefaidt/rouge-theme">
+    <img
+      alt="Rouge"
+      src="https://raw.githubusercontent.com/josefaidt/rouge-theme/master/img/banner_large.png"
+      width="1000"
+    />
+  </a>
+</p>
+
 [![Version](https://vsmarketplacebadge.apphb.com/version/josef.rouge-theme.svg)](https://marketplace.visualstudio.com/items?itemName=josef.rouge-theme)![Installs](https://vsmarketplacebadge.apphb.com/installs/josef.rouge-theme.svg)
 
 VSCode theme created for a dark, material feel with a flushed color palette, optimized for use with Operator Mono font. 
@@ -28,9 +39,6 @@ Create an issue on the [repository](https://github.com/josefaidt/rouge-theme/iss
 #### Markdown
 ![Markdown](https://raw.githubusercontent.com/josefaidt/rouge-theme/master/img/rouge-md-1_3_1.png)
 
-#### PUG
-![Markdown](https://raw.githubusercontent.com/josefaidt/rouge-theme/master/img/rouge-pug-1_4.png)
-
 ### Recommended Settings
 I prefer to use the colorless version of [file-icons](https://marketplace.visualstudio.com/items?itemName=file-icons.file-icons) and the settings below. If you do not have Operator Mono installed, Fira Code works well also, though the italics are optimized for use with Operator Mono.
 
@@ -64,17 +72,5 @@ In version [1.3.3](https://github.com/josefaidt/rouge-theme/releases/tag/v1.3.3)
 ```
 ![Screenshotbadges1](https://raw.githubusercontent.com/josefaidt/rouge-theme/master/img/rouge-ed-badges-1_3_2_small.png)![Screenshotbadges2](https://raw.githubusercontent.com/josefaidt/rouge-theme/master/img/rouge-ed-badges-1_3_3_small.png)
 
-### Supported Languages
-- C#
-- Java
-- JavaScript
-- JavaScript (React/JSX)
-- JSON
-- HTML
-- CSS, SCSS, LESS
-- XML
-- Markdown
-- PUG
-
 ### License
-[MIT License](./LICENSE)
+[MIT License](./LICENSE)
diff --git a/src/themes/rouge-theme-editor.json b/src/themes/rouge-theme-editor.json
@@ -9,7 +9,7 @@
     "widget.shadow": "#121321",
     // "descriptionForeground": "#98b3cd",
     "descriptionForeground": "#a7acb9",
-    "errorForeground": "#cc565e",
+    "errorForeground": "#c6797e",
     "progressBar.background": "#97a38f",
     // 
     // activity bar
@@ -19,7 +19,7 @@
     "activityBar.foreground": "#A7ACB9",
     "activityBarBadge.background": "#c6797e",
     "activityBarBadge.foreground": "#fff",
-    // "activityBar.border": "#1A2335",
+    "activityBar.border": "#1A2335",
     // 
     // editor
     // 
@@ -57,6 +57,8 @@
     "editorIndentGuide.background": "#75809580",
     "editorIndentGuide.activeBackground": "#75809580",
     "editorRuler.foreground": "#75809580",
+    // "editorUnnecessaryCode.border": "#fdf",
+    // "editorUnnecessaryCode.opacity": "",
     //
     // brackets
     // 
@@ -89,7 +91,7 @@
     "peekViewResult.fileForeground": "##c6cad2",
     "peekViewResult.lineForeground": "#fff",
     "peekViewResult.matchHighlightBackground": "#91d1bd66",
-    "peekViewResult.selectionBackground": "#444955b3",
+    "peekViewResult.selectionBackground": "#293a57",
     "peekViewResult.selectionForeground": "#c6cad2",
     "peekViewTitle.background": "#1B2638",
     "peekViewTitleDescription.foreground": "#A7ACB9",
@@ -105,7 +107,7 @@
     // editor overview (under scroll bar)
     // 
     "editorOverviewRuler.selectionHighlightForeground": "#91d1bd66",
-    // "editorOverviewRuler.border": "#fff",
+    "editorOverviewRuler.border": "#293a57cc",
     "editorOverviewRuler.findMatchForeground": "#91d1bd66",
     // "editorOverviewRuler.rangeHighlightForeground": "#fff",
     // "editorOverviewRuler.wordHighlightForeground": "#fff",
@@ -130,6 +132,7 @@
     "editorGroupHeader.noTabsBackground": "#172030",
     "editorGroupHeader.tabsBackground": "#172030",
     "editorGroup.dropBackground": "#75809566",
+    "editorGroup.border": "#75809559",
     // "editorGroupHeader.tabsBorder": "#1A2335",
     "tab.activeBackground": "#c6797edf",
     "tab.activeForeground": "#fff",
@@ -172,20 +175,14 @@
     // 
     "list.activeSelectionBackground": "#c6797edf",
     "list.activeSelectionForeground": "#fff",
-    "list.dropBackground": "#44495580",
-    // "list.focusBackground": "#75809533",
-    "list.focusBackground": "#223047",
+    "list.dropBackground": "#75809566",
+    "list.focusBackground": "#293a57",
     "list.focusForeground": "#c6cad2",
-    // "list.hoverBackground": "#44495580",
-    "list.hoverBackground": "#223047",
-    // "list.hoverBackground": "#283954",
-    "list.hoverForeground": "#a7acb9",
-    // "list.inactiveFocusBackground": "#44495580",
-    "list.inactiveFocusBackground": "#223047",
+    "list.hoverBackground": "#293a57",
+    "list.hoverForeground": "#c6cad2",
+    "list.inactiveFocusBackground": "#293a57",
     "list.inactiveFocusForeground": "#a7acb9",
-    // "list.inactiveSelectionBackground": "#c6797e80",
-    // "list.inactiveSelectionBackground": "#26354F",
-    "list.inactiveSelectionBackground": "#223047",
+    "list.inactiveSelectionBackground": "#293a57",
     "list.inactiveSelectionForeground": "#c6cad2",
     "list.invalidItemForeground": "#CC565E",
     "list.errorForeground": "#CC565E",
@@ -206,11 +203,7 @@
     // buttons - welcome page
     // 
     "welcomePage.buttonBackground": "#1D293D",
-    // "welcomePage.buttonBackground": "#1A2335",
-    // "welcomePage.buttonHoverBackground": "#415C8966",
-    // "welcomePage.buttonHoverBackground": "#23324A",
     "welcomePage.buttonHoverBackground": "#293A57",
-    // "welcomePage.buttonHoverBackground": "#444955",
     "walkThrough.embeddedEditorBackground": "#1F2A3F",
     // 
     // breadcrumbs
@@ -256,7 +249,7 @@
     "statusBar.debuggingForeground": "#fff",
     "statusBarItem.activeBackground": "#c6797e",
     "statusBarItem.activeForeground": "#fff",
-    "statusBarItem.hoverBackground": "#444955e6",
+    "statusBarItem.hoverBackground": "#293a57",
     "statusBarItem.prominentBackground": "#b18bb1cc",
     "statusBarItem.prominentHoverBackground": "#b18bb1",
     "statusBar.noFolderBackground": "#c6797edf",
@@ -314,13 +307,13 @@
     // 
     // panel colors (output, terminal, etc)
     // 
-    "panelTitle.activeForeground": "#b8bcc6",
+    // "panelTitle.activeForeground": "#b8bcc6",
     "panel.background": "#172030",
-    // "panel.border": "",
+    "panel.border": "#75809559",
     // "panel.dropBackground": "",
-    // "panelTitle.activeBorder": "",
-    // "panelTitle.activeForegroun": "",
-    // "panelTitle.inactiveForeground": "",
+    "panelTitle.activeBorder": "#c6797ecc",
+    "panelTitle.activeForeground": "#A7ACB9",
+    "panelTitle.inactiveForeground": "#808799b3",
     // 
     // terminal colors
     // 
@@ -367,6 +360,24 @@
     "textLink.activeForeground": "#98b3cd",
     "textLink.foreground": "#6e94b9",
     "textPreformat.foreground": "#bbb",
-    "textSeparator.foreground": "#bbb"
+    "textSeparator.foreground": "#bbb",
+    // 
+    // settings (preview)
+    // 
+    "settings.headerForeground": "#c6cad2",
+    "settings.modifiedItemForeground": "#c6797e",
+    "settings.inactiveSelectedItemBorder": "#75809559",
+    "settings.dropdownBackground": "#172030",
+    "settings.dropdownForeground": "#A7ACB9",
+    "settings.dropdownBorder": "#c6797e80",
+    "settings.checkboxBackground": "#75809560",
+    "settings.checkboxForeground": "#758095",
+    "settings.checkboxBorder": "#c6797e80",
+    "settings.textInputBackground": "#172030",
+    "settings.textInputForeground": "#A7ACB9",
+    "settings.textInputBorder": "#c6797e80",
+    "settings.numberInputBackground": "#172030",
+    "settings.numberInputForeground": "#A7ACB9",
+    "settings.numberInputBorder": "#c6797e80"
   }
 }
diff --git a/src/themes/rouge-theme-syntax.json b/src/themes/rouge-theme-syntax.json
@@ -314,6 +314,17 @@
 				"source.css support.constant.media",
 				"source.stylus support.constant.media"
       ],
+      "settings": {
+				"foreground": "#D0D6B5"
+      }
+		},
+		{
+      "name": "[CSS] - Symbols (colons, etc)",
+      "scope": [
+        "entity.other.attribute-name.pseudo-class.css punctuation.definition.entity.css",
+        "entity.other.attribute-name.id.css punctuation.definition.entity.css",
+        "entity.other.attribute-name.class.css punctuation.definition.entity.css"
+      ],
       "settings": {
 				"foreground": "#D0D6B5"
       }
@@ -432,7 +443,16 @@
       "settings": {
 				"foreground": "#D0D6B5"
       }
-		},
+    },
+		{
+      "name": "[SCSS] - Punctuation",
+      "scope": [
+        "meta.at-rule.each.scss"
+      ],
+      "settings": {
+				"foreground": "#D0D6B5"
+      }
+    },
 		{
       "name": "[HTML] - Entity Name and doctype",
       "scope": [
@@ -620,6 +640,19 @@
       }
 		},
 		{
+      "name": "[JS] - Decimal Point",
+      "scope": [
+        // "constant.numeric.decimal",
+        "constant.numeric.decimal",
+        "meta.array.literal",
+        "meta.block"
+      ],
+      "settings": {
+        "foreground": "#D0D6B5"
+        // "foreground": "#bbb"
+      }
+    },
+		{
       "name": "[JSON] - Meta",
       "scope": [
         "meta.embedded.block.json"

diff --git a/temp/colors.txt b/temp/colors.txt
@@ -0,0 +1,100 @@
+#172030 - background
+#121321 - shadow
+#192334 widget background
+#1F2A3F peekview widget background, welcome page embedded editor background, notificationcenter header background
+#1B2638 - peekview title background
+#1A2335 - tab unfocused active border, inputvalidation background
+
+#212e45 - bracket match
+#1D293D - welcome page button background, textblock quote background
+
+#223047
+#293a57
+
+#444955 - welcome page button hover background
+#444955b3 - peekview selection background
+#44495580 - list - drop,hover,inactive focus,inactive selection background
+#444955e6 - statusbaritem - hover background (change this!!!)
+
+#758095 - button hover background
+#75809580 - button background
+#7580954d
+#75809566 - editorgroup drop background, notification border
+#75809533 - list - focus background
+
+#6e94b9 - textlink foreground
+#6e94b9e6 - gitdeco - ignored resource foreground
+#6e94b9cc - overviewruler info foreground
+#6e94b966 - merge - incoming content background
+#6e94b999 - merge - incoming header foreground, inputvalidation info border
+
+#98b3cd - textlink active foreground
+
+#A7ACB9 - description foreground
+#bbb - generic text
+#c6cad2 - label foreground
+#b8bcc6 - input option - active border (only used this once?), terminal foreground
+#808799 - input - placeholder foreground (only used this once?)
+#ccc - dropdown foreground (only used this once?)
+#fff
+#e6e6e6 - sidebar section header - foreground (only used this once?)
+
+#CC565E
+#CC565Edf - inputvalidation - error border
+#cc565ecc - gutter deleted/error foreground
+#CC565E40 - overviewruler deleted foreground
+
+#c6797e
+#c6797edf
+#c6797ecc - scrollbar hover background
+#c6797ef2 - scrollbar active background
+
+#d19498 - gitdeco - conflicting resource foreground (only used this once, but also terminal)
+
+#a06468df - dropdown border, input border
+#a06468cc - scrollbar background
+#a0646810 - scrollbar shadow (used only this once?)
+
+#F9B5ACcc - list - warning foreground
+
+#97a38f
+#97a38fe6 - statusbar debug background
+#9BBA9Acc - gutter added
+#9BBA9A80 - merge - current header background
+#9BBA9A26 - merge - current content background
+#728069B3 - extension button - prominent background
+#728069 - extension button - hover background
+
+#ADB9A4 - gitdeco - untracked resource foreground, terminal cursor
+
+#91d1bd
+#91d1bd40
+#91d1bd66
+
+#eabe9a
+#eabe9adf - inputvalidation warning border
+#eabe9a80
+#eabe9acc - gutter modified
+
+#b18bb1 - statusbaritem prominent hover background
+#b18bb1cc - statusbaritem prominent background
+#b18bb1e6 - gitdeco deleted resource foreground
+
+
+ANSI
+#293a56 - black
+#3A537A - bright black
+#6e94b9 - blue
+#98b3cd - bright blue
+#8ab6c1 - cyan
+#abcbd3 - bright cyan
+#ADB9A4 - green
+#bec8b7 - bright green
+#b18bb1 - magenta
+#ccb3cc - bright magenta
+#c6797e - red
+#d19498 - bright red
+#e3e4e8 - white
+#ffffff - bright white
+#ece7ac - yellow
+#F2EFC7 - bright yellow