From 6aaf3e6c5e5f318794d3c79c5440d9fdd4abb7d2 Mon Sep 17 00:00:00 2001 From: josef Date: Sat, 1 Sep 2018 19:03:38 -0500 Subject: [PATCH 1/4] initial commit, editor changes, syntax fixes --- .gitignore | 1 + CHANGELOG.md | 27 ++++++++ README.md | 14 +++- img/banner.png | Bin 0 -> 40601 bytes src/themes/rouge-theme-editor.json | 65 +++++++++++-------- src/themes/rouge-theme-syntax.json | 24 ++++++- temp/colors.txt | 100 +++++++++++++++++++++++++++++ themes/rouge-theme-editor.json | 43 +++++++++---- themes/rouge-theme-syntax.json | 22 ++++++- 9 files changed, 253 insertions(+), 43 deletions(-) create mode 100644 img/banner.png create mode 100644 temp/colors.txt diff --git a/.gitignore b/.gitignore index 7593188..73cf748 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,6 @@ samples/ copy.sh build/ dist/ +img/admin .DS_Store notes.md \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index d1a02f1..5baa33a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,33 @@ All notable changes to the "rouge-theme" extension will be documented in this fi ## [Released] --- +## [1.5.0] - 2018-09-01 +### Added +- editor: + - settings (preview) - defined colors from existing palette + - panel border to match palette + - 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) + ## [1.4.7] - 2018-08-31 ### Added - editor: diff --git a/README.md b/README.md index b1ff6ea..40206db 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,15 @@ # Rouge Theme for VSCode + +

+ + Rouge + +

