Skip to content

Commit

Permalink
Merge pull request #4 from josefaidt/1.4.2
Browse files Browse the repository at this point in the history
1.4.2
  • Loading branch information
josefaidt authored May 26, 2018
2 parents 7cb80a2 + 229d914 commit a840c35
Show file tree
Hide file tree
Showing 6 changed files with 99 additions and 24 deletions.
23 changes: 22 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,37 @@ All notable changes to the "rouge-theme" extension will be documented in this fi

## [Released]
---
## [1.4.2] - 2018-05-26
## [1.4.2.2] - 2018-05-26
### Added
- ProgressBar background **untested**
- list.invalidItemForeground **untested**
- SQL [trello card: 6xQyBtal](https://trello.com/c/6xQyBtal)
- database name: generic text color
- table name: generic text color

### Changed
- Notifications [trello card: zTdzW8lu](https://trello.com/c/zTdzW8lu)
- changed waffle background to match welcome page
- input validation background (error, warning, info): #1A2335 [trello card: 5KflBR0T](https://trello.com/c/5KflBR0T)
- Markdown
- changed bold to flatten, #bbb [trello card: vvSdT0Wx](https://trello.com/c/vvSdT0Wx)


## [1.4.2.1] - 2018-05-21
### Added
- editor: base colors
- contrastBorder
- widget.shadow
- descriptionForeground **untested**
- descriptionForeground (displays on welcome page)
- errorForeground **untested**
- editor: rulers
- editor: indent guides

### Changed
- PickerGroup (command palette)
- changed border color to match input border

## [1.4.1] - 2018-05-06
### Added
- Whitespace coloring [trello card: XRkiwG7a](https://trello.com/c/XRkiwG7a)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Rouge Theme for VSCode
[![Version](https://vsmarketplacebadge.apphb.com/version/josef.rouge-theme.svg)](https://marketplace.visualstudio.com/items?itemName=josef.rouge-theme)
[![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.
Inspiration was drawn from Atom's Material Theme and [loved-syntax](https://github.com/DanielPintilei/atom-loved-syntax) for Atom.
Expand Down
29 changes: 19 additions & 10 deletions src/themes/rouge-theme-editor.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
// "contrastActiveBorder": "#1F2A3F",
"contrastBorder": "#172030",
"widget.shadow": "#121321",
"descriptionForeground": "#98b3cd",
// "descriptionForeground": "#98b3cd",
"descriptionForeground": "#a7acb9",
"errorForeground": "#cc565e",
"progressBar.background": "#97a38f",
//
// activity bar
//
Expand Down Expand Up @@ -38,7 +40,13 @@
"editorLink.activeForeground": "#758095",
"editorGroup.background": "#172030",
"editorWarning.foreground": "#CC565Edf",
// "editorWarning.border": "#fff",
"editorError.foreground": "#cc565e",
// "editorError.border": "#fff",
// "editorInfo.foreground": "",
// "editorInfo.border": "",
// "editorHint.foreground": "",
// ""editorHint.border": "",
"editorCodeLens.foreground": "#758095",
"badge.background": "#a06468df",
"badge.foreground": "#fff",
Expand Down Expand Up @@ -157,6 +165,7 @@
// "list.inactiveSelectionBackground": "#c6797e80",
"list.inactiveSelectionBackground": "#44495580",
"list.inactiveSelectionForeground": "#c6cad2",
"list.invalidItemForeground": "#CC565E",
//
// buttons
//
Expand Down Expand Up @@ -189,11 +198,11 @@
"input.foreground": "#A7ACB9",
"inputOption.activeBorder": "#b8bcc6",
"input.placeholderForeground": "#808799",
"inputValidation.errorBackground": "#192334",
"inputValidation.errorBorder": "#c6797e",
"inputValidation.warningBackground": "#192334",
"inputValidation.errorBackground": "#1A2335",
"inputValidation.errorBorder": "#CC565Edf",
"inputValidation.warningBackground": "#1A2335",
"inputValidation.warningBorder": "#eabe9adf",
"inputValidation.infoBackground": "#192334",
"inputValidation.infoBackground": "#1A2335",
"inputValidation.infoBorder": "#6e94b999",
//
// scroll bar control
Expand Down Expand Up @@ -245,15 +254,15 @@
"notificationCenterHeader.background": "#1F2A3F",
"notificationToast.border": "#758095",
"notifications.foreground": "#c6cad2",
"notifications.background": "#1B2638",
"notifications.background": "#1A2335",
"notifications.border": "#758095",
"notificationLink.foreground": "#c6cad2",
//
// picker group
// picker group ( command palette )
//
// "list.highlightForeground": "#eabe9a",
"list.highlightForeground": "#758095",
"pickerGroup.border": "#eabe9acc",
"list.highlightForeground": "#eabe9a",
// "list.highlightForeground": "#758095",
"pickerGroup.border": "#758095",
"pickerGroup.foreground": "#eabe9acc",
//
// panel colors (output, terminal, etc)
Expand Down
26 changes: 24 additions & 2 deletions src/themes/rouge-theme-syntax.json
Original file line number Diff line number Diff line change
Expand Up @@ -726,9 +726,13 @@
},
{
"name": "[MARKDOWN] - Emphasis Bold",
"scope": "markup.bold.markdown",
"scope": [
"markup.bold.markdown",
"markup.bold.markdown punctuation.definition.bold.markdown"
],
"settings": {
"foreground": "#eabe9a",
// "foreground": "#eabe9a",
"foreground": "#bbb",
"fontStyle": "bold"
}
},
Expand Down Expand Up @@ -793,6 +797,24 @@
],
"settings": {
"foreground": "#A3B09A"
}
},
{
"name": "[SQL] - Database name",
"scope": [
"constant.other.database-name.sql"
],
"settings": {
"foreground": "#bbb"
}
},
{
"name": "[SQL] - Table name",
"scope": [
"constant.other.table-name.sql"
],
"settings": {
"foreground": "#bbb"
}
},
{
Expand Down
18 changes: 10 additions & 8 deletions themes/rouge-theme-editor.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
"focusBorder": "#758095",
"contrastBorder": "#172030",
"widget.shadow": "#121321",
"descriptionForeground": "#98b3cd",
"descriptionForeground": "#a7acb9",
"errorForeground": "#cc565e",
"progressBar.background": "#97a38f",
"activityBar.background": "#172030",
"activityBar.foreground": "#A7ACB9",
"activityBarBadge.background": "#c6797e",
Expand Down Expand Up @@ -102,6 +103,7 @@
"list.inactiveFocusForeground": "#a7acb9",
"list.inactiveSelectionBackground": "#44495580",
"list.inactiveSelectionForeground": "#c6cad2",
"list.invalidItemForeground": "#CC565E",
"button.foreground": "#fff",
"button.background": "#75809580",
"button.hoverBackground": "#758095",
Expand All @@ -119,11 +121,11 @@
"input.foreground": "#A7ACB9",
"inputOption.activeBorder": "#b8bcc6",
"input.placeholderForeground": "#808799",
"inputValidation.errorBackground": "#192334",
"inputValidation.errorBorder": "#c6797e",
"inputValidation.warningBackground": "#192334",
"inputValidation.errorBackground": "#1A2335",
"inputValidation.errorBorder": "#CC565Edf",
"inputValidation.warningBackground": "#1A2335",
"inputValidation.warningBorder": "#eabe9adf",
"inputValidation.infoBackground": "#192334",
"inputValidation.infoBackground": "#1A2335",
"inputValidation.infoBorder": "#6e94b999",
"scrollbar.shadow": "#a0646810",
"scrollbarSlider.activeBackground": "#c6797ef2",
Expand All @@ -148,11 +150,11 @@
"notificationCenterHeader.background": "#1F2A3F",
"notificationToast.border": "#758095",
"notifications.foreground": "#c6cad2",
"notifications.background": "#1B2638",
"notifications.background": "#1A2335",
"notifications.border": "#758095",
"notificationLink.foreground": "#c6cad2",
"list.highlightForeground": "#758095",
"pickerGroup.border": "#eabe9acc",
"list.highlightForeground": "#eabe9a",
"pickerGroup.border": "#758095",
"pickerGroup.foreground": "#eabe9acc",
"panelTitle.activeForeground": "#b8bcc6",
"panel.background": "#172030",
Expand Down
25 changes: 23 additions & 2 deletions themes/rouge-theme-syntax.json
Original file line number Diff line number Diff line change
Expand Up @@ -677,9 +677,12 @@
},
{
"name": "[MARKDOWN] - Emphasis Bold",
"scope": "markup.bold.markdown",
"scope": [
"markup.bold.markdown",
"markup.bold.markdown punctuation.definition.bold.markdown"
],
"settings": {
"foreground": "#eabe9a",
"foreground": "#bbb",
"fontStyle": "bold"
}
},
Expand Down Expand Up @@ -743,6 +746,24 @@
],
"settings": {
"foreground": "#A3B09A"
}
},
{
"name": "[SQL] - Database name",
"scope": [
"constant.other.database-name.sql"
],
"settings": {
"foreground": "#bbb"
}
},
{
"name": "[SQL] - Table name",
"scope": [
"constant.other.table-name.sql"
],
"settings": {
"foreground": "#bbb"
}
},
{
Expand Down

0 comments on commit a840c35

Please sign in to comment.