+ [![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. diff --git a/img/banner.png b/img/banner.png new file mode 100644 index 0000000000000000000000000000000000000000..e831a43578cbc324afe12291b33053461a0329e0 GIT binary patch literal 40601 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 z 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 literal 0 HcmV?d00001 diff --git a/src/themes/rouge-theme-editor.json b/src/themes/rouge-theme-editor.json index f9a48ba..d12b9d3 100644 --- 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": "#758095", + "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": "#75809580", + "settings.checkboxBackground": "#75809560", + "settings.checkboxForeground": "#758095", + "settings.checkboxBorder": "#75809580", + "settings.textInputBackground": "#172030", + "settings.textInputForeground": "#A7ACB9", + "settings.textInputBorder": "#75809580", + "settings.numberInputBackground": "#172030", + "settings.numberInputForeground": "#A7ACB9", + "settings.numberInputBorder": "#75809580" } } \ No newline at end of file diff --git a/src/themes/rouge-theme-syntax.json b/src/themes/rouge-theme-syntax.json index cdf4dc3..2c3c1e5 100644 --- a/src/themes/rouge-theme-syntax.json +++ b/src/themes/rouge-theme-syntax.json @@ -432,7 +432,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 +629,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 new file mode 100644 index 0000000..2d4d98c --- /dev/null +++ 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 \ No newline at end of file diff --git a/themes/rouge-theme-editor.json b/themes/rouge-theme-editor.json index 6f59c90..79fed37 100644 --- a/themes/rouge-theme-editor.json +++ b/themes/rouge-theme-editor.json @@ -6,12 +6,13 @@ "contrastBorder": "#172030", "widget.shadow": "#121321", "descriptionForeground": "#a7acb9", - "errorForeground": "#cc565e", + "errorForeground": "#c6797e", "progressBar.background": "#97a38f", "activityBar.background": "#172030", "activityBar.foreground": "#A7ACB9", "activityBarBadge.background": "#c6797e", "activityBarBadge.foreground": "#fff", + "activityBar.border": "#1A2335", "editor.background": "#172030", "editor.foreground": "#bbb", "selection.background": "#91d1bd40", @@ -57,7 +58,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", @@ -67,6 +68,7 @@ "editorGutter.deletedBackground": "#CC565Ecc", "editorGutter.modifiedBackground": "#eabe9acc", "editorOverviewRuler.selectionHighlightForeground": "#91d1bd66", + "editorOverviewRuler.border": "#293a57cc", "editorOverviewRuler.findMatchForeground": "#91d1bd66", "editorOverviewRuler.modifiedForeground": "#eabe9acc", "editorOverviewRuler.addedForeground": "#9BBA9Acc", @@ -80,6 +82,7 @@ "editorGroupHeader.noTabsBackground": "#172030", "editorGroupHeader.tabsBackground": "#172030", "editorGroup.dropBackground": "#75809566", + "editorGroup.border": "#75809559", "tab.activeBackground": "#c6797edf", "tab.activeForeground": "#fff", "tab.inactiveBackground": "#172030", @@ -102,14 +105,14 @@ "sideBarSectionHeader.foreground": "#e6e6e6", "list.activeSelectionBackground": "#c6797edf", "list.activeSelectionForeground": "#fff", - "list.dropBackground": "#44495580", - "list.focusBackground": "#223047", + "list.dropBackground": "#75809566", + "list.focusBackground": "#293a57", "list.focusForeground": "#c6cad2", - "list.hoverBackground": "#223047", - "list.hoverForeground": "#a7acb9", - "list.inactiveFocusBackground": "#223047", + "list.hoverBackground": "#293a57", + "list.hoverForeground": "#c6cad2", + "list.inactiveFocusBackground": "#293a57", "list.inactiveFocusForeground": "#a7acb9", - "list.inactiveSelectionBackground": "#223047", + "list.inactiveSelectionBackground": "#293a57", "list.inactiveSelectionForeground": "#c6cad2", "list.invalidItemForeground": "#CC565E", "list.errorForeground": "#CC565E", @@ -151,7 +154,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", @@ -172,8 +175,11 @@ "list.highlightForeground": "#eabe9a", "pickerGroup.border": "#758095", "pickerGroup.foreground": "#eabe9acc", - "panelTitle.activeForeground": "#b8bcc6", "panel.background": "#172030", + "panel.border": "#75809559", + "panelTitle.activeBorder": "#758095", + "panelTitle.activeForeground": "#A7ACB9", + "panelTitle.inactiveForeground": "#808799b3", "terminal.background": "#172030", "terminal.foreground": "#b8bcc6", "terminalCursor.background": "#ADB9A4", @@ -206,6 +212,21 @@ "textLink.activeForeground": "#98b3cd", "textLink.foreground": "#6e94b9", "textPreformat.foreground": "#bbb", - "textSeparator.foreground": "#bbb" + "textSeparator.foreground": "#bbb", + "settings.headerForeground": "#c6cad2", + "settings.modifiedItemForeground": "#c6797e", + "settings.inactiveSelectedItemBorder": "#75809559", + "settings.dropdownBackground": "#172030", + "settings.dropdownForeground": "#A7ACB9", + "settings.dropdownBorder": "#75809580", + "settings.checkboxBackground": "#75809560", + "settings.checkboxForeground": "#758095", + "settings.checkboxBorder": "#75809580", + "settings.textInputBackground": "#172030", + "settings.textInputForeground": "#A7ACB9", + "settings.textInputBorder": "#75809580", + "settings.numberInputBackground": "#172030", + "settings.numberInputForeground": "#A7ACB9", + "settings.numberInputBorder": "#75809580" } } \ No newline at end of file diff --git a/themes/rouge-theme-syntax.json b/themes/rouge-theme-syntax.json index ffbac34..8f779bb 100644 --- a/themes/rouge-theme-syntax.json +++ b/themes/rouge-theme-syntax.json @@ -395,7 +395,16 @@ "settings": { "foreground": "#D0D6B5" } - }, + }, + { + "name": "[SCSS] - Punctuation", + "scope": [ + "meta.at-rule.each.scss" + ], + "settings": { + "foreground": "#D0D6B5" + } + }, { "name": "[HTML] - Entity Name and doctype", "scope": [ @@ -572,6 +581,17 @@ } }, { + "name": "[JS] - Decimal Point", + "scope": [ + "constant.numeric.decimal", + "meta.array.literal", + "meta.block" + ], + "settings": { + "foreground": "#D0D6B5" + } + }, + { "name": "[JSON] - Meta", "scope": [ "meta.embedded.block.json" From 4ed9bf1c507560713d7172bba4abf4bcaeb5ccba Mon Sep 17 00:00:00 2001 From: josef Date: Sun, 2 Sep 2018 11:43:26 -0500 Subject: [PATCH 2/4] finished trello lineup, final touches on settings --- CHANGELOG.md | 6 ++++-- README.md | 12 ------------ src/themes/rouge-theme-editor.json | 10 +++++----- src/themes/rouge-theme-syntax.json | 11 +++++++++++ themes/rouge-theme-editor.json | 10 +++++----- themes/rouge-theme-syntax.json | 11 +++++++++++ 6 files changed, 36 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5baa33a..50ae36c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,11 @@ All notable changes to the "rouge-theme" extension will be documented in this fi ## [Released] --- -## [1.5.0] - 2018-09-01 +## [1.5.0] - 2018-09-02 ### Added - editor: - settings (preview) - defined colors from existing palette - - panel border to match 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 @@ -29,6 +29,8 @@ All notable changes to the "rouge-theme" extension will be documented in this fi - 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 diff --git a/README.md b/README.md index 40206db..ee376e2 100644 --- a/README.md +++ b/README.md @@ -72,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) \ No newline at end of file diff --git a/src/themes/rouge-theme-editor.json b/src/themes/rouge-theme-editor.json index d12b9d3..4cddd7b 100644 --- a/src/themes/rouge-theme-editor.json +++ b/src/themes/rouge-theme-editor.json @@ -311,7 +311,7 @@ "panel.background": "#172030", "panel.border": "#75809559", // "panel.dropBackground": "", - "panelTitle.activeBorder": "#758095", + "panelTitle.activeBorder": "#c6797ecc", "panelTitle.activeForeground": "#A7ACB9", "panelTitle.inactiveForeground": "#808799b3", // @@ -369,15 +369,15 @@ "settings.inactiveSelectedItemBorder": "#75809559", "settings.dropdownBackground": "#172030", "settings.dropdownForeground": "#A7ACB9", - "settings.dropdownBorder": "#75809580", + "settings.dropdownBorder": "#c6797e80", "settings.checkboxBackground": "#75809560", "settings.checkboxForeground": "#758095", - "settings.checkboxBorder": "#75809580", + "settings.checkboxBorder": "#c6797e80", "settings.textInputBackground": "#172030", "settings.textInputForeground": "#A7ACB9", - "settings.textInputBorder": "#75809580", + "settings.textInputBorder": "#c6797e80", "settings.numberInputBackground": "#172030", "settings.numberInputForeground": "#A7ACB9", - "settings.numberInputBorder": "#75809580" + "settings.numberInputBorder": "#c6797e80" } } \ No newline at end of file diff --git a/src/themes/rouge-theme-syntax.json b/src/themes/rouge-theme-syntax.json index 2c3c1e5..0fd0044 100644 --- 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" } diff --git a/themes/rouge-theme-editor.json b/themes/rouge-theme-editor.json index 79fed37..e90713a 100644 --- a/themes/rouge-theme-editor.json +++ b/themes/rouge-theme-editor.json @@ -177,7 +177,7 @@ "pickerGroup.foreground": "#eabe9acc", "panel.background": "#172030", "panel.border": "#75809559", - "panelTitle.activeBorder": "#758095", + "panelTitle.activeBorder": "#c6797ecc", "panelTitle.activeForeground": "#A7ACB9", "panelTitle.inactiveForeground": "#808799b3", "terminal.background": "#172030", @@ -218,15 +218,15 @@ "settings.inactiveSelectedItemBorder": "#75809559", "settings.dropdownBackground": "#172030", "settings.dropdownForeground": "#A7ACB9", - "settings.dropdownBorder": "#75809580", + "settings.dropdownBorder": "#c6797e80", "settings.checkboxBackground": "#75809560", "settings.checkboxForeground": "#758095", - "settings.checkboxBorder": "#75809580", + "settings.checkboxBorder": "#c6797e80", "settings.textInputBackground": "#172030", "settings.textInputForeground": "#A7ACB9", - "settings.textInputBorder": "#75809580", + "settings.textInputBorder": "#c6797e80", "settings.numberInputBackground": "#172030", "settings.numberInputForeground": "#A7ACB9", - "settings.numberInputBorder": "#75809580" + "settings.numberInputBorder": "#c6797e80" } } \ No newline at end of file diff --git a/themes/rouge-theme-syntax.json b/themes/rouge-theme-syntax.json index 8f779bb..105f999 100644 --- a/themes/rouge-theme-syntax.json +++ b/themes/rouge-theme-syntax.json @@ -277,6 +277,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" } From b6492637a02a9c56f44e3f58531add6e8b0caf71 Mon Sep 17 00:00:00 2001 From: josef Date: Sun, 2 Sep 2018 11:54:51 -0500 Subject: [PATCH 3/4] added large banner --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ee376e2..ea4b9b8 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ Rouge

From 2608230ec131ae458744a521b0d4e9c834ac958f Mon Sep 17 00:00:00 2001 From: josef Date: Sun, 2 Sep 2018 11:55:15 -0500 Subject: [PATCH 4/4] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ea4b9b8..1860643 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Rouge

@@ -73,4 +73,4 @@ 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) ### License -[MIT License](./LICENSE) \ No newline at end of file +[MIT License](./LICENSE)