diff --git a/build/shared/lib/themes/antimony.txt b/build/shared/lib/themes/antimony.txt index ecb1fc907..dc6e0566a 100644 --- a/build/shared/lib/themes/antimony.txt +++ b/build/shared/lib/themes/antimony.txt @@ -6,31 +6,31 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 -toolbar.rollover.color = #FFFFF2 -toolbar.gradient.top = #001F29 -toolbar.gradient.bottom = #001F29 +toolbar.rollover.color = #FFFFFE +toolbar.gradient.top = #001F2A +toolbar.gradient.bottom = #001F2A # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 -mode.title.color = #7FA0A8 +mode.title.color = #7FA0AE # stolen from gradient bottom -mode.background.color = #001F29 -mode.outline.color = #5C7D85 +mode.background.color = #001F2A +mode.outline.color = #5C7D8A -toolbar.button.disabled.field = #0C2F39 -toolbar.button.disabled.glyph = #001F29 +toolbar.button.disabled.field = #0C2F3B +toolbar.button.disabled.glyph = #001F2A toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #727774 -toolbar.button.enabled.glyph = #00213A +toolbar.button.enabled.field = #72777A +toolbar.button.enabled.glyph = #00213B toolbar.button.enabled.stroke = none toolbar.button.pressed.field = #001931 -toolbar.button.pressed.glyph = #86C1D2 -toolbar.button.pressed.stroke = #86C1D2 -toolbar.button.rollover.field = #86C1D2 -toolbar.button.rollover.glyph = #00213A +toolbar.button.pressed.glyph = #86C1D8 +toolbar.button.pressed.stroke = #86C1D8 +toolbar.button.rollover.field = #86C1D8 +toolbar.button.rollover.glyph = #00213B toolbar.button.rollover.stroke = none -toolbar.button.selected.field = #FFFFF2 -toolbar.button.selected.glyph = #353C3C +toolbar.button.selected.field = #FFFFFE +toolbar.button.selected.glyph = #353C3F toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -52,11 +52,11 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## -status.notice.fgcolor = #B6E1EC -status.notice.bgcolor = #315C69 +status.notice.fgcolor = #B6E1F4 +status.notice.bgcolor = #315C6C status.error.fgcolor = #0047A5 -status.error.bgcolor = #FFFFF2 -status.warning.bgcolor = #727774 +status.error.bgcolor = #FFFFFE +status.warning.bgcolor = #72777A status.warning.fgcolor = #002649 status.url.fgcolor = #000000 status.font = processing.sans,plain,13 @@ -68,29 +68,29 @@ status.emoji.font.macosx = Dialog,plain,22 ## EditorHeader - the tab area above the editor ## header.text.font = processing.sans,bold,14 -header.text.selected.color = #7C9498 -header.text.unselected.color = #48595D -header.tab.arrow.color = #48595D +header.text.selected.color = #7C949E +header.text.unselected.color = #485961 +header.tab.arrow.color = #485961 header.tab.selected.color = #000C16 -header.tab.unselected.color = #00151C -header.tab.modified.color = #FFFFF2 -header.gradient.top = #001F29 -header.gradient.bottom = #001F29 +header.tab.unselected.color = #00151D +header.tab.modified.color = #FFFFFE +header.gradient.top = #001F2A +header.gradient.bottom = #001F2A ## EditorFooter - the tabs below the editor ## footer.text.font = processing.sans,bold,12 -footer.text.selected.color = #FFFFF2 -footer.text.enabled.color = #7FA0A8 -footer.icon.selected.color = #FFFFF2 -footer.icon.enabled.color = #7FA0A8 -footer.gradient.top = #001F29 -footer.gradient.bottom = #001F29 -footer.tab.selected.color = #30505A -footer.tab.enabled.color = #001F29 -footer.updates.text.color = #FFFFF2 -footer.updates.indicator.field.color = #000716 +footer.text.selected.color = #FFFFFE +footer.text.enabled.color = #7FA0AE +footer.icon.selected.color = #FFFFFE +footer.icon.enabled.color = #7FA0AE +footer.gradient.top = #001F2A +footer.gradient.bottom = #001F2A +footer.tab.selected.color = #30505D +footer.tab.enabled.color = #001F2A +footer.updates.text.color = #FFFFFE +footer.updates.indicator.field.color = #000715 footer.updates.indicator.text.color = #E1FFFF @@ -98,33 +98,33 @@ footer.updates.indicator.text.color = #E1FFFF # The font is handled by preferences.txt, so its size/etc are modifiable. console.color = #001117 -console.output.color = #859799 +console.output.color = #85979F # text color for errors printed in the console console.error.color = #00E2FF -console.scrollbar.thumb.enabled.color = #344448 +console.scrollbar.thumb.enabled.color = #34444B console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #000F15 +console.scrollbar.color = #000F16 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors -editor.fgcolor = #FFFFF2 +editor.fgcolor = #FFFFFE editor.bgcolor = #000000 -editor.gradient.top = #001F29 -editor.gradient.bottom = #001F29 +editor.gradient.top = #001F2A +editor.gradient.bottom = #001F2A # highlight for the current line -editor.linehighlight.color = #161818 +editor.linehighlight.color = #161819 # highlight for the current line editor.linehighlight=true -editor.caret.color = #FFFFF2 +editor.caret.color = #FFFFFE # also used by EditorHeader -editor.selection.color = #2A2D2C +editor.selection.color = #2A2D2E # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #CE94E9 +editor.brackethighlight.color = #CE94F0 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #30505A -editor.scrollbar.thumb.rollover.color = #284953 -editor.scrollbar.thumb.pressed.color = #284953 -editor.scrollbar.color = #092D37 +editor.scrollbar.thumb.enabled.color = #30505D +editor.scrollbar.thumb.rollover.color = #284955 +editor.scrollbar.thumb.pressed.color = #284955 +editor.scrollbar.color = #092D38 ## PdeTextAreaPainter - extras added to the editor ## @@ -147,70 +147,83 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #E1FFFF # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #30505A +editor.gutter.linehighlight.color = #30505D # squiggly line underneath errors in the editor -editor.error.underline.color = #FFFFF2 +editor.error.underline.color = #FFFFFE # squiggly line underneath warnings -editor.warning.underline.color = #727774 +editor.warning.underline.color = #72777A ## MarkerColumn - shows ticks adjacent the scroll bar ## # lines next to the scrollbar showing where errors are located -editor.column.error.color = #FFFFF2 -editor.column.warning.color = #365660 +editor.column.error.color = #FFFFFE +editor.column.warning.color = #365663 ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 errors.header.bgcolor = #000C16 -errors.header.fgcolor = #899493 +errors.header.fgcolor = #899499 errors.bgcolor = #00151F errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #FFFFF2 -errors.row.bgcolor = #004AA8 -errors.selection.fgcolor = #000000 -errors.selection.bgcolor = #727774 -errors.selection.error.bgcolor = #000000 -errors.selection.warning.bgcolor = #00509D -errors.indicator.error.color = #FFFFF2 -errors.indicator.warning.color = #0086EA +errors.row.fgcolor = #A7C0CA +errors.row.bgcolor = #00151F +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #3C4143 +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #00B5FF +errors.indicator.error.color = #A7C0CA +errors.indicator.warning.color = #33535F ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #000C16 +manager.tab.selected.color = #042934 manager.tab.unselected.color = #001921 manager.tab.text.font = processing.sans,bold,14 -manager.tab.text.selected.color = #FFFFF2 -manager.tab.text.unselected.color = #6B8489 -manager.tab.gradient.top = #001F29 -manager.tab.gradient.bottom = #001F29 +manager.tab.text.selected.color = #FFFFFE +manager.tab.text.unselected.color = #6B848F +manager.tab.gradient.top = #000C16 +manager.tab.gradient.bottom = #000C16 ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #001F29 +manager.tab.background = #000C16 ## ContributionTab -manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + +manager.list.search.text.color = #FFFFFE +manager.list.search.placeholder.color = #688896 +manager.list.search.background.color = #000000 ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #000C16 -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #657D82 -manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.background.color = #042934 +manager.list.header.color = #123440 +manager.list.section.color = #042934 +manager.list.selection.color = #585D60 +manager.list.text.color = #FFFFFE +manager.list.incompatible.selection.color = #1E3F4B +manager.list.incompatible.text.color = #688896 + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #2A4B57 +manager.panel.text.color = #FFFFFE +manager.panel.link.color = #99E1FD ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #CE94E9,plain -editor.token.function2.style = #CE94E9,plain -editor.token.function3.style = #00B07D,plain -editor.token.function4.style = #CE94E9,bold +editor.token.function1.style = #CE94F0,plain +editor.token.function2.style = #CE94F0,plain +editor.token.function3.style = #00B080,plain +editor.token.function4.style = #CE94F0,bold -editor.token.keyword1.style = #B813BB,plain -editor.token.keyword2.style = #B813BB,plain -editor.token.keyword3.style = #00B07D,plain -editor.token.keyword4.style = #D13B78,plain -editor.token.keyword5.style = #FF4100,plain -editor.token.keyword6.style = #B813BB,plain +editor.token.keyword1.style = #B813C0,plain +editor.token.keyword2.style = #B813C0,plain +editor.token.keyword3.style = #00B080,plain +editor.token.keyword4.style = #D13B82,plain +editor.token.keyword5.style = #FF4144,plain +editor.token.keyword6.style = #B813C0,plain -editor.token.literal1.style = #008DAD,plain +editor.token.literal1.style = #008DAF,plain editor.token.literal2.style = #0071F0,plain -editor.token.operator.style = #CE94E9,plain +editor.token.operator.style = #CE94F0,plain -editor.token.label.style = #5E5E59,bold +editor.token.label.style = #5E5E5E,bold -editor.token.comment1.style = #5E5E59,plain -editor.token.comment2.style = #5E5E59,plain +editor.token.comment1.style = #5E5E5E,plain +editor.token.comment2.style = #5E5E5E,plain -editor.token.invalid.style = #5E5E59,bold +editor.token.invalid.style = #5E5E5E,bold diff --git a/build/shared/lib/themes/bauxite.txt b/build/shared/lib/themes/bauxite.txt index f9272fd05..ce885fb33 100644 --- a/build/shared/lib/themes/bauxite.txt +++ b/build/shared/lib/themes/bauxite.txt @@ -6,30 +6,30 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 -toolbar.rollover.color = #FFFFF2 -toolbar.gradient.top = #3E4249 -toolbar.gradient.bottom = #3E4249 +toolbar.rollover.color = #FFFFFE +toolbar.gradient.top = #3E424C +toolbar.gradient.bottom = #3E424C # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 -mode.title.color = #A9AEB3 +mode.title.color = #A9AEBA # stolen from gradient bottom -mode.background.color = #3E4249 -mode.outline.color = #8D9197 +mode.background.color = #3E424C +mode.outline.color = #8D919D -toolbar.button.disabled.field = #50545B -toolbar.button.disabled.glyph = #3E4249 +toolbar.button.disabled.field = #50545F +toolbar.button.disabled.glyph = #3E424C toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #F8951D -toolbar.button.enabled.glyph = #263A59 +toolbar.button.enabled.field = #F8954A +toolbar.button.enabled.glyph = #263A5B toolbar.button.enabled.stroke = none -toolbar.button.pressed.field = #05203D -toolbar.button.pressed.glyph = #FFB826 -toolbar.button.pressed.stroke = #FFB826 -toolbar.button.rollover.field = #FFB826 -toolbar.button.rollover.glyph = #263A59 +toolbar.button.pressed.field = #05203E +toolbar.button.pressed.glyph = #FFB85D +toolbar.button.pressed.stroke = #FFB85D +toolbar.button.rollover.field = #FFB85D +toolbar.button.rollover.glyph = #263A5B toolbar.button.rollover.stroke = none -toolbar.button.selected.field = #FFFFF2 +toolbar.button.selected.field = #FFFFFE toolbar.button.selected.glyph = #9F2700 toolbar.button.selected.stroke = none @@ -52,11 +52,11 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## -status.notice.fgcolor = #DCE2E8 -status.notice.bgcolor = #70757F +status.notice.fgcolor = #DCE2F2 +status.notice.bgcolor = #707584 status.error.fgcolor = #700000 -status.error.bgcolor = #FFFFF2 -status.warning.bgcolor = #F8951D +status.error.bgcolor = #FFFFFE +status.warning.bgcolor = #F8954A status.warning.fgcolor = #5E0000 status.url.fgcolor = #000000 status.font = processing.sans,plain,13 @@ -68,61 +68,61 @@ status.emoji.font.macosx = Dialog,plain,22 ## EditorHeader - the tab area above the editor ## header.text.font = processing.sans,bold,14 -header.text.selected.color = #FFA321 -header.text.unselected.color = #737577 -header.tab.arrow.color = #737577 -header.tab.selected.color = #0F1218 -header.tab.unselected.color = #23262B -header.tab.modified.color = #FFFFF2 -header.gradient.top = #3E4249 -header.gradient.bottom = #3E4249 +header.text.selected.color = #FFA351 +header.text.unselected.color = #73757C +header.tab.arrow.color = #73757C +header.tab.selected.color = #0F1219 +header.tab.unselected.color = #23262D +header.tab.modified.color = #FFFFFE +header.gradient.top = #3E424C +header.gradient.bottom = #3E424C ## EditorFooter - the tabs below the editor ## footer.text.font = processing.sans,bold,12 -footer.text.selected.color = #FFFFF2 -footer.text.enabled.color = #A9AEB3 -footer.icon.selected.color = #FFFFF2 -footer.icon.enabled.color = #A9AEB3 -footer.gradient.top = #3E4249 -footer.gradient.bottom = #3E4249 -footer.tab.selected.color = #686C73 -footer.tab.enabled.color = #3E4249 -footer.updates.text.color = #FFFFF2 -footer.updates.indicator.field.color = #00000F +footer.text.selected.color = #FFFFFE +footer.text.enabled.color = #A9AEBA +footer.icon.selected.color = #FFFFFE +footer.icon.enabled.color = #A9AEBA +footer.gradient.top = #3E424C +footer.gradient.bottom = #3E424C +footer.tab.selected.color = #686C78 +footer.tab.enabled.color = #3E424C +footer.updates.text.color = #FFFFFE +footer.updates.indicator.field.color = #000010 footer.updates.indicator.text.color = #FAFEFF ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #1A1D24 -console.output.color = #989CA0 +console.color = #1A1D26 +console.output.color = #989CA7 # text color for errors printed in the console console.error.color = #FF8400 -console.scrollbar.thumb.enabled.color = #4A4E54 +console.scrollbar.thumb.enabled.color = #4A4E58 console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #151920 +console.scrollbar.color = #151921 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors -editor.fgcolor = #FFFFF2 +editor.fgcolor = #FFFFFE editor.bgcolor = #000000 -editor.gradient.top = #3E4249 -editor.gradient.bottom = #3E4249 +editor.gradient.top = #3E424C +editor.gradient.bottom = #3E424C # highlight for the current line editor.linehighlight.color = #3C1700 # highlight for the current line editor.linehighlight=true -editor.caret.color = #FFFFF2 +editor.caret.color = #FFFFFE # also used by EditorHeader editor.selection.color = #592900 @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #EA90A5 +editor.brackethighlight.color = #EA90B0 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #686C73 -editor.scrollbar.thumb.rollover.color = #5D6168 -editor.scrollbar.thumb.pressed.color = #5D6168 -editor.scrollbar.color = #4A4E55 +editor.scrollbar.thumb.enabled.color = #686C78 +editor.scrollbar.thumb.rollover.color = #5D616D +editor.scrollbar.thumb.pressed.color = #5D616D +editor.scrollbar.color = #4A4E59 ## PdeTextAreaPainter - extras added to the editor ## @@ -147,70 +147,83 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #FAFEFF # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #686C73 +editor.gutter.linehighlight.color = #686C78 # squiggly line underneath errors in the editor -editor.error.underline.color = #FFFFF2 +editor.error.underline.color = #FFFFFE # squiggly line underneath warnings -editor.warning.underline.color = #F8951D +editor.warning.underline.color = #F8954A ## MarkerColumn - shows ticks adjacent the scroll bar ## # lines next to the scrollbar showing where errors are located -editor.column.error.color = #FFFFF2 -editor.column.warning.color = #7A7E84 +editor.column.error.color = #FFFFFE +editor.column.warning.color = #7A7E8A ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 -errors.header.bgcolor = #0F1218 -errors.header.fgcolor = #949693 -errors.bgcolor = #1F232B +errors.header.bgcolor = #0F1219 +errors.header.fgcolor = #94969B +errors.bgcolor = #1F232D errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #FFFFF2 -errors.row.bgcolor = #A03000 -errors.selection.fgcolor = #000000 -errors.selection.bgcolor = #F8951D -errors.selection.error.bgcolor = #000000 -errors.selection.warning.bgcolor = #923600 -errors.indicator.error.color = #FFFFF2 -errors.indicator.warning.color = #DC6100 +errors.row.fgcolor = #BEC2CB +errors.row.bgcolor = #1F232D +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #A04C00 +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #FF9136 +errors.indicator.error.color = #BEC2CB +errors.indicator.warning.color = #595D69 ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #0F1218 -manager.tab.unselected.color = #2F3238 +manager.tab.selected.color = #3E424C +manager.tab.unselected.color = #20232B manager.tab.text.font = processing.sans,bold,14 -manager.tab.text.selected.color = #FFFFF2 -manager.tab.text.unselected.color = #8E9194 -manager.tab.gradient.top = #3E4249 -manager.tab.gradient.bottom = #3E4249 +manager.tab.text.selected.color = #FFFFFE +manager.tab.text.unselected.color = #858892 +manager.tab.gradient.top = #0F1219 +manager.tab.gradient.bottom = #0F1219 ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #3E4249 +manager.tab.background = #0F1219 ## ContributionTab -manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + +manager.list.search.text.color = #FFFFFE +manager.list.search.placeholder.color = #9397A4 +manager.list.search.background.color = #000000 ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #0F1218 -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #7A7D81 -manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.background.color = #3E424C +manager.list.header.color = #494D58 +manager.list.section.color = #3E424C +manager.list.selection.color = #D07329 +manager.list.text.color = #FFFFFE +manager.list.incompatible.selection.color = #555964 +manager.list.incompatible.text.color = #9397A4 + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #616570 +manager.panel.text.color = #FFFFFE +manager.panel.link.color = #FFBF61 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #EA90A5,plain -editor.token.function2.style = #EA90A5,plain -editor.token.function3.style = #00B5F7,plain -editor.token.function4.style = #EA90A5,bold +editor.token.function1.style = #EA90B0,plain +editor.token.function2.style = #EA90B0,plain +editor.token.function3.style = #00B5F8,plain +editor.token.function4.style = #EA90B0,bold -editor.token.keyword1.style = #D50059,plain -editor.token.keyword2.style = #D50059,plain -editor.token.keyword3.style = #00B5F7,plain -editor.token.keyword4.style = #DD3600,plain +editor.token.keyword1.style = #D50066,plain +editor.token.keyword2.style = #D50066,plain +editor.token.keyword3.style = #00B5F8,plain +editor.token.keyword4.style = #DD3632,plain editor.token.keyword5.style = #F89300,plain -editor.token.keyword6.style = #D50059,plain +editor.token.keyword6.style = #D50066,plain -editor.token.literal1.style = #0083CB,plain -editor.token.literal2.style = #1A2CEF,plain +editor.token.literal1.style = #0083CD,plain +editor.token.literal2.style = #1A2CF1,plain -editor.token.operator.style = #EA90A5,plain +editor.token.operator.style = #EA90B0,plain -editor.token.label.style = #5E5E59,bold +editor.token.label.style = #5E5E5E,bold -editor.token.comment1.style = #5E5E59,plain -editor.token.comment2.style = #5E5E59,plain +editor.token.comment1.style = #5E5E5E,plain +editor.token.comment2.style = #5E5E5E,plain -editor.token.invalid.style = #5E5E59,bold +editor.token.invalid.style = #5E5E5E,bold diff --git a/build/shared/lib/themes/beryl.txt b/build/shared/lib/themes/beryl.txt index 626c6ee06..129f3373e 100644 --- a/build/shared/lib/themes/beryl.txt +++ b/build/shared/lib/themes/beryl.txt @@ -7,30 +7,30 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 toolbar.rollover.color = #000000 -toolbar.gradient.top = #009D76 -toolbar.gradient.bottom = #009D76 +toolbar.gradient.top = #009D7A +toolbar.gradient.bottom = #009D7A # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 -mode.title.color = #00452A +mode.title.color = #00452B # stolen from gradient bottom -mode.background.color = #009D76 -mode.outline.color = #005A3C +mode.background.color = #009D7A +mode.outline.color = #005A3D -toolbar.button.disabled.field = #008763 -toolbar.button.disabled.glyph = #007250 +toolbar.button.disabled.field = #008766 +toolbar.button.disabled.glyph = #007252 toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #FFFFF2 -toolbar.button.enabled.glyph = #0081BC +toolbar.button.enabled.field = #FFFFFE +toolbar.button.enabled.glyph = #0081BD toolbar.button.enabled.stroke = none toolbar.button.pressed.field = #00649E -toolbar.button.pressed.glyph = #FFFFF2 -toolbar.button.pressed.stroke = #FFFFF2 -toolbar.button.rollover.field = #FFFFF2 -toolbar.button.rollover.glyph = #001D2E +toolbar.button.pressed.glyph = #FFFFFE +toolbar.button.pressed.stroke = #FFFFFE +toolbar.button.rollover.field = #FFFFFE +toolbar.button.rollover.glyph = #001D2F toolbar.button.rollover.stroke = none -toolbar.button.selected.field = #001D2E -toolbar.button.selected.glyph = #FFFFF2 +toolbar.button.selected.field = #001D2F +toolbar.button.selected.glyph = #FFFFFE toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## -status.notice.fgcolor = #00FDC4 -status.notice.bgcolor = #00734C +status.notice.fgcolor = #00FDCB +status.notice.bgcolor = #00734E status.error.fgcolor = #00EEFF status.error.bgcolor = #000000 -status.warning.bgcolor = #004A59 +status.warning.bgcolor = #004A5B status.warning.fgcolor = #00F0FF -status.url.fgcolor = #FFFFF2 +status.url.fgcolor = #FFFFFE status.font = processing.sans,plain,13 # For the clipboard icon, needs to be a little larger on macOS status.emoji.font = Dialog,plain,22 @@ -68,54 +68,54 @@ status.emoji.font.macosx = Dialog,plain,22 ## EditorHeader - the tab area above the editor ## header.text.font = processing.sans,bold,14 -header.text.selected.color = #003F55 -header.text.unselected.color = #006A52 -header.tab.arrow.color = #006A52 -header.tab.selected.color = #73F5CD -header.tab.unselected.color = #49CFAA +header.text.selected.color = #003F56 +header.text.unselected.color = #006A55 +header.tab.arrow.color = #006A55 +header.tab.selected.color = #73F5D5 +header.tab.unselected.color = #49CFB1 header.tab.modified.color = #000000 -header.gradient.top = #009D76 -header.gradient.bottom = #009D76 +header.gradient.top = #009D7A +header.gradient.bottom = #009D7A ## EditorFooter - the tabs below the editor ## footer.text.font = processing.sans,bold,12 footer.text.selected.color = #000000 -footer.text.enabled.color = #00452A +footer.text.enabled.color = #00452B footer.icon.selected.color = #000000 -footer.icon.enabled.color = #00452A -footer.gradient.top = #009D76 -footer.gradient.bottom = #009D76 -footer.tab.selected.color = #007755 -footer.tab.enabled.color = #009D76 +footer.icon.enabled.color = #00452B +footer.gradient.top = #009D7A +footer.gradient.bottom = #009D7A +footer.tab.selected.color = #007757 +footer.tab.enabled.color = #009D7A footer.updates.text.color = #000000 -footer.updates.indicator.field.color = #56FFE8 +footer.updates.indicator.field.color = #56FFF1 footer.updates.indicator.text.color = #001E00 ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #1F2C26 -console.output.color = #96A599 +console.color = #1F2C28 +console.output.color = #96A5A0 # text color for errors printed in the console console.error.color = #00EAFF -console.scrollbar.thumb.enabled.color = #4D5B52 +console.scrollbar.thumb.enabled.color = #4D5B57 console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #18241F +console.scrollbar.color = #182421 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors editor.fgcolor = #000000 -editor.bgcolor = #FFFFF2 +editor.bgcolor = #FFFFFE -editor.gradient.top = #009D76 -editor.gradient.bottom = #009D76 +editor.gradient.top = #009D7A +editor.gradient.bottom = #009D7A # highlight for the current line editor.linehighlight.color = #C5F9FF @@ -124,7 +124,7 @@ editor.linehighlight=true editor.caret.color = #000000 # also used by EditorHeader -editor.selection.color = #A3DDE6 +editor.selection.color = #A3DDEE # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #006696 +editor.brackethighlight.color = #006698 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #007755 -editor.scrollbar.thumb.rollover.color = #006C4B -editor.scrollbar.thumb.pressed.color = #006C4B -editor.scrollbar.color = #00926C +editor.scrollbar.thumb.enabled.color = #007757 +editor.scrollbar.thumb.rollover.color = #006C4D +editor.scrollbar.thumb.pressed.color = #006C4D +editor.scrollbar.color = #00926F ## PdeTextAreaPainter - extras added to the editor ## @@ -147,70 +147,83 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #001E00 # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #007755 +editor.gutter.linehighlight.color = #007757 # squiggly line underneath errors in the editor editor.error.underline.color = #000000 # squiggly line underneath warnings -editor.warning.underline.color = #004A59 +editor.warning.underline.color = #004A5B ## MarkerColumn - shows ticks adjacent the scroll bar ## # lines next to the scrollbar showing where errors are located editor.column.error.color = #000000 -editor.column.warning.color = #56FFE8 +editor.column.warning.color = #56FFF1 ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 errors.header.bgcolor = #002A16 -errors.header.fgcolor = #6FA791 -errors.bgcolor = #005336 +errors.header.fgcolor = #6FA797 +errors.bgcolor = #005337 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #000000 -errors.row.bgcolor = #00B9FF -errors.selection.fgcolor = #FFFFF2 -errors.selection.bgcolor = #004A59 -errors.selection.error.bgcolor = #FFFFF2 -errors.selection.warning.bgcolor = #00BBFF -errors.indicator.error.color = #000000 -errors.indicator.warning.color = #0085E5 +errors.row.fgcolor = #5DE1C2 +errors.row.bgcolor = #005337 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #007757 +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #00C99F +errors.indicator.error.color = #5DE1C2 +errors.indicator.warning.color = #008C6A ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #73F5CD -manager.tab.unselected.color = #03B893 +manager.tab.selected.color = #73F5D5 +manager.tab.unselected.color = #27B699 manager.tab.text.font = processing.sans,bold,14 manager.tab.text.selected.color = #000000 -manager.tab.text.unselected.color = #005E43 -manager.tab.gradient.top = #009D76 -manager.tab.gradient.bottom = #009D76 +manager.tab.text.unselected.color = #005E46 +manager.tab.gradient.top = #007F5E +manager.tab.gradient.bottom = #007F5E ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #009D76 +manager.tab.background = #007F5E ## ContributionTab +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.list.search.placeholder.color = #008267 +manager.list.search.background.color = #FFFFFE ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #73F5CD -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #007A5D +manager.list.background.color = #73F5D5 +manager.list.header.color = #64E7C7 +manager.list.section.color = #73F5D5 +manager.list.selection.color = #00BBF2 manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.incompatible.selection.color = #54D8B9 +manager.list.incompatible.text.color = #008267 + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #43CAAC +manager.panel.text.color = #000000 +manager.panel.link.color = #0052BB ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #006696,plain -editor.token.function2.style = #006696,plain -editor.token.function3.style = #6D9800,plain -editor.token.function4.style = #006696,bold +editor.token.function1.style = #006698,plain +editor.token.function2.style = #006698,plain +editor.token.function3.style = #6D9810,plain +editor.token.function4.style = #006698,bold -editor.token.keyword1.style = #309879,plain -editor.token.keyword2.style = #309879,plain -editor.token.keyword3.style = #6D9800,plain -editor.token.keyword4.style = #DB4D6E,plain -editor.token.keyword5.style = #E76700,plain -editor.token.keyword6.style = #309879,plain +editor.token.keyword1.style = #30987F,plain +editor.token.keyword2.style = #30987F,plain +editor.token.keyword3.style = #6D9810,plain +editor.token.keyword4.style = #DB4D7A,plain +editor.token.keyword5.style = #E7671C,plain +editor.token.keyword6.style = #30987F,plain -editor.token.literal1.style = #738A5B,plain -editor.token.literal2.style = #75488D,plain +editor.token.literal1.style = #738A63,plain +editor.token.literal2.style = #754891,plain -editor.token.operator.style = #006696,plain +editor.token.operator.style = #006698,plain -editor.token.label.style = #656560,bold +editor.token.label.style = #656565,bold -editor.token.comment1.style = #656560,plain -editor.token.comment2.style = #656560,plain +editor.token.comment1.style = #656565,plain +editor.token.comment2.style = #656565,plain -editor.token.invalid.style = #656560,bold +editor.token.invalid.style = #656565,bold diff --git a/build/shared/lib/themes/calcite.txt b/build/shared/lib/themes/calcite.txt index 01329efad..2538e4e22 100644 --- a/build/shared/lib/themes/calcite.txt +++ b/build/shared/lib/themes/calcite.txt @@ -7,30 +7,30 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 toolbar.rollover.color = #000000 -toolbar.gradient.top = #CBCECC -toolbar.gradient.bottom = #CBCECC +toolbar.gradient.top = #CBCED6 +toolbar.gradient.bottom = #CBCED6 # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 -mode.title.color = #4A4E50 +mode.title.color = #4A4E54 # stolen from gradient bottom -mode.background.color = #CBCECC -mode.outline.color = #686C6D +mode.background.color = #CBCED6 +mode.outline.color = #686C72 -toolbar.button.disabled.field = #B5B8B7 -toolbar.button.disabled.glyph = #9FA3A2 +toolbar.button.disabled.field = #B5B8BF +toolbar.button.disabled.glyph = #9FA3AA toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #FFFFF2 +toolbar.button.enabled.field = #FFFFFE toolbar.button.enabled.glyph = #0FA7FF toolbar.button.enabled.stroke = none -toolbar.button.pressed.field = #007CD7 -toolbar.button.pressed.glyph = #FFFFF2 -toolbar.button.pressed.stroke = #FFFFF2 -toolbar.button.rollover.field = #FFFFF2 -toolbar.button.rollover.glyph = #005084 +toolbar.button.pressed.field = #007CDA +toolbar.button.pressed.glyph = #FFFFFE +toolbar.button.pressed.stroke = #FFFFFE +toolbar.button.rollover.field = #FFFFFE +toolbar.button.rollover.glyph = #005086 toolbar.button.rollover.stroke = none -toolbar.button.selected.field = #005084 -toolbar.button.selected.glyph = #FFFFF2 +toolbar.button.selected.field = #005086 +toolbar.button.selected.glyph = #FFFFFE toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## -status.notice.fgcolor = #1A1F23 -status.notice.bgcolor = #878B8D -status.error.fgcolor = #FFFFF2 +status.notice.fgcolor = #1A1F25 +status.notice.bgcolor = #878B94 +status.error.fgcolor = #FFFFFE status.error.bgcolor = #C40000 -status.warning.bgcolor = #033D64 +status.warning.bgcolor = #033D66 status.warning.fgcolor = #80D9FF -status.url.fgcolor = #FFFFF2 +status.url.fgcolor = #FFFFFE status.font = processing.sans,plain,13 # For the clipboard icon, needs to be a little larger on macOS status.emoji.font = Dialog,plain,22 @@ -68,63 +68,63 @@ status.emoji.font.macosx = Dialog,plain,22 ## EditorHeader - the tab area above the editor ## header.text.font = processing.sans,bold,14 -header.text.selected.color = #003360 -header.text.unselected.color = #898B89 -header.tab.arrow.color = #898B89 -header.tab.selected.color = #EFF2ED -header.tab.unselected.color = #E1E4DF +header.text.selected.color = #003361 +header.text.unselected.color = #898B8F +header.tab.arrow.color = #898B8F +header.tab.selected.color = #EFF2F8 +header.tab.unselected.color = #E1E4E9 header.tab.modified.color = #000000 -header.gradient.top = #CBCECC -header.gradient.bottom = #CBCECC +header.gradient.top = #CBCED6 +header.gradient.bottom = #CBCED6 ## EditorFooter - the tabs below the editor ## footer.text.font = processing.sans,bold,12 footer.text.selected.color = #000000 -footer.text.enabled.color = #4A4E50 +footer.text.enabled.color = #4A4E54 footer.icon.selected.color = #000000 -footer.icon.enabled.color = #4A4E50 -footer.gradient.top = #CBCECC -footer.gradient.bottom = #CBCECC -footer.tab.selected.color = #929696 -footer.tab.enabled.color = #CBCECC +footer.icon.enabled.color = #4A4E54 +footer.gradient.top = #CBCED6 +footer.gradient.bottom = #CBCED6 +footer.tab.selected.color = #92969D +footer.tab.enabled.color = #CBCED6 footer.updates.text.color = #000000 -footer.updates.indicator.field.color = #FBFFFA +footer.updates.indicator.field.color = #FBFFFF footer.updates.indicator.text.color = #000009 ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #20252C -console.output.color = #9AA0A4 +console.color = #20252E +console.output.color = #9AA0AB # text color for errors printed in the console console.error.color = #00C5FF -console.scrollbar.thumb.enabled.color = #4F555B +console.scrollbar.thumb.enabled.color = #4F555F console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #1A1F26 +console.scrollbar.color = #1A1F28 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors editor.fgcolor = #000000 -editor.bgcolor = #FFFFF2 +editor.bgcolor = #FFFFFE -editor.gradient.top = #CBCECC -editor.gradient.bottom = #CBCECC +editor.gradient.top = #CBCED6 +editor.gradient.bottom = #CBCED6 # highlight for the current line -editor.linehighlight.color = #E3F1FE +editor.linehighlight.color = #E3F1FF # highlight for the current line editor.linehighlight=true editor.caret.color = #000000 # also used by EditorHeader -editor.selection.color = #C5D5E6 +editor.selection.color = #C5D5EF # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #006696 +editor.brackethighlight.color = #006698 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #929696 -editor.scrollbar.thumb.rollover.color = #828686 -editor.scrollbar.thumb.pressed.color = #828686 -editor.scrollbar.color = #B9BDBB +editor.scrollbar.thumb.enabled.color = #92969D +editor.scrollbar.thumb.rollover.color = #82868D +editor.scrollbar.thumb.pressed.color = #82868D +editor.scrollbar.color = #B9BDC4 ## PdeTextAreaPainter - extras added to the editor ## @@ -147,70 +147,83 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #000009 # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #929696 +editor.gutter.linehighlight.color = #92969D # squiggly line underneath errors in the editor -editor.error.underline.color = #FF0000 +editor.error.underline.color = #FF002C # squiggly line underneath warnings -editor.warning.underline.color = #033D64 +editor.warning.underline.color = #033D66 ## MarkerColumn - shows ticks adjacent the scroll bar ## # lines next to the scrollbar showing where errors are located editor.column.error.color = #BE0000 -editor.column.warning.color = #FBFFFA +editor.column.warning.color = #FBFFFF ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 -errors.header.bgcolor = #26292A -errors.header.fgcolor = #A0A29C -errors.bgcolor = #5E6263 +errors.header.bgcolor = #26292D +errors.header.fgcolor = #A0A2A4 +errors.bgcolor = #5E6268 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #000000 -errors.row.bgcolor = #00DCFF -errors.selection.fgcolor = #FFFFF2 -errors.selection.bgcolor = #033D64 -errors.selection.error.bgcolor = #FFFFF2 -errors.selection.warning.bgcolor = #009DFF -errors.indicator.error.color = #000000 -errors.indicator.warning.color = #0098FF +errors.row.fgcolor = #D2D5DA +errors.row.bgcolor = #5E6268 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #92969D +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #0050AF +errors.indicator.error.color = #D2D5DA +errors.indicator.warning.color = #8A8E95 ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #EFF2ED -manager.tab.unselected.color = #D7DAD6 +manager.tab.selected.color = #EFF2F8 +manager.tab.unselected.color = #C6C9CE manager.tab.text.font = processing.sans,bold,14 manager.tab.text.selected.color = #000000 -manager.tab.text.unselected.color = #646767 -manager.tab.gradient.top = #CBCECC -manager.tab.gradient.bottom = #CBCECC +manager.tab.text.unselected.color = #5D5F64 +manager.tab.gradient.top = #9DA1A8 +manager.tab.gradient.bottom = #9DA1A8 ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #CBCECC +manager.tab.background = #9DA1A8 ## ContributionTab +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.list.search.placeholder.color = #787A7F +manager.list.search.background.color = #FFFFFE ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #EFF2ED -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #6F7171 +manager.list.background.color = #EFF2F8 +manager.list.header.color = #E1E4EA +manager.list.section.color = #EFF2F8 +manager.list.selection.color = #88CDFF manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.incompatible.selection.color = #D3D6DB +manager.list.incompatible.text.color = #787A7F + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #C5C8CD +manager.panel.text.color = #000000 +manager.panel.link.color = #0046C2 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #006696,plain -editor.token.function2.style = #006696,plain -editor.token.function3.style = #6D9800,plain -editor.token.function4.style = #006696,bold +editor.token.function1.style = #006698,plain +editor.token.function2.style = #006698,plain +editor.token.function3.style = #6D9810,plain +editor.token.function4.style = #006698,bold -editor.token.keyword1.style = #309879,plain -editor.token.keyword2.style = #309879,plain -editor.token.keyword3.style = #6D9800,plain -editor.token.keyword4.style = #DB4D6E,plain -editor.token.keyword5.style = #E76700,plain -editor.token.keyword6.style = #309879,plain +editor.token.keyword1.style = #30987F,plain +editor.token.keyword2.style = #30987F,plain +editor.token.keyword3.style = #6D9810,plain +editor.token.keyword4.style = #DB4D7A,plain +editor.token.keyword5.style = #E7671C,plain +editor.token.keyword6.style = #30987F,plain -editor.token.literal1.style = #738A5B,plain -editor.token.literal2.style = #75488D,plain +editor.token.literal1.style = #738A63,plain +editor.token.literal2.style = #754891,plain -editor.token.operator.style = #006696,plain +editor.token.operator.style = #006698,plain -editor.token.label.style = #656560,bold +editor.token.label.style = #656565,bold -editor.token.comment1.style = #656560,plain -editor.token.comment2.style = #656560,plain +editor.token.comment1.style = #656565,plain +editor.token.comment2.style = #656565,plain -editor.token.invalid.style = #656560,bold +editor.token.invalid.style = #656565,bold diff --git a/build/shared/lib/themes/feldspar.txt b/build/shared/lib/themes/feldspar.txt index af41f49a1..dc256a419 100644 --- a/build/shared/lib/themes/feldspar.txt +++ b/build/shared/lib/themes/feldspar.txt @@ -7,30 +7,30 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 toolbar.rollover.color = #000000 -toolbar.gradient.top = #CC9866 -toolbar.gradient.bottom = #CC9866 +toolbar.gradient.top = #CC9875 +toolbar.gradient.bottom = #CC9875 # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 -mode.title.color = #5D3506 +mode.title.color = #5D3517 # stolen from gradient bottom -mode.background.color = #CC9866 -mode.outline.color = #784C1F +mode.background.color = #CC9875 +mode.outline.color = #784C2D -toolbar.button.disabled.field = #B58353 -toolbar.button.disabled.glyph = #9E6E40 +toolbar.button.disabled.field = #B58361 +toolbar.button.disabled.glyph = #9E6E4D toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #FFFFF2 +toolbar.button.enabled.field = #FFFFFE toolbar.button.enabled.glyph = #D05F00 toolbar.button.enabled.stroke = none toolbar.button.pressed.field = #A63C00 -toolbar.button.pressed.glyph = #FFFFF2 -toolbar.button.pressed.stroke = #FFFFF2 -toolbar.button.rollover.field = #FFFFF2 +toolbar.button.pressed.glyph = #FFFFFE +toolbar.button.pressed.stroke = #FFFFFE +toolbar.button.rollover.field = #FFFFFE toolbar.button.rollover.glyph = #5C0800 toolbar.button.rollover.stroke = none toolbar.button.selected.field = #5C0800 -toolbar.button.selected.glyph = #FFFFF2 +toolbar.button.selected.glyph = #FFFFFE toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## -status.notice.fgcolor = #FFD290 -status.notice.bgcolor = #9A6126 -status.error.fgcolor = #FFA100 +status.notice.fgcolor = #FFD2A3 +status.notice.bgcolor = #9A6138 +status.error.fgcolor = #FFA12E status.error.bgcolor = #000000 status.warning.bgcolor = #5B1B00 -status.warning.fgcolor = #FFB200 -status.url.fgcolor = #FFFFF2 +status.warning.fgcolor = #FFB252 +status.url.fgcolor = #FFFFFE status.font = processing.sans,plain,13 # For the clipboard icon, needs to be a little larger on macOS status.emoji.font = Dialog,plain,22 @@ -69,62 +69,62 @@ status.emoji.font.macosx = Dialog,plain,22 header.text.font = processing.sans,bold,14 header.text.selected.color = #540E00 -header.text.unselected.color = #86694C -header.tab.arrow.color = #86694C -header.tab.selected.color = #FFDEB3 -header.tab.unselected.color = #EDC399 +header.text.unselected.color = #866955 +header.tab.arrow.color = #866955 +header.tab.selected.color = #FFDEC2 +header.tab.unselected.color = #EDC3A7 header.tab.modified.color = #000000 -header.gradient.top = #CC9866 -header.gradient.bottom = #CC9866 +header.gradient.top = #CC9875 +header.gradient.bottom = #CC9875 ## EditorFooter - the tabs below the editor ## footer.text.font = processing.sans,bold,12 footer.text.selected.color = #000000 -footer.text.enabled.color = #5D3506 +footer.text.enabled.color = #5D3517 footer.icon.selected.color = #000000 -footer.icon.enabled.color = #5D3506 -footer.gradient.top = #CC9866 -footer.gradient.bottom = #CC9866 -footer.tab.selected.color = #9C6D3E -footer.tab.enabled.color = #CC9866 +footer.icon.enabled.color = #5D3517 +footer.gradient.top = #CC9875 +footer.gradient.bottom = #CC9875 +footer.tab.selected.color = #9C6D4C +footer.tab.enabled.color = #CC9875 footer.updates.text.color = #000000 -footer.updates.indicator.field.color = #FFF3BA +footer.updates.indicator.field.color = #FFF3CD footer.updates.indicator.text.color = #270000 ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #271D13 -console.output.color = #A89A89 +console.color = #271D17 +console.output.color = #A89A92 # text color for errors printed in the console console.error.color = #FF8400 -console.scrollbar.thumb.enabled.color = #594D40 +console.scrollbar.thumb.enabled.color = #594D46 console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #22180E +console.scrollbar.color = #221811 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors editor.fgcolor = #000000 -editor.bgcolor = #FFFFF2 +editor.bgcolor = #FFFFFE -editor.gradient.top = #CC9866 -editor.gradient.bottom = #CC9866 +editor.gradient.top = #CC9875 +editor.gradient.bottom = #CC9875 # highlight for the current line -editor.linehighlight.color = #FFEBCA +editor.linehighlight.color = #FFEBD8 # highlight for the current line editor.linehighlight=true editor.caret.color = #000000 # also used by EditorHeader -editor.selection.color = #EECEAC +editor.selection.color = #EECEB9 # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #006696 +editor.brackethighlight.color = #006698 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #9C6D3E -editor.scrollbar.thumb.rollover.color = #8E6033 -editor.scrollbar.thumb.pressed.color = #8E6033 -editor.scrollbar.color = #BD8A5A +editor.scrollbar.thumb.enabled.color = #9C6D4C +editor.scrollbar.thumb.rollover.color = #8E6040 +editor.scrollbar.thumb.pressed.color = #8E6040 +editor.scrollbar.color = #BD8A68 ## PdeTextAreaPainter - extras added to the editor ## @@ -147,7 +147,7 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #270000 # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #9C6D3E +editor.gutter.linehighlight.color = #9C6D4C # squiggly line underneath errors in the editor editor.error.underline.color = #000000 @@ -159,58 +159,71 @@ editor.warning.underline.color = #5B1B00 # lines next to the scrollbar showing where errors are located editor.column.error.color = #000000 -editor.column.warning.color = #FFF3BA +editor.column.warning.color = #FFF3CD ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 -errors.header.bgcolor = #371B00 -errors.header.fgcolor = #AF9A83 -errors.bgcolor = #6F4418 +errors.header.bgcolor = #371B01 +errors.header.fgcolor = #AF9A8D +errors.bgcolor = #6F4425 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #000000 -errors.row.bgcolor = #FF8900 -errors.selection.fgcolor = #FFFFF2 -errors.selection.bgcolor = #5B1B00 -errors.selection.error.bgcolor = #FFFFF2 -errors.selection.warning.bgcolor = #DF7300 -errors.indicator.error.color = #000000 -errors.indicator.warning.color = #C85100 +errors.row.fgcolor = #F2C7AB +errors.row.bgcolor = #6F4425 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #9C6D4C +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #751A00 +errors.indicator.error.color = #F2C7AB +errors.indicator.warning.color = #A57553 ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #FFDEB3 -manager.tab.unselected.color = #DCB086 +manager.tab.selected.color = #FFDEC2 +manager.tab.unselected.color = #D3AA8F manager.tab.text.font = processing.sans,bold,14 manager.tab.text.selected.color = #000000 -manager.tab.text.unselected.color = #74502D -manager.tab.gradient.top = #CC9866 -manager.tab.gradient.bottom = #CC9866 +manager.tab.text.unselected.color = #704E36 +manager.tab.gradient.top = #A67554 +manager.tab.gradient.bottom = #A67554 ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #CC9866 +manager.tab.background = #A67554 ## ContributionTab +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.list.search.placeholder.color = #916C54 +manager.list.search.background.color = #FFFFFE ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #FFDEB3 -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #896542 +manager.list.background.color = #FFDEC2 +manager.list.header.color = #FCD0B4 +manager.list.section.color = #FFDEC2 +manager.list.selection.color = #F59D5E manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.incompatible.selection.color = #EDC2A7 +manager.list.incompatible.text.color = #916C54 + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #DEB59A +manager.panel.text.color = #000000 +manager.panel.link.color = #7F0000 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #006696,plain -editor.token.function2.style = #006696,plain -editor.token.function3.style = #6D9800,plain -editor.token.function4.style = #006696,bold +editor.token.function1.style = #006698,plain +editor.token.function2.style = #006698,plain +editor.token.function3.style = #6D9810,plain +editor.token.function4.style = #006698,bold -editor.token.keyword1.style = #309879,plain -editor.token.keyword2.style = #309879,plain -editor.token.keyword3.style = #6D9800,plain -editor.token.keyword4.style = #DB4D6E,plain -editor.token.keyword5.style = #E76700,plain -editor.token.keyword6.style = #309879,plain +editor.token.keyword1.style = #30987F,plain +editor.token.keyword2.style = #30987F,plain +editor.token.keyword3.style = #6D9810,plain +editor.token.keyword4.style = #DB4D7A,plain +editor.token.keyword5.style = #E7671C,plain +editor.token.keyword6.style = #30987F,plain -editor.token.literal1.style = #738A5B,plain -editor.token.literal2.style = #75488D,plain +editor.token.literal1.style = #738A63,plain +editor.token.literal2.style = #754891,plain -editor.token.operator.style = #006696,plain +editor.token.operator.style = #006698,plain -editor.token.label.style = #656560,bold +editor.token.label.style = #656565,bold -editor.token.comment1.style = #656560,plain -editor.token.comment2.style = #656560,plain +editor.token.comment1.style = #656565,plain +editor.token.comment2.style = #656565,plain -editor.token.invalid.style = #656560,bold +editor.token.invalid.style = #656565,bold diff --git a/build/shared/lib/themes/fluorite.txt b/build/shared/lib/themes/fluorite.txt index cb8259459..db2d2f4e1 100644 --- a/build/shared/lib/themes/fluorite.txt +++ b/build/shared/lib/themes/fluorite.txt @@ -6,31 +6,31 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 -toolbar.rollover.color = #FFFFF2 -toolbar.gradient.top = #301751 -toolbar.gradient.bottom = #301751 +toolbar.rollover.color = #FFFFFE +toolbar.gradient.top = #301753 +toolbar.gradient.bottom = #301753 # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 -mode.title.color = #B491D3 +mode.title.color = #B491D9 # stolen from gradient bottom -mode.background.color = #301751 -mode.outline.color = #9170B1 +mode.background.color = #301753 +mode.outline.color = #9170B6 -toolbar.button.disabled.field = #442864 -toolbar.button.disabled.glyph = #301751 +toolbar.button.disabled.field = #442867 +toolbar.button.disabled.glyph = #301753 toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #A49EA1 -toolbar.button.enabled.glyph = #2B085F +toolbar.button.enabled.field = #A49EA9 +toolbar.button.enabled.glyph = #2B0860 toolbar.button.enabled.stroke = none -toolbar.button.pressed.field = #19004F -toolbar.button.pressed.glyph = #DFC4EC -toolbar.button.pressed.stroke = #DFC4EC -toolbar.button.rollover.field = #DFC4EC -toolbar.button.rollover.glyph = #2B085F +toolbar.button.pressed.field = #190050 +toolbar.button.pressed.glyph = #DFC4F5 +toolbar.button.pressed.stroke = #DFC4F5 +toolbar.button.rollover.field = #DFC4F5 +toolbar.button.rollover.glyph = #2B0860 toolbar.button.rollover.stroke = none -toolbar.button.selected.field = #FFFFF2 -toolbar.button.selected.glyph = #524A55 +toolbar.button.selected.field = #FFFFFE +toolbar.button.selected.glyph = #524A59 toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -53,11 +53,11 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## status.notice.fgcolor = #F7C9FF -status.notice.bgcolor = #734D9D -status.error.fgcolor = #3F00A4 -status.error.bgcolor = #FFFFF2 -status.warning.bgcolor = #A49EA1 -status.warning.fgcolor = #2F0E53 +status.notice.bgcolor = #734DA1 +status.error.fgcolor = #3F00A6 +status.error.bgcolor = #FFFFFE +status.warning.bgcolor = #A49EA9 +status.warning.fgcolor = #2F0E54 status.url.fgcolor = #000000 status.font = processing.sans,plain,13 # For the clipboard icon, needs to be a little larger on macOS @@ -68,63 +68,63 @@ status.emoji.font.macosx = Dialog,plain,22 ## EditorHeader - the tab area above the editor ## header.text.font = processing.sans,bold,14 -header.text.selected.color = #BCADBE -header.text.unselected.color = #6A577A -header.tab.arrow.color = #6A577A -header.tab.selected.color = #17002B -header.tab.unselected.color = #200E37 -header.tab.modified.color = #FFFFF2 -header.gradient.top = #301751 -header.gradient.bottom = #301751 +header.text.selected.color = #BCADC7 +header.text.unselected.color = #6A577E +header.tab.arrow.color = #6A577E +header.tab.selected.color = #17002C +header.tab.unselected.color = #200E38 +header.tab.modified.color = #FFFFFE +header.gradient.top = #301753 +header.gradient.bottom = #301753 ## EditorFooter - the tabs below the editor ## footer.text.font = processing.sans,bold,12 -footer.text.selected.color = #FFFFF2 -footer.text.enabled.color = #B491D3 -footer.icon.selected.color = #FFFFF2 -footer.icon.enabled.color = #B491D3 -footer.gradient.top = #301751 -footer.gradient.bottom = #301751 -footer.tab.selected.color = #654785 -footer.tab.enabled.color = #301751 -footer.updates.text.color = #FFFFF2 -footer.updates.indicator.field.color = #140030 +footer.text.selected.color = #FFFFFE +footer.text.enabled.color = #B491D9 +footer.icon.selected.color = #FFFFFE +footer.icon.enabled.color = #B491D9 +footer.gradient.top = #301753 +footer.gradient.bottom = #301753 +footer.tab.selected.color = #654788 +footer.tab.enabled.color = #301753 +footer.updates.text.color = #FFFFFE +footer.updates.indicator.field.color = #140031 footer.updates.indicator.text.color = #FFEFFF ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #17101A -console.output.color = #9B949B +console.color = #17101B +console.output.color = #9B94A2 # text color for errors printed in the console console.error.color = #F071FF -console.scrollbar.thumb.enabled.color = #49434B +console.scrollbar.thumb.enabled.color = #49434F console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #140D18 +console.scrollbar.color = #140D19 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors -editor.fgcolor = #FFFFF2 +editor.fgcolor = #FFFFFE editor.bgcolor = #000000 -editor.gradient.top = #301751 -editor.gradient.bottom = #301751 +editor.gradient.top = #301753 +editor.gradient.bottom = #301753 # highlight for the current line -editor.linehighlight.color = #1C1A1C +editor.linehighlight.color = #1C1A1E # highlight for the current line editor.linehighlight=true -editor.caret.color = #FFFFF2 +editor.caret.color = #FFFFFE # also used by EditorHeader -editor.selection.color = #312E31 +editor.selection.color = #312E34 # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #F18F88 +editor.brackethighlight.color = #F18F95 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #654785 -editor.scrollbar.thumb.rollover.color = #5C3E7C -editor.scrollbar.thumb.pressed.color = #5C3E7C -editor.scrollbar.color = #402560 +editor.scrollbar.thumb.enabled.color = #654788 +editor.scrollbar.thumb.rollover.color = #5C3E7F +editor.scrollbar.thumb.pressed.color = #5C3E7F +editor.scrollbar.color = #402563 ## PdeTextAreaPainter - extras added to the editor ## @@ -147,70 +147,83 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #FFEFFF # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #654785 +editor.gutter.linehighlight.color = #654788 # squiggly line underneath errors in the editor -editor.error.underline.color = #FFFFF2 +editor.error.underline.color = #FFFFFE # squiggly line underneath warnings -editor.warning.underline.color = #A49EA1 +editor.warning.underline.color = #A49EA9 ## MarkerColumn - shows ticks adjacent the scroll bar ## # lines next to the scrollbar showing where errors are located -editor.column.error.color = #FFFFF2 -editor.column.warning.color = #6F508E +editor.column.error.color = #FFFFFE +editor.column.warning.color = #6F5092 ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 -errors.header.bgcolor = #17002B -errors.header.fgcolor = #9C8EA2 -errors.bgcolor = #1E0740 +errors.header.bgcolor = #17002C +errors.header.fgcolor = #9C8EA8 +errors.bgcolor = #1E0741 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #FFFFF2 -errors.row.bgcolor = #5200B3 -errors.selection.fgcolor = #000000 -errors.selection.bgcolor = #A49EA1 -errors.selection.error.bgcolor = #000000 -errors.selection.warning.bgcolor = #6822B2 -errors.indicator.error.color = #FFFFF2 -errors.indicator.warning.color = #963EF2 +errors.row.fgcolor = #CEB2EA +errors.row.bgcolor = #1E0741 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #5A545E +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #CF81FF +errors.indicator.error.color = #CEB2EA +errors.indicator.warning.color = #624486 ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #17002B -manager.tab.unselected.color = #27133F +manager.tab.selected.color = #301753 +manager.tab.unselected.color = #1E0B38 manager.tab.text.font = processing.sans,bold,14 -manager.tab.text.selected.color = #FFFFF2 -manager.tab.text.unselected.color = #957AAC -manager.tab.gradient.top = #301751 -manager.tab.gradient.bottom = #301751 +manager.tab.text.selected.color = #FFFFFE +manager.tab.text.unselected.color = #9075AC +manager.tab.gradient.top = #17002C +manager.tab.gradient.bottom = #17002C ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #301751 +manager.tab.background = #17002C ## ContributionTab -manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + +manager.list.search.text.color = #FFFFFE +manager.list.search.placeholder.color = #9675BB +manager.list.search.background.color = #000000 ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #17002B -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #89709E -manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.background.color = #301753 +manager.list.header.color = #3C225F +manager.list.section.color = #301753 +manager.list.selection.color = #7C7681 +manager.list.text.color = #FFFFFE +manager.list.incompatible.selection.color = #492D6C +manager.list.incompatible.text.color = #9675BB + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #553878 +manager.panel.text.color = #FFFFFE +manager.panel.link.color = #EACBFF ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #F18F88,plain -editor.token.function2.style = #F18F88,plain +editor.token.function1.style = #F18F95,plain +editor.token.function2.style = #F18F95,plain editor.token.function3.style = #00B2FF,plain -editor.token.function4.style = #F18F88,bold +editor.token.function4.style = #F18F95,bold -editor.token.keyword1.style = #DD0000,plain -editor.token.keyword2.style = #DD0000,plain +editor.token.keyword1.style = #DD0019,plain +editor.token.keyword2.style = #DD0019,plain editor.token.keyword3.style = #00B2FF,plain editor.token.keyword4.style = #C65400,plain editor.token.keyword5.style = #00CB00,plain -editor.token.keyword6.style = #DD0000,plain +editor.token.keyword6.style = #DD0019,plain -editor.token.literal1.style = #7E65CA,plain -editor.token.literal2.style = #AA00B6,plain +editor.token.literal1.style = #7E65CE,plain +editor.token.literal2.style = #AA00BA,plain -editor.token.operator.style = #F18F88,plain +editor.token.operator.style = #F18F95,plain -editor.token.label.style = #5E5E59,bold +editor.token.label.style = #5E5E5E,bold -editor.token.comment1.style = #5E5E59,plain -editor.token.comment2.style = #5E5E59,plain +editor.token.comment1.style = #5E5E5E,plain +editor.token.comment2.style = #5E5E5E,plain -editor.token.invalid.style = #5E5E59,bold +editor.token.invalid.style = #5E5E5E,bold diff --git a/build/shared/lib/themes/gabbro.txt b/build/shared/lib/themes/gabbro.txt index 725c727d4..cdcafacb8 100644 --- a/build/shared/lib/themes/gabbro.txt +++ b/build/shared/lib/themes/gabbro.txt @@ -7,30 +7,30 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 toolbar.rollover.color = #000000 -toolbar.gradient.top = #869570 -toolbar.gradient.bottom = #869570 +toolbar.gradient.top = #869579 +toolbar.gradient.bottom = #869579 # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 -mode.title.color = #2F3D20 +mode.title.color = #2F3D24 # stolen from gradient bottom -mode.background.color = #869570 -mode.outline.color = #445133 +mode.background.color = #869579 +mode.outline.color = #445138 -toolbar.button.disabled.field = #72805D -toolbar.button.disabled.glyph = #5E6C4B +toolbar.button.disabled.field = #728065 +toolbar.button.disabled.glyph = #5E6C51 toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #FFFFF2 +toolbar.button.enabled.field = #FFFFFE toolbar.button.enabled.glyph = #238400 toolbar.button.enabled.stroke = none toolbar.button.pressed.field = #006500 -toolbar.button.pressed.glyph = #FFFFF2 -toolbar.button.pressed.stroke = #FFFFF2 -toolbar.button.rollover.field = #FFFFF2 +toolbar.button.pressed.glyph = #FFFFFE +toolbar.button.pressed.stroke = #FFFFFE +toolbar.button.rollover.field = #FFFFFE toolbar.button.rollover.glyph = #002400 toolbar.button.rollover.stroke = none toolbar.button.selected.field = #002400 -toolbar.button.selected.glyph = #FFFFF2 +toolbar.button.selected.glyph = #FFFFFE toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## -status.notice.fgcolor = #D0E4B1 -status.notice.bgcolor = #566840 -status.error.fgcolor = #6CE000 +status.notice.fgcolor = #D0E4BE +status.notice.bgcolor = #566847 +status.error.fgcolor = #6CE010 status.error.bgcolor = #000000 status.warning.bgcolor = #194200 -status.warning.fgcolor = #9AE84C -status.url.fgcolor = #FFFFF2 +status.warning.fgcolor = #9AE862 +status.url.fgcolor = #FFFFFE status.font = processing.sans,plain,13 # For the clipboard icon, needs to be a little larger on macOS status.emoji.font = Dialog,plain,22 @@ -69,62 +69,62 @@ status.emoji.font.macosx = Dialog,plain,22 header.text.font = processing.sans,bold,14 header.text.selected.color = #073700 -header.text.unselected.color = #5D6550 -header.tab.arrow.color = #5D6550 -header.tab.selected.color = #DAE6C3 -header.tab.unselected.color = #B9C4A4 +header.text.unselected.color = #5D6555 +header.tab.arrow.color = #5D6555 +header.tab.selected.color = #DAE6CF +header.tab.unselected.color = #B9C4AE header.tab.modified.color = #000000 -header.gradient.top = #869570 -header.gradient.bottom = #869570 +header.gradient.top = #869579 +header.gradient.bottom = #869579 ## EditorFooter - the tabs below the editor ## footer.text.font = processing.sans,bold,12 footer.text.selected.color = #000000 -footer.text.enabled.color = #2F3D20 +footer.text.enabled.color = #2F3D24 footer.icon.selected.color = #000000 -footer.icon.enabled.color = #2F3D20 -footer.gradient.top = #869570 -footer.gradient.bottom = #869570 -footer.tab.selected.color = #606F4D -footer.tab.enabled.color = #869570 +footer.icon.enabled.color = #2F3D24 +footer.gradient.top = #869579 +footer.gradient.bottom = #869579 +footer.tab.selected.color = #606F54 +footer.tab.enabled.color = #869579 footer.updates.text.color = #000000 -footer.updates.indicator.field.color = #F4FFD7 +footer.updates.indicator.field.color = #F4FFE4 footer.updates.indicator.text.color = #000700 ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #202618 -console.output.color = #9AA28B +console.color = #20261B +console.output.color = #9AA294 # text color for errors printed in the console console.error.color = #00D800 -console.scrollbar.thumb.enabled.color = #4F5645 +console.scrollbar.thumb.enabled.color = #4F5649 console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #1A2013 +console.scrollbar.color = #1A2015 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors editor.fgcolor = #000000 -editor.bgcolor = #FFFFF2 +editor.bgcolor = #FFFFFE -editor.gradient.top = #869570 -editor.gradient.bottom = #869570 +editor.gradient.top = #869579 +editor.gradient.bottom = #869579 # highlight for the current line -editor.linehighlight.color = #E6F5CB +editor.linehighlight.color = #E6F5D7 # highlight for the current line editor.linehighlight=true editor.caret.color = #000000 # also used by EditorHeader -editor.selection.color = #C8D9AD +editor.selection.color = #C8D9B9 # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #006696 +editor.brackethighlight.color = #006698 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #606F4D -editor.scrollbar.thumb.rollover.color = #556343 -editor.scrollbar.thumb.pressed.color = #556343 -editor.scrollbar.color = #7A8966 +editor.scrollbar.thumb.enabled.color = #606F54 +editor.scrollbar.thumb.rollover.color = #556349 +editor.scrollbar.thumb.pressed.color = #556349 +editor.scrollbar.color = #7A896D ## PdeTextAreaPainter - extras added to the editor ## @@ -147,7 +147,7 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #000700 # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #606F4D +editor.gutter.linehighlight.color = #606F54 # squiggly line underneath errors in the editor editor.error.underline.color = #000000 @@ -159,58 +159,71 @@ editor.warning.underline.color = #194200 # lines next to the scrollbar showing where errors are located editor.column.error.color = #000000 -editor.column.warning.color = #F4FFD7 +editor.column.warning.color = #F4FFE4 ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 -errors.header.bgcolor = #19220E -errors.header.fgcolor = #999F8C -errors.bgcolor = #3D4A2C +errors.header.bgcolor = #192211 +errors.header.fgcolor = #999F94 +errors.bgcolor = #3D4A31 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #000000 -errors.row.bgcolor = #38B500 -errors.selection.fgcolor = #FFFFF2 -errors.selection.bgcolor = #194200 -errors.selection.error.bgcolor = #FFFFF2 -errors.selection.warning.bgcolor = #4DAA00 -errors.indicator.error.color = #000000 -errors.indicator.warning.color = #008000 +errors.row.fgcolor = #C5D1BA +errors.row.bgcolor = #3D4A31 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #606F54 +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #6CC72D +errors.indicator.error.color = #C5D1BA +errors.indicator.warning.color = #6F7E62 ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #DAE6C3 -manager.tab.unselected.color = #A2AF8E +manager.tab.selected.color = #DAE6CF +manager.tab.unselected.color = #A0AC96 manager.tab.text.font = processing.sans,bold,14 manager.tab.text.selected.color = #000000 -manager.tab.text.unselected.color = #4A553C -manager.tab.gradient.top = #869570 -manager.tab.gradient.bottom = #869570 +manager.tab.text.unselected.color = #4A5441 +manager.tab.gradient.top = #68765B +manager.tab.gradient.bottom = #68765B ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #869570 +manager.tab.background = #68765B ## ContributionTab +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.list.search.placeholder.color = #6A7561 +manager.list.search.background.color = #FFFFFE ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #DAE6C3 -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #636D53 +manager.list.background.color = #DAE6CF +manager.list.header.color = #CCD8C1 +manager.list.section.color = #DAE6CF +manager.list.selection.color = #7CB851 manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.incompatible.selection.color = #BECAB3 +manager.list.incompatible.text.color = #6A7561 + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #B0BCA6 +manager.panel.text.color = #000000 +manager.panel.link.color = #004500 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #006696,plain -editor.token.function2.style = #006696,plain -editor.token.function3.style = #6D9800,plain -editor.token.function4.style = #006696,bold +editor.token.function1.style = #006698,plain +editor.token.function2.style = #006698,plain +editor.token.function3.style = #6D9810,plain +editor.token.function4.style = #006698,bold -editor.token.keyword1.style = #309879,plain -editor.token.keyword2.style = #309879,plain -editor.token.keyword3.style = #6D9800,plain -editor.token.keyword4.style = #DB4D6E,plain -editor.token.keyword5.style = #E76700,plain -editor.token.keyword6.style = #309879,plain +editor.token.keyword1.style = #30987F,plain +editor.token.keyword2.style = #30987F,plain +editor.token.keyword3.style = #6D9810,plain +editor.token.keyword4.style = #DB4D7A,plain +editor.token.keyword5.style = #E7671C,plain +editor.token.keyword6.style = #30987F,plain -editor.token.literal1.style = #738A5B,plain -editor.token.literal2.style = #75488D,plain +editor.token.literal1.style = #738A63,plain +editor.token.literal2.style = #754891,plain -editor.token.operator.style = #006696,plain +editor.token.operator.style = #006698,plain -editor.token.label.style = #656560,bold +editor.token.label.style = #656565,bold -editor.token.comment1.style = #656560,plain -editor.token.comment2.style = #656560,plain +editor.token.comment1.style = #656565,plain +editor.token.comment2.style = #656565,plain -editor.token.invalid.style = #656560,bold +editor.token.invalid.style = #656565,bold diff --git a/build/shared/lib/themes/galena.txt b/build/shared/lib/themes/galena.txt index 47f4c972f..9a6f25d8d 100644 --- a/build/shared/lib/themes/galena.txt +++ b/build/shared/lib/themes/galena.txt @@ -7,30 +7,30 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 toolbar.rollover.color = #000000 -toolbar.gradient.top = #76797A -toolbar.gradient.bottom = #76797A +toolbar.gradient.top = #767980 +toolbar.gradient.bottom = #767980 # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 -mode.title.color = #2E3134 +mode.title.color = #2E3136 # stolen from gradient bottom -mode.background.color = #76797A -mode.outline.color = #3F4244 +mode.background.color = #767980 +mode.outline.color = #3F4248 -toolbar.button.disabled.field = #626567 -toolbar.button.disabled.glyph = #4F5254 +toolbar.button.disabled.field = #62656C +toolbar.button.disabled.glyph = #4F5258 toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #FFFFF2 -toolbar.button.enabled.glyph = #0063A1 +toolbar.button.enabled.field = #FFFFFE +toolbar.button.enabled.glyph = #0063A3 toolbar.button.enabled.stroke = none -toolbar.button.pressed.field = #004B86 -toolbar.button.pressed.glyph = #FFFFF2 -toolbar.button.pressed.stroke = #FFFFF2 -toolbar.button.rollover.field = #FFFFF2 -toolbar.button.rollover.glyph = #00040E +toolbar.button.pressed.field = #004B88 +toolbar.button.pressed.glyph = #FFFFFE +toolbar.button.pressed.stroke = #FFFFFE +toolbar.button.rollover.field = #FFFFFE +toolbar.button.rollover.glyph = #00040F toolbar.button.rollover.stroke = none -toolbar.button.selected.field = #00040E -toolbar.button.selected.glyph = #FFFFF2 +toolbar.button.selected.field = #00040F +toolbar.button.selected.glyph = #FFFFFE toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## -status.notice.fgcolor = #D5DAD9 -status.notice.bgcolor = #4F5457 -status.error.fgcolor = #FFFFF2 +status.notice.fgcolor = #D5DAE3 +status.notice.bgcolor = #4F545B +status.error.fgcolor = #FFFFFE status.error.bgcolor = #8F0000 -status.warning.bgcolor = #434649 +status.warning.bgcolor = #43464C status.warning.fgcolor = #ACDAFF -status.url.fgcolor = #FFFFF2 +status.url.fgcolor = #FFFFFE status.font = processing.sans,plain,13 # For the clipboard icon, needs to be a little larger on macOS status.emoji.font = Dialog,plain,22 @@ -68,63 +68,63 @@ status.emoji.font.macosx = Dialog,plain,22 ## EditorHeader - the tab area above the editor ## header.text.font = processing.sans,bold,14 -header.text.selected.color = #303945 -header.text.unselected.color = #525453 -header.tab.arrow.color = #525453 -header.tab.selected.color = #D9DCD7 -header.tab.unselected.color = #B0B3B0 +header.text.selected.color = #303948 +header.text.unselected.color = #525457 +header.tab.arrow.color = #525457 +header.tab.selected.color = #D9DCE1 +header.tab.unselected.color = #B0B3B8 header.tab.modified.color = #000000 -header.gradient.top = #76797A -header.gradient.bottom = #76797A +header.gradient.top = #767980 +header.gradient.bottom = #767980 ## EditorFooter - the tabs below the editor ## footer.text.font = processing.sans,bold,12 footer.text.selected.color = #000000 -footer.text.enabled.color = #2E3134 +footer.text.enabled.color = #2E3136 footer.icon.selected.color = #000000 -footer.icon.enabled.color = #2E3134 -footer.gradient.top = #76797A -footer.gradient.bottom = #76797A -footer.tab.selected.color = #565A5C -footer.tab.enabled.color = #76797A +footer.icon.enabled.color = #2E3136 +footer.gradient.top = #767980 +footer.gradient.bottom = #767980 +footer.tab.selected.color = #565A60 +footer.tab.enabled.color = #767980 footer.updates.text.color = #000000 -footer.updates.indicator.field.color = #FBFFFA +footer.updates.indicator.field.color = #FBFFFF footer.updates.indicator.text.color = #000009 ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #262C32 -console.output.color = #9DA4A7 +console.color = #262C35 +console.output.color = #9DA4AE # text color for errors printed in the console console.error.color = #00C5FF -console.scrollbar.thumb.enabled.color = #555B60 +console.scrollbar.thumb.enabled.color = #555B64 console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #1F242B +console.scrollbar.color = #1F242D ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors editor.fgcolor = #000000 -editor.bgcolor = #FFFFF2 +editor.bgcolor = #FFFFFE -editor.gradient.top = #76797A -editor.gradient.bottom = #76797A +editor.gradient.top = #767980 +editor.gradient.bottom = #767980 # highlight for the current line -editor.linehighlight.color = #E3F1FE +editor.linehighlight.color = #E3F1FF # highlight for the current line editor.linehighlight=true editor.caret.color = #000000 # also used by EditorHeader -editor.selection.color = #C5D5E6 +editor.selection.color = #C5D5EF # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #006696 +editor.brackethighlight.color = #006698 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #565A5C -editor.scrollbar.thumb.rollover.color = #4D5153 -editor.scrollbar.thumb.pressed.color = #4D5153 -editor.scrollbar.color = #6C7071 +editor.scrollbar.thumb.enabled.color = #565A60 +editor.scrollbar.thumb.rollover.color = #4D5157 +editor.scrollbar.thumb.pressed.color = #4D5157 +editor.scrollbar.color = #6C7076 ## PdeTextAreaPainter - extras added to the editor ## @@ -147,70 +147,83 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #000009 # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #565A5C +editor.gutter.linehighlight.color = #565A60 # squiggly line underneath errors in the editor -editor.error.underline.color = #FF0000 +editor.error.underline.color = #FF002C # squiggly line underneath warnings -editor.warning.underline.color = #434649 +editor.warning.underline.color = #43464C ## MarkerColumn - shows ticks adjacent the scroll bar ## # lines next to the scrollbar showing where errors are located editor.column.error.color = #9C0000 -editor.column.warning.color = #FBFFFA +editor.column.warning.color = #FBFFFF ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 -errors.header.bgcolor = #191C1E -errors.header.fgcolor = #999B96 -errors.bgcolor = #393C3F +errors.header.bgcolor = #191C1F +errors.header.fgcolor = #999B9D +errors.bgcolor = #393C42 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #000000 -errors.row.bgcolor = #0091FF -errors.selection.fgcolor = #FFFFF2 -errors.selection.bgcolor = #434649 -errors.selection.error.bgcolor = #FFFFF2 -errors.selection.warning.bgcolor = #00A4FF -errors.indicator.error.color = #000000 -errors.indicator.warning.color = #0067DC +errors.row.fgcolor = #C7CACF +errors.row.bgcolor = #393C42 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #565A60 +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #00AFFF +errors.indicator.error.color = #C7CACF +errors.indicator.warning.color = #6E7178 ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #D9DCD7 -manager.tab.unselected.color = #969997 +manager.tab.selected.color = #D9DCE1 +manager.tab.unselected.color = #999BA1 manager.tab.text.font = processing.sans,bold,14 manager.tab.text.selected.color = #000000 -manager.tab.text.unselected.color = #474A4B -manager.tab.gradient.top = #76797A -manager.tab.gradient.bottom = #76797A +manager.tab.text.unselected.color = #494B50 +manager.tab.gradient.top = #5C6066 +manager.tab.gradient.bottom = #5C6066 ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #76797A +manager.tab.background = #5C6066 ## ContributionTab +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.list.search.placeholder.color = #6C6E73 +manager.list.search.background.color = #FFFFFE ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #D9DCD7 -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #656767 +manager.list.background.color = #D9DCE1 +manager.list.header.color = #CBCED3 +manager.list.section.color = #D9DCE1 +manager.list.selection.color = #589FEA manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.incompatible.selection.color = #BDC0C5 +manager.list.incompatible.text.color = #6C6E73 + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #AFB2B7 +manager.panel.text.color = #000000 +manager.panel.link.color = #0040BA ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #006696,plain -editor.token.function2.style = #006696,plain -editor.token.function3.style = #6D9800,plain -editor.token.function4.style = #006696,bold +editor.token.function1.style = #006698,plain +editor.token.function2.style = #006698,plain +editor.token.function3.style = #6D9810,plain +editor.token.function4.style = #006698,bold -editor.token.keyword1.style = #309879,plain -editor.token.keyword2.style = #309879,plain -editor.token.keyword3.style = #6D9800,plain -editor.token.keyword4.style = #DB4D6E,plain -editor.token.keyword5.style = #E76700,plain -editor.token.keyword6.style = #309879,plain +editor.token.keyword1.style = #30987F,plain +editor.token.keyword2.style = #30987F,plain +editor.token.keyword3.style = #6D9810,plain +editor.token.keyword4.style = #DB4D7A,plain +editor.token.keyword5.style = #E7671C,plain +editor.token.keyword6.style = #30987F,plain -editor.token.literal1.style = #738A5B,plain -editor.token.literal2.style = #75488D,plain +editor.token.literal1.style = #738A63,plain +editor.token.literal2.style = #754891,plain -editor.token.operator.style = #006696,plain +editor.token.operator.style = #006698,plain -editor.token.label.style = #656560,bold +editor.token.label.style = #656565,bold -editor.token.comment1.style = #656560,plain -editor.token.comment2.style = #656560,plain +editor.token.comment1.style = #656565,plain +editor.token.comment2.style = #656565,plain -editor.token.invalid.style = #656560,bold +editor.token.invalid.style = #656565,bold diff --git a/build/shared/lib/themes/garnet.txt b/build/shared/lib/themes/garnet.txt index 7f0853322..d59c54001 100644 --- a/build/shared/lib/themes/garnet.txt +++ b/build/shared/lib/themes/garnet.txt @@ -6,31 +6,31 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 -toolbar.rollover.color = #FFFFF2 -toolbar.gradient.top = #88272C -toolbar.gradient.bottom = #88272C +toolbar.rollover.color = #FFFFFE +toolbar.gradient.top = #882737 +toolbar.gradient.bottom = #882737 # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 -mode.title.color = #FF938C +mode.title.color = #FF939B # stolen from gradient bottom -mode.background.color = #88272C -mode.outline.color = #E27772 +mode.background.color = #882737 +mode.outline.color = #E27780 -toolbar.button.disabled.field = #9F3C3E -toolbar.button.disabled.glyph = #88272C +toolbar.button.disabled.field = #9F3C49 +toolbar.button.disabled.glyph = #882737 toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #FF9490 -toolbar.button.enabled.glyph = #89001B +toolbar.button.enabled.field = #FF94A3 +toolbar.button.enabled.glyph = #89002A toolbar.button.enabled.stroke = none -toolbar.button.pressed.field = #600000 -toolbar.button.pressed.glyph = #FFA7A4 -toolbar.button.pressed.stroke = #FFA7A4 -toolbar.button.rollover.field = #FFA7A4 -toolbar.button.rollover.glyph = #89001B +toolbar.button.pressed.field = #60000C +toolbar.button.pressed.glyph = #FFA7BA +toolbar.button.pressed.stroke = #FFA7BA +toolbar.button.rollover.field = #FFA7BA +toolbar.button.rollover.glyph = #89002A toolbar.button.rollover.stroke = none -toolbar.button.selected.field = #FFFFF2 -toolbar.button.selected.glyph = #D7000F +toolbar.button.selected.field = #FFFFFE +toolbar.button.selected.glyph = #D70034 toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -53,11 +53,11 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## status.notice.fgcolor = #570000 -status.notice.bgcolor = #D25052 -status.error.fgcolor = #8A0000 -status.error.bgcolor = #FFFFF2 -status.warning.bgcolor = #FF9490 -status.warning.fgcolor = #7D0000 +status.notice.bgcolor = #D25061 +status.error.fgcolor = #8A0011 +status.error.bgcolor = #FFFFFE +status.warning.bgcolor = #FF94A3 +status.warning.fgcolor = #7D0004 status.url.fgcolor = #000000 status.font = processing.sans,plain,13 # For the clipboard icon, needs to be a little larger on macOS @@ -68,63 +68,63 @@ status.emoji.font.macosx = Dialog,plain,22 ## EditorHeader - the tab area above the editor ## header.text.font = processing.sans,bold,14 -header.text.selected.color = #FF9B98 -header.text.unselected.color = #AA6C66 -header.tab.arrow.color = #AA6C66 +header.text.selected.color = #FF9BAC +header.text.unselected.color = #AA6C6F +header.tab.arrow.color = #AA6C6F header.tab.selected.color = #380000 -header.tab.unselected.color = #541116 -header.tab.modified.color = #FFFFF2 -header.gradient.top = #88272C -header.gradient.bottom = #88272C +header.tab.unselected.color = #54111D +header.tab.modified.color = #FFFFFE +header.gradient.top = #882737 +header.gradient.bottom = #882737 ## EditorFooter - the tabs below the editor ## footer.text.font = processing.sans,bold,12 -footer.text.selected.color = #FFFFF2 -footer.text.enabled.color = #FF938C -footer.icon.selected.color = #FFFFF2 -footer.icon.enabled.color = #FF938C -footer.gradient.top = #88272C -footer.gradient.bottom = #88272C -footer.tab.selected.color = #B95452 -footer.tab.enabled.color = #88272C -footer.updates.text.color = #FFFFF2 +footer.text.selected.color = #FFFFFE +footer.text.enabled.color = #FF939B +footer.icon.selected.color = #FFFFFE +footer.icon.enabled.color = #FF939B +footer.gradient.top = #882737 +footer.gradient.bottom = #882737 +footer.tab.selected.color = #B9545E +footer.tab.enabled.color = #882737 +footer.updates.text.color = #FFFFFE footer.updates.indicator.field.color = #370000 -footer.updates.indicator.text.color = #FFDFD3 +footer.updates.indicator.text.color = #FFDFE5 ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #2A1D1B -console.output.color = #AB9A91 +console.color = #2A1D1E +console.output.color = #AB9A9A # text color for errors printed in the console -console.error.color = #FF2F60 +console.error.color = #FF2F81 -console.scrollbar.thumb.enabled.color = #5C4D49 +console.scrollbar.thumb.enabled.color = #5C4D4E console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #251816 +console.scrollbar.color = #251819 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors -editor.fgcolor = #FFFFF2 +editor.fgcolor = #FFFFFE editor.bgcolor = #000000 -editor.gradient.top = #88272C -editor.gradient.bottom = #88272C +editor.gradient.top = #882737 +editor.gradient.bottom = #882737 # highlight for the current line -editor.linehighlight.color = #490B10 +editor.linehighlight.color = #490B17 # highlight for the current line editor.linehighlight=true -editor.caret.color = #FFFFF2 +editor.caret.color = #FFFFFE # also used by EditorHeader -editor.selection.color = #6C1A1F +editor.selection.color = #6C1A28 # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,85 +132,98 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #E391B9 +editor.brackethighlight.color = #E391C3 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #B95452 -editor.scrollbar.thumb.rollover.color = #AB4747 -editor.scrollbar.thumb.pressed.color = #AB4747 -editor.scrollbar.color = #973537 +editor.scrollbar.thumb.enabled.color = #B9545E +editor.scrollbar.thumb.rollover.color = #AB4753 +editor.scrollbar.thumb.pressed.color = #AB4753 +editor.scrollbar.color = #973542 ## PdeTextAreaPainter - extras added to the editor ## editor.gutter.text.font = processing.mono,plain,11 -editor.gutter.text.color = #FFDFD3 +editor.gutter.text.color = #FFDFE5 # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #B95452 +editor.gutter.linehighlight.color = #B9545E # squiggly line underneath errors in the editor -editor.error.underline.color = #FFFFF2 +editor.error.underline.color = #FFFFFE # squiggly line underneath warnings -editor.warning.underline.color = #FF9490 +editor.warning.underline.color = #FF94A3 ## MarkerColumn - shows ticks adjacent the scroll bar ## # lines next to the scrollbar showing where errors are located -editor.column.error.color = #FFFFF2 -editor.column.warning.color = #D16865 +editor.column.error.color = #FFFFFE +editor.column.warning.color = #D16872 ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 errors.header.bgcolor = #380000 -errors.header.fgcolor = #B68D85 -errors.bgcolor = #5B000A +errors.header.fgcolor = #B68D8E +errors.bgcolor = #5B0016 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #FFFFF2 -errors.row.bgcolor = #CB0022 -errors.selection.fgcolor = #000000 -errors.selection.bgcolor = #FF9490 -errors.selection.error.bgcolor = #000000 -errors.selection.warning.bgcolor = #BA0D2C -errors.indicator.error.color = #FFFFF2 -errors.indicator.warning.color = #FF384D +errors.row.fgcolor = #FFADB1 +errors.row.bgcolor = #5B0016 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #CD3953 +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #FF7E92 +errors.indicator.error.color = #FFADB1 +errors.indicator.warning.color = #A3404C ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #380000 -manager.tab.unselected.color = #681E21 +manager.tab.selected.color = #882737 +manager.tab.unselected.color = #520819 manager.tab.text.font = processing.sans,bold,14 -manager.tab.text.selected.color = #FFFFF2 -manager.tab.text.unselected.color = #D37D77 -manager.tab.gradient.top = #88272C -manager.tab.gradient.bottom = #88272C +manager.tab.text.selected.color = #FFFFFE +manager.tab.text.unselected.color = #C77379 +manager.tab.gradient.top = #380000 +manager.tab.gradient.bottom = #380000 ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #88272C +manager.tab.background = #380000 ## ContributionTab -manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + +manager.list.search.text.color = #FFFFFE +manager.list.search.placeholder.color = #E97E87 +manager.list.search.background.color = #000000 ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #380000 -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #B66963 -manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.background.color = #882737 +manager.list.header.color = #963542 +manager.list.section.color = #882737 +manager.list.selection.color = #FF6C7E +manager.list.text.color = #FFFFFE +manager.list.incompatible.selection.color = #A5424E +manager.list.incompatible.text.color = #E97E87 + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #B34E5A +manager.panel.text.color = #FFFFFE +manager.panel.link.color = #FFC3D5 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #E391B9,plain -editor.token.function2.style = #E391B9,plain +editor.token.function1.style = #E391C3,plain +editor.token.function2.style = #E391C3,plain editor.token.function3.style = #8E6FFF,plain -editor.token.function4.style = #E391B9,bold +editor.token.function4.style = #E391C3,bold -editor.token.keyword1.style = #B813BB,plain -editor.token.keyword2.style = #B813BB,plain +editor.token.keyword1.style = #B813C0,plain +editor.token.keyword2.style = #B813C0,plain editor.token.keyword3.style = #8E6FFF,plain -editor.token.keyword4.style = #0094E2,plain -editor.token.keyword5.style = #00D0DB,plain -editor.token.keyword6.style = #B813BB,plain +editor.token.keyword4.style = #0094E3,plain +editor.token.keyword5.style = #00D0DE,plain +editor.token.keyword6.style = #B813C0,plain -editor.token.literal1.style = #C84C4E,plain +editor.token.literal1.style = #C84C5D,plain editor.token.literal2.style = #D10000,plain -editor.token.operator.style = #E391B9,plain +editor.token.operator.style = #E391C3,plain -editor.token.label.style = #5E5E59,bold +editor.token.label.style = #5E5E5E,bold -editor.token.comment1.style = #5E5E59,plain -editor.token.comment2.style = #5E5E59,plain +editor.token.comment1.style = #5E5E5E,plain +editor.token.comment2.style = #5E5E5E,plain -editor.token.invalid.style = #5E5E59,bold +editor.token.invalid.style = #5E5E5E,bold diff --git a/build/shared/lib/themes/jasper.txt b/build/shared/lib/themes/jasper.txt index ec2dabf35..e42dd44c7 100644 --- a/build/shared/lib/themes/jasper.txt +++ b/build/shared/lib/themes/jasper.txt @@ -7,30 +7,30 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 toolbar.rollover.color = #000000 -toolbar.gradient.top = #D8432A -toolbar.gradient.bottom = #D8432A +toolbar.gradient.top = #D84344 +toolbar.gradient.bottom = #D84344 # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 mode.title.color = #7A0000 # stolen from gradient bottom -mode.background.color = #D8432A -mode.outline.color = #910000 +mode.background.color = #D84344 +mode.outline.color = #910013 -toolbar.button.disabled.field = #BF2B13 -toolbar.button.disabled.glyph = #A70700 +toolbar.button.disabled.field = #BF2B32 +toolbar.button.disabled.glyph = #A70721 toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #FFFFF2 -toolbar.button.enabled.glyph = #AF321E +toolbar.button.enabled.field = #FFFFFE +toolbar.button.enabled.glyph = #AF3234 toolbar.button.enabled.stroke = none -toolbar.button.pressed.field = #901100 -toolbar.button.pressed.glyph = #FFFFF2 -toolbar.button.pressed.stroke = #FFFFF2 -toolbar.button.rollover.field = #FFFFF2 +toolbar.button.pressed.field = #90111E +toolbar.button.pressed.glyph = #FFFFFE +toolbar.button.pressed.stroke = #FFFFFE +toolbar.button.rollover.field = #FFFFFE toolbar.button.rollover.glyph = #620000 toolbar.button.rollover.stroke = none toolbar.button.selected.field = #620000 -toolbar.button.selected.glyph = #FFFFF2 +toolbar.button.selected.glyph = #FFFFFE toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## -status.notice.fgcolor = #FF9870 -status.notice.bgcolor = #BA0000 -status.error.fgcolor = #FF7D57 +status.notice.fgcolor = #FF9890 +status.notice.bgcolor = #BA0017 +status.error.fgcolor = #FF7D7A status.error.bgcolor = #000000 status.warning.bgcolor = #790000 -status.warning.fgcolor = #FFA281 -status.url.fgcolor = #FFFFF2 +status.warning.fgcolor = #FFA298 +status.url.fgcolor = #FFFFFE status.font = processing.sans,plain,13 # For the clipboard icon, needs to be a little larger on macOS status.emoji.font = Dialog,plain,22 @@ -69,13 +69,13 @@ status.emoji.font.macosx = Dialog,plain,22 header.text.font = processing.sans,bold,14 header.text.selected.color = #730000 -header.text.unselected.color = #8C3929 -header.tab.arrow.color = #8C3929 -header.tab.selected.color = #FFBA9B -header.tab.unselected.color = #FF9176 +header.text.unselected.color = #8C3936 +header.tab.arrow.color = #8C3936 +header.tab.selected.color = #FFBAAF +header.tab.unselected.color = #FF9188 header.tab.modified.color = #000000 -header.gradient.top = #D8432A -header.gradient.bottom = #D8432A +header.gradient.top = #D84344 +header.gradient.bottom = #D84344 ## EditorFooter - the tabs below the editor ## @@ -85,46 +85,46 @@ footer.text.selected.color = #000000 footer.text.enabled.color = #7A0000 footer.icon.selected.color = #000000 footer.icon.enabled.color = #7A0000 -footer.gradient.top = #D8432A -footer.gradient.bottom = #D8432A -footer.tab.selected.color = #B11901 -footer.tab.enabled.color = #D8432A +footer.gradient.top = #D84344 +footer.gradient.bottom = #D84344 +footer.tab.selected.color = #B11928 +footer.tab.enabled.color = #D84344 footer.updates.text.color = #000000 -footer.updates.indicator.field.color = #FFCEA8 +footer.updates.indicator.field.color = #FFCEC2 footer.updates.indicator.text.color = #460000 ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #231612 -console.output.color = #A8968B +console.color = #231615 +console.output.color = #A89694 # text color for errors printed in the console -console.error.color = #FF2A00 +console.error.color = #FF2A55 -console.scrollbar.thumb.enabled.color = #574740 +console.scrollbar.thumb.enabled.color = #574745 console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #20120E +console.scrollbar.color = #201210 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors editor.fgcolor = #000000 -editor.bgcolor = #FFFFF2 +editor.bgcolor = #FFFFFE -editor.gradient.top = #D8432A -editor.gradient.bottom = #D8432A +editor.gradient.top = #D84344 +editor.gradient.bottom = #D84344 # highlight for the current line -editor.linehighlight.color = #FFE7D5 +editor.linehighlight.color = #FFE7E3 # highlight for the current line editor.linehighlight=true editor.caret.color = #000000 # also used by EditorHeader -editor.selection.color = #F5CAB8 +editor.selection.color = #F5CAC5 # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #006696 +editor.brackethighlight.color = #006698 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #B11901 -editor.scrollbar.thumb.rollover.color = #A50300 -editor.scrollbar.thumb.pressed.color = #A50300 -editor.scrollbar.color = #CC3820 +editor.scrollbar.thumb.enabled.color = #B11928 +editor.scrollbar.thumb.rollover.color = #A50320 +editor.scrollbar.thumb.pressed.color = #A50320 +editor.scrollbar.color = #CC383C ## PdeTextAreaPainter - extras added to the editor ## @@ -147,7 +147,7 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #460000 # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #B11901 +editor.gutter.linehighlight.color = #B11928 # squiggly line underneath errors in the editor editor.error.underline.color = #000000 @@ -159,58 +159,71 @@ editor.warning.underline.color = #790000 # lines next to the scrollbar showing where errors are located editor.column.error.color = #000000 -editor.column.warning.color = #FFCEA8 +editor.column.warning.color = #FFCEC2 ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 errors.header.bgcolor = #4F0000 -errors.header.fgcolor = #C78C7A -errors.bgcolor = #890000 +errors.header.fgcolor = #C78C86 +errors.bgcolor = #89000E errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #000000 -errors.row.bgcolor = #FF310F -errors.selection.fgcolor = #FFFFF2 -errors.selection.bgcolor = #790000 -errors.selection.error.bgcolor = #FFFFF2 -errors.selection.warning.bgcolor = #F54E32 -errors.indicator.error.color = #000000 -errors.indicator.warning.color = #CC0000 +errors.row.fgcolor = #FFA89E +errors.row.bgcolor = #89000E +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #B11928 +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #FF6F6B +errors.indicator.error.color = #FFA89E +errors.indicator.warning.color = #CF3A3D ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #FFBA9B -manager.tab.unselected.color = #EE745A +manager.tab.selected.color = #FFBAAF +manager.tab.unselected.color = #ED7972 manager.tab.text.font = processing.sans,bold,14 manager.tab.text.selected.color = #000000 -manager.tab.text.unselected.color = #8F1E0C -manager.tab.gradient.top = #D8432A -manager.tab.gradient.bottom = #D8432A +manager.tab.text.unselected.color = #8C2527 +manager.tab.gradient.top = #B9232D +manager.tab.gradient.bottom = #B9232D ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #D8432A +manager.tab.background = #B9232D ## ContributionTab +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.list.search.placeholder.color = #B74B47 +manager.list.search.background.color = #FFFFFE ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #FFBA9B -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #AF4430 +manager.list.background.color = #FFBAAF +manager.list.header.color = #FFACA1 +manager.list.section.color = #FFBAAF +manager.list.selection.color = #EE7871 manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.incompatible.selection.color = #FF9E94 +manager.list.incompatible.text.color = #B74B47 + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #FF9087 +manager.panel.text.color = #000000 +manager.panel.link.color = #9B0000 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #006696,plain -editor.token.function2.style = #006696,plain -editor.token.function3.style = #6D9800,plain -editor.token.function4.style = #006696,bold +editor.token.function1.style = #006698,plain +editor.token.function2.style = #006698,plain +editor.token.function3.style = #6D9810,plain +editor.token.function4.style = #006698,bold -editor.token.keyword1.style = #309879,plain -editor.token.keyword2.style = #309879,plain -editor.token.keyword3.style = #6D9800,plain -editor.token.keyword4.style = #DB4D6E,plain -editor.token.keyword5.style = #E76700,plain -editor.token.keyword6.style = #309879,plain +editor.token.keyword1.style = #30987F,plain +editor.token.keyword2.style = #30987F,plain +editor.token.keyword3.style = #6D9810,plain +editor.token.keyword4.style = #DB4D7A,plain +editor.token.keyword5.style = #E7671C,plain +editor.token.keyword6.style = #30987F,plain -editor.token.literal1.style = #738A5B,plain -editor.token.literal2.style = #75488D,plain +editor.token.literal1.style = #738A63,plain +editor.token.literal2.style = #754891,plain -editor.token.operator.style = #006696,plain +editor.token.operator.style = #006698,plain -editor.token.label.style = #656560,bold +editor.token.label.style = #656565,bold -editor.token.comment1.style = #656560,plain -editor.token.comment2.style = #656560,plain +editor.token.comment1.style = #656565,plain +editor.token.comment2.style = #656565,plain -editor.token.invalid.style = #656560,bold +editor.token.invalid.style = #656565,bold diff --git a/build/shared/lib/themes/kyanite.txt b/build/shared/lib/themes/kyanite.txt index 60c8f5e47..cc6aa0850 100644 --- a/build/shared/lib/themes/kyanite.txt +++ b/build/shared/lib/themes/kyanite.txt @@ -7,30 +7,30 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 toolbar.rollover.color = #000000 -toolbar.gradient.top = #6BA0C7 -toolbar.gradient.bottom = #6BA0C7 +toolbar.gradient.top = #6BA0CC +toolbar.gradient.bottom = #6BA0CC # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 -mode.title.color = #004165 +mode.title.color = #004166 # stolen from gradient bottom -mode.background.color = #6BA0C7 -mode.outline.color = #13577C +mode.background.color = #6BA0CC +mode.outline.color = #13577F -toolbar.button.disabled.field = #558BB2 -toolbar.button.disabled.glyph = #3E769D +toolbar.button.disabled.field = #558BB6 +toolbar.button.disabled.glyph = #3E76A0 toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #FFFFF2 -toolbar.button.enabled.glyph = #0088F4 +toolbar.button.enabled.field = #FFFFFE +toolbar.button.enabled.glyph = #0088F6 toolbar.button.enabled.stroke = none -toolbar.button.pressed.field = #0068CF -toolbar.button.pressed.glyph = #FFFFF2 -toolbar.button.pressed.stroke = #FFFFF2 -toolbar.button.rollover.field = #FFFFF2 +toolbar.button.pressed.field = #0068D1 +toolbar.button.pressed.glyph = #FFFFFE +toolbar.button.pressed.stroke = #FFFFFE +toolbar.button.rollover.field = #FFFFFE toolbar.button.rollover.glyph = #002E7A toolbar.button.rollover.stroke = none toolbar.button.selected.field = #002E7A -toolbar.button.selected.glyph = #FFFFF2 +toolbar.button.selected.glyph = #FFFFFE toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -53,12 +53,12 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## status.notice.fgcolor = #A1E6FF -status.notice.bgcolor = #0870A1 -status.error.fgcolor = #FFFFF2 -status.error.bgcolor = #BF0000 -status.warning.bgcolor = #003774 +status.notice.bgcolor = #0870A3 +status.error.fgcolor = #FFFFFE +status.error.bgcolor = #BF0019 +status.warning.bgcolor = #003775 status.warning.fgcolor = #00DFFF -status.url.fgcolor = #FFFFF2 +status.url.fgcolor = #FFFFFE status.font = processing.sans,plain,13 # For the clipboard icon, needs to be a little larger on macOS status.emoji.font = Dialog,plain,22 @@ -68,27 +68,27 @@ status.emoji.font.macosx = Dialog,plain,22 ## EditorHeader - the tab area above the editor ## header.text.font = processing.sans,bold,14 -header.text.selected.color = #002F71 -header.text.unselected.color = #516C81 -header.tab.arrow.color = #516C81 +header.text.selected.color = #002F72 +header.text.unselected.color = #516C85 +header.tab.arrow.color = #516C85 header.tab.selected.color = #C4E9FF -header.tab.unselected.color = #A6CAE6 +header.tab.unselected.color = #A6CAED header.tab.modified.color = #000000 -header.gradient.top = #6BA0C7 -header.gradient.bottom = #6BA0C7 +header.gradient.top = #6BA0CC +header.gradient.bottom = #6BA0CC ## EditorFooter - the tabs below the editor ## footer.text.font = processing.sans,bold,12 footer.text.selected.color = #000000 -footer.text.enabled.color = #004165 +footer.text.enabled.color = #004166 footer.icon.selected.color = #000000 -footer.icon.enabled.color = #004165 -footer.gradient.top = #6BA0C7 -footer.gradient.bottom = #6BA0C7 -footer.tab.selected.color = #3E769D -footer.tab.enabled.color = #6BA0C7 +footer.icon.enabled.color = #004166 +footer.gradient.top = #6BA0CC +footer.gradient.bottom = #6BA0CC +footer.tab.selected.color = #3E76A0 +footer.tab.enabled.color = #6BA0CC footer.updates.text.color = #000000 footer.updates.indicator.field.color = #D1FFFF footer.updates.indicator.text.color = #00072B @@ -97,25 +97,25 @@ footer.updates.indicator.text.color = #00072B ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #171F25 -console.output.color = #949DA0 +console.color = #171F27 +console.output.color = #949DA7 # text color for errors printed in the console console.error.color = #00CFFF -console.scrollbar.thumb.enabled.color = #475055 +console.scrollbar.thumb.enabled.color = #475059 console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #121A21 +console.scrollbar.color = #121A22 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors editor.fgcolor = #000000 -editor.bgcolor = #FFFFF2 +editor.bgcolor = #FFFFFE -editor.gradient.top = #6BA0C7 -editor.gradient.bottom = #6BA0C7 +editor.gradient.top = #6BA0CC +editor.gradient.bottom = #6BA0CC # highlight for the current line editor.linehighlight.color = #DEF3FF @@ -124,7 +124,7 @@ editor.linehighlight=true editor.caret.color = #000000 # also used by EditorHeader -editor.selection.color = #BFD7E6 +editor.selection.color = #BFD7EF # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #006696 +editor.brackethighlight.color = #006698 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #3E769D -editor.scrollbar.thumb.rollover.color = #306B90 -editor.scrollbar.thumb.pressed.color = #306B90 -editor.scrollbar.color = #5E93BA +editor.scrollbar.thumb.enabled.color = #3E76A0 +editor.scrollbar.thumb.rollover.color = #306B93 +editor.scrollbar.thumb.pressed.color = #306B93 +editor.scrollbar.color = #5E93BF ## PdeTextAreaPainter - extras added to the editor ## @@ -147,12 +147,12 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #00072B # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #3E769D +editor.gutter.linehighlight.color = #3E76A0 # squiggly line underneath errors in the editor -editor.error.underline.color = #FF0000 +editor.error.underline.color = #FF002C # squiggly line underneath warnings -editor.warning.underline.color = #003774 +editor.warning.underline.color = #003775 ## MarkerColumn - shows ticks adjacent the scroll bar ## @@ -165,52 +165,65 @@ editor.column.warning.color = #D1FFFF ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 -errors.header.bgcolor = #00243D -errors.header.fgcolor = #8F9FA9 -errors.bgcolor = #005074 +errors.header.bgcolor = #00243E +errors.header.fgcolor = #8F9FB0 +errors.bgcolor = #005076 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #000000 -errors.row.bgcolor = #00B7FF -errors.selection.fgcolor = #FFFFF2 -errors.selection.bgcolor = #003774 -errors.selection.error.bgcolor = #FFFFF2 -errors.selection.warning.bgcolor = #009CFD -errors.indicator.error.color = #000000 -errors.indicator.warning.color = #0081F3 +errors.row.fgcolor = #AED2F5 +errors.row.bgcolor = #005076 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #3E76A0 +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #00C3FF +errors.indicator.error.color = #AED2F5 +errors.indicator.warning.color = #4B82AC ## ManagerTabs - tabs in the Contribution Manager ## manager.tab.selected.color = #C4E9FF -manager.tab.unselected.color = #90B7D5 +manager.tab.unselected.color = #8DB2D3 manager.tab.text.font = processing.sans,bold,14 manager.tab.text.selected.color = #000000 -manager.tab.text.unselected.color = #2F5976 -manager.tab.gradient.top = #6BA0C7 -manager.tab.gradient.bottom = #6BA0C7 +manager.tab.text.unselected.color = #305774 +manager.tab.gradient.top = #477FA9 +manager.tab.gradient.bottom = #477FA9 ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #6BA0C7 +manager.tab.background = #477FA9 ## ContributionTab +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.list.search.placeholder.color = #527796 +manager.list.search.background.color = #FFFFFE ## ListPanel – the listing inside a Contribution Manager tab ## manager.list.background.color = #C4E9FF -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #4A6F8A +manager.list.header.color = #B6DBFE +manager.list.section.color = #C4E9FF +manager.list.selection.color = #39B7FF manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.incompatible.selection.color = #A8CDEF +manager.list.incompatible.text.color = #527796 + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #9BBFE1 +manager.panel.text.color = #000000 +manager.panel.link.color = #0048BF ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #006696,plain -editor.token.function2.style = #006696,plain -editor.token.function3.style = #6D9800,plain -editor.token.function4.style = #006696,bold +editor.token.function1.style = #006698,plain +editor.token.function2.style = #006698,plain +editor.token.function3.style = #6D9810,plain +editor.token.function4.style = #006698,bold -editor.token.keyword1.style = #309879,plain -editor.token.keyword2.style = #309879,plain -editor.token.keyword3.style = #6D9800,plain -editor.token.keyword4.style = #DB4D6E,plain -editor.token.keyword5.style = #E76700,plain -editor.token.keyword6.style = #309879,plain +editor.token.keyword1.style = #30987F,plain +editor.token.keyword2.style = #30987F,plain +editor.token.keyword3.style = #6D9810,plain +editor.token.keyword4.style = #DB4D7A,plain +editor.token.keyword5.style = #E7671C,plain +editor.token.keyword6.style = #30987F,plain -editor.token.literal1.style = #738A5B,plain -editor.token.literal2.style = #75488D,plain +editor.token.literal1.style = #738A63,plain +editor.token.literal2.style = #754891,plain -editor.token.operator.style = #006696,plain +editor.token.operator.style = #006698,plain -editor.token.label.style = #656560,bold +editor.token.label.style = #656565,bold -editor.token.comment1.style = #656560,plain -editor.token.comment2.style = #656560,plain +editor.token.comment1.style = #656565,plain +editor.token.comment2.style = #656565,plain -editor.token.invalid.style = #656560,bold +editor.token.invalid.style = #656565,bold diff --git a/build/shared/lib/themes/malachite.txt b/build/shared/lib/themes/malachite.txt index 9136dadfa..c48fca7bb 100644 --- a/build/shared/lib/themes/malachite.txt +++ b/build/shared/lib/themes/malachite.txt @@ -6,31 +6,31 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 -toolbar.rollover.color = #FFFFF2 -toolbar.gradient.top = #243028 -toolbar.gradient.bottom = #243028 +toolbar.rollover.color = #FFFFFE +toolbar.gradient.top = #24302B +toolbar.gradient.bottom = #24302B # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 -mode.title.color = #98A898 +mode.title.color = #98A8A0 # stolen from gradient bottom -mode.background.color = #243028 -mode.outline.color = #79887A +mode.background.color = #24302B +mode.outline.color = #798881 -toolbar.button.disabled.field = #354239 -toolbar.button.disabled.glyph = #243028 +toolbar.button.disabled.field = #35423C +toolbar.button.disabled.glyph = #24302B toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #17AD6A -toolbar.button.enabled.glyph = #00301D +toolbar.button.enabled.field = #17AD71 +toolbar.button.enabled.glyph = #00301F toolbar.button.enabled.stroke = none -toolbar.button.pressed.field = #001F0C -toolbar.button.pressed.glyph = #33E590 -toolbar.button.pressed.stroke = #33E590 -toolbar.button.rollover.field = #33E590 -toolbar.button.rollover.glyph = #00301D +toolbar.button.pressed.field = #001F0D +toolbar.button.pressed.glyph = #33E599 +toolbar.button.pressed.stroke = #33E599 +toolbar.button.rollover.field = #33E599 +toolbar.button.rollover.glyph = #00301F toolbar.button.rollover.stroke = none -toolbar.button.selected.field = #FFFFF2 -toolbar.button.selected.glyph = #005E0B +toolbar.button.selected.field = #FFFFFE +toolbar.button.selected.glyph = #005E10 toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -52,11 +52,11 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## -status.notice.fgcolor = #CEE3CF -status.notice.bgcolor = #586A5C +status.notice.fgcolor = #CEE3D9 +status.notice.bgcolor = #586A61 status.error.fgcolor = #004100 -status.error.bgcolor = #FFFFF2 -status.warning.bgcolor = #17AD6A +status.error.bgcolor = #FFFFFE +status.warning.bgcolor = #17AD71 status.warning.fgcolor = #003100 status.url.fgcolor = #000000 status.font = processing.sans,plain,13 @@ -68,63 +68,63 @@ status.emoji.font.macosx = Dialog,plain,22 ## EditorHeader - the tab area above the editor ## header.text.font = processing.sans,bold,14 -header.text.selected.color = #23C379 -header.text.unselected.color = #5F685E -header.tab.arrow.color = #5F685E -header.tab.selected.color = #011008 -header.tab.unselected.color = #151E18 -header.tab.modified.color = #FFFFF2 -header.gradient.top = #243028 -header.gradient.bottom = #243028 +header.text.selected.color = #23C381 +header.text.unselected.color = #5F6864 +header.tab.arrow.color = #5F6864 +header.tab.selected.color = #011009 +header.tab.unselected.color = #151E1A +header.tab.modified.color = #FFFFFE +header.gradient.top = #24302B +header.gradient.bottom = #24302B ## EditorFooter - the tabs below the editor ## footer.text.font = processing.sans,bold,12 -footer.text.selected.color = #FFFFF2 -footer.text.enabled.color = #98A898 -footer.icon.selected.color = #FFFFF2 -footer.icon.enabled.color = #98A898 -footer.gradient.top = #243028 -footer.gradient.bottom = #243028 -footer.tab.selected.color = #515F54 -footer.tab.enabled.color = #243028 -footer.updates.text.color = #FFFFF2 +footer.text.selected.color = #FFFFFE +footer.text.enabled.color = #98A8A0 +footer.icon.selected.color = #FFFFFE +footer.icon.enabled.color = #98A8A0 +footer.gradient.top = #24302B +footer.gradient.bottom = #24302B +footer.tab.selected.color = #515F58 +footer.tab.enabled.color = #24302B +footer.updates.text.color = #FFFFFE footer.updates.indicator.field.color = #000500 -footer.updates.indicator.text.color = #F2FFEE +footer.updates.indicator.text.color = #F2FFFA ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #0C1912 -console.output.color = #8D9B8D +console.color = #0C1913 +console.output.color = #8D9B95 # text color for errors printed in the console -console.error.color = #00DE5C +console.error.color = #00DE64 -console.scrollbar.thumb.enabled.color = #3E4B41 +console.scrollbar.thumb.enabled.color = #3E4B45 console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #07160E +console.scrollbar.color = #071610 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors -editor.fgcolor = #FFFFF2 +editor.fgcolor = #FFFFFE editor.bgcolor = #000000 -editor.gradient.top = #243028 -editor.gradient.bottom = #243028 +editor.gradient.top = #24302B +editor.gradient.bottom = #24302B # highlight for the current line -editor.linehighlight.color = #00240A +editor.linehighlight.color = #00240C # highlight for the current line editor.linehighlight=true -editor.caret.color = #FFFFF2 +editor.caret.color = #FFFFFE # also used by EditorHeader -editor.selection.color = #003C1A +editor.selection.color = #003C1D # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,85 +132,98 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #00BFD3 +editor.brackethighlight.color = #00BFD8 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #515F54 -editor.scrollbar.thumb.rollover.color = #48564B -editor.scrollbar.thumb.pressed.color = #48564B -editor.scrollbar.color = #313E35 +editor.scrollbar.thumb.enabled.color = #515F58 +editor.scrollbar.thumb.rollover.color = #48564F +editor.scrollbar.thumb.pressed.color = #48564F +editor.scrollbar.color = #313E38 ## PdeTextAreaPainter - extras added to the editor ## editor.gutter.text.font = processing.mono,plain,11 -editor.gutter.text.color = #F2FFEE +editor.gutter.text.color = #F2FFFA # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #515F54 +editor.gutter.linehighlight.color = #515F58 # squiggly line underneath errors in the editor -editor.error.underline.color = #FFFFF2 +editor.error.underline.color = #FFFFFE # squiggly line underneath warnings -editor.warning.underline.color = #17AD6A +editor.warning.underline.color = #17AD71 ## MarkerColumn - shows ticks adjacent the scroll bar ## # lines next to the scrollbar showing where errors are located -editor.column.error.color = #FFFFF2 -editor.column.warning.color = #5C6B5F +editor.column.error.color = #FFFFFE +editor.column.warning.color = #5C6B64 ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 -errors.header.bgcolor = #011008 -errors.header.fgcolor = #90958B -errors.bgcolor = #101D15 +errors.header.bgcolor = #011009 +errors.header.fgcolor = #909593 +errors.bgcolor = #101D17 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #FFFFF2 -errors.row.bgcolor = #005804 -errors.selection.fgcolor = #000000 -errors.selection.bgcolor = #17AD6A -errors.selection.error.bgcolor = #000000 -errors.selection.warning.bgcolor = #005C18 -errors.indicator.error.color = #FFFFF2 -errors.indicator.warning.color = #009138 +errors.row.fgcolor = #B5C2BC +errors.row.bgcolor = #101D17 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #006631 +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #00C073 +errors.indicator.error.color = #B5C2BC +errors.indicator.warning.color = #4B5952 ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #011008 -manager.tab.unselected.color = #1C261F +manager.tab.selected.color = #24302B +manager.tab.unselected.color = #121C18 manager.tab.text.font = processing.sans,bold,14 -manager.tab.text.selected.color = #FFFFF2 -manager.tab.text.unselected.color = #7F8B7F -manager.tab.gradient.top = #243028 -manager.tab.gradient.bottom = #243028 +manager.tab.text.selected.color = #FFFFFE +manager.tab.text.unselected.color = #798580 +manager.tab.gradient.top = #011009 +manager.tab.gradient.bottom = #011009 ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #243028 +manager.tab.background = #011009 ## ContributionTab -manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + +manager.list.search.text.color = #FFFFFE +manager.list.search.placeholder.color = #7E8D86 +manager.list.search.background.color = #000000 ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #011008 -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #737E72 -manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.background.color = #24302B +manager.list.header.color = #2E3C35 +manager.list.section.color = #24302B +manager.list.selection.color = #008950 +manager.list.text.color = #FFFFFE +manager.list.incompatible.selection.color = #394741 +manager.list.incompatible.text.color = #7E8D86 + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #45534C +manager.panel.text.color = #FFFFFE +manager.panel.link.color = #40F5A6 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #00BFD3,plain -editor.token.function2.style = #00BFD3,plain +editor.token.function1.style = #00BFD8,plain +editor.token.function2.style = #00BFD8,plain editor.token.function3.style = #00A8FF,plain -editor.token.function4.style = #00BFD3,bold +editor.token.function4.style = #00BFD8,bold -editor.token.keyword1.style = #008BEB,plain -editor.token.keyword2.style = #008BEB,plain +editor.token.keyword1.style = #008BEC,plain +editor.token.keyword2.style = #008BEC,plain editor.token.keyword3.style = #00A8FF,plain -editor.token.keyword4.style = #BA43BA,plain -editor.token.keyword5.style = #FF4894,plain -editor.token.keyword6.style = #008BEB,plain +editor.token.keyword4.style = #BA43C0,plain +editor.token.keyword5.style = #FF48A6,plain +editor.token.keyword6.style = #008BEC,plain -editor.token.literal1.style = #008A53,plain +editor.token.literal1.style = #008A58,plain editor.token.literal2.style = #006C58,plain -editor.token.operator.style = #00BFD3,plain +editor.token.operator.style = #00BFD8,plain -editor.token.label.style = #5E5E59,bold +editor.token.label.style = #5E5E5E,bold -editor.token.comment1.style = #5E5E59,plain -editor.token.comment2.style = #5E5E59,plain +editor.token.comment1.style = #5E5E5E,plain +editor.token.comment2.style = #5E5E5E,plain -editor.token.invalid.style = #5E5E59,bold +editor.token.invalid.style = #5E5E5E,bold diff --git a/build/shared/lib/themes/olivine.txt b/build/shared/lib/themes/olivine.txt index b4055ac8d..ceb960581 100644 --- a/build/shared/lib/themes/olivine.txt +++ b/build/shared/lib/themes/olivine.txt @@ -7,30 +7,30 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 toolbar.rollover.color = #000000 -toolbar.gradient.top = #94AC2C -toolbar.gradient.bottom = #94AC2C +toolbar.gradient.top = #94AC43 +toolbar.gradient.bottom = #94AC43 # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 mode.title.color = #2C4700 # stolen from gradient bottom -mode.background.color = #94AC2C +mode.background.color = #94AC43 mode.outline.color = #445F00 -toolbar.button.disabled.field = #7E9710 -toolbar.button.disabled.glyph = #698200 +toolbar.button.disabled.field = #7E972E +toolbar.button.disabled.glyph = #698217 toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #FFFFF2 -toolbar.button.enabled.glyph = #728811 +toolbar.button.enabled.field = #FFFFFE +toolbar.button.enabled.glyph = #72882A toolbar.button.enabled.stroke = none -toolbar.button.pressed.field = #4F6600 -toolbar.button.pressed.glyph = #FFFFF2 -toolbar.button.pressed.stroke = #FFFFF2 -toolbar.button.rollover.field = #FFFFF2 +toolbar.button.pressed.field = #4F6601 +toolbar.button.pressed.glyph = #FFFFFE +toolbar.button.pressed.stroke = #FFFFFE +toolbar.button.rollover.field = #FFFFFE toolbar.button.rollover.glyph = #193300 toolbar.button.rollover.stroke = none toolbar.button.selected.field = #193300 -toolbar.button.selected.glyph = #FFFFF2 +toolbar.button.selected.glyph = #FFFFFE toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## -status.notice.fgcolor = #CDED44 +status.notice.fgcolor = #CDED62 status.notice.bgcolor = #567A00 -status.error.fgcolor = #AAD500 +status.error.fgcolor = #AAD518 status.error.bgcolor = #000000 status.warning.bgcolor = #1B3900 -status.warning.fgcolor = #C4DB5D -status.url.fgcolor = #FFFFF2 +status.warning.fgcolor = #C4DB71 +status.url.fgcolor = #FFFFFE status.font = processing.sans,plain,13 # For the clipboard icon, needs to be a little larger on macOS status.emoji.font = Dialog,plain,22 @@ -69,13 +69,13 @@ status.emoji.font.macosx = Dialog,plain,22 header.text.font = processing.sans,bold,14 header.text.selected.color = #1A3000 -header.text.unselected.color = #687430 -header.tab.arrow.color = #687430 -header.tab.selected.color = #DFEF8D -header.tab.unselected.color = #C3D373 +header.text.unselected.color = #68743B +header.tab.arrow.color = #68743B +header.tab.selected.color = #DFEF9E +header.tab.unselected.color = #C3D383 header.tab.modified.color = #000000 -header.gradient.top = #94AC2C -header.gradient.bottom = #94AC2C +header.gradient.top = #94AC43 +header.gradient.bottom = #94AC43 ## EditorFooter - the tabs below the editor ## @@ -85,46 +85,46 @@ footer.text.selected.color = #000000 footer.text.enabled.color = #2C4700 footer.icon.selected.color = #000000 footer.icon.enabled.color = #2C4700 -footer.gradient.top = #94AC2C -footer.gradient.bottom = #94AC2C -footer.tab.selected.color = #678000 -footer.tab.enabled.color = #94AC2C +footer.gradient.top = #94AC43 +footer.gradient.bottom = #94AC43 +footer.tab.selected.color = #678015 +footer.tab.enabled.color = #94AC43 footer.updates.text.color = #000000 -footer.updates.indicator.field.color = #F2FF85 +footer.updates.indicator.field.color = #F2FF9A footer.updates.indicator.text.color = #000D00 ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #1E2014 -console.output.color = #9C9E89 +console.color = #1E2016 +console.output.color = #9C9E91 # text color for errors printed in the console console.error.color = #87CC00 -console.scrollbar.thumb.enabled.color = #4F5141 +console.scrollbar.thumb.enabled.color = #4F5145 console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #1A1B0F +console.scrollbar.color = #1A1B11 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors editor.fgcolor = #000000 -editor.bgcolor = #FFFFF2 +editor.bgcolor = #FFFFFE -editor.gradient.top = #94AC2C -editor.gradient.bottom = #94AC2C +editor.gradient.top = #94AC43 +editor.gradient.bottom = #94AC43 # highlight for the current line -editor.linehighlight.color = #EEF3CB +editor.linehighlight.color = #EEF3D7 # highlight for the current line editor.linehighlight=true editor.caret.color = #000000 # also used by EditorHeader -editor.selection.color = #D2D7AD +editor.selection.color = #D2D7B9 # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #006696 +editor.brackethighlight.color = #006698 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #678000 -editor.scrollbar.thumb.rollover.color = #5A7400 -editor.scrollbar.thumb.pressed.color = #5A7400 -editor.scrollbar.color = #869F1C +editor.scrollbar.thumb.enabled.color = #678015 +editor.scrollbar.thumb.rollover.color = #5A7401 +editor.scrollbar.thumb.pressed.color = #5A7401 +editor.scrollbar.color = #869F36 ## PdeTextAreaPainter - extras added to the editor ## @@ -147,7 +147,7 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #000D00 # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #678000 +editor.gutter.linehighlight.color = #678015 # squiggly line underneath errors in the editor editor.error.underline.color = #000000 @@ -159,58 +159,71 @@ editor.warning.underline.color = #1B3900 # lines next to the scrollbar showing where errors are located editor.column.error.color = #000000 -editor.column.warning.color = #F2FF85 +editor.column.warning.color = #F2FF9A ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 errors.header.bgcolor = #1C2700 -errors.header.fgcolor = #9BA272 +errors.header.fgcolor = #9BA27C errors.bgcolor = #3B5700 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #000000 -errors.row.bgcolor = #90BD00 -errors.selection.fgcolor = #FFFFF2 -errors.selection.bgcolor = #1B3900 -errors.selection.error.bgcolor = #FFFFF2 -errors.selection.warning.bgcolor = #799C00 -errors.indicator.error.color = #000000 -errors.indicator.warning.color = #538400 +errors.row.fgcolor = #C7D787 +errors.row.bgcolor = #3B5700 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #678015 +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #224500 +errors.indicator.error.color = #C7D787 +errors.indicator.warning.color = #6F891F ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #DFEF8D -manager.tab.unselected.color = #AFC15D +manager.tab.selected.color = #DFEF9E +manager.tab.unselected.color = #A9B96C manager.tab.text.font = processing.sans,bold,14 manager.tab.text.selected.color = #000000 -manager.tab.text.unselected.color = #4C5F00 -manager.tab.gradient.top = #94AC2C -manager.tab.gradient.bottom = #94AC2C +manager.tab.text.unselected.color = #4A5C12 +manager.tab.gradient.top = #70891F +manager.tab.gradient.bottom = #70891F ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #94AC2C +manager.tab.background = #70891F ## ContributionTab +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.list.search.placeholder.color = #6A7B31 +manager.list.search.background.color = #FFFFFE ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #DFEF8D -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #627319 +manager.list.background.color = #DFEF9E +manager.list.header.color = #D0E190 +manager.list.section.color = #DFEF9E +manager.list.selection.color = #A6BB5E manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.incompatible.selection.color = #C2D383 +manager.list.incompatible.text.color = #6A7B31 + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #B4C576 +manager.panel.text.color = #000000 +manager.panel.link.color = #164200 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #006696,plain -editor.token.function2.style = #006696,plain -editor.token.function3.style = #6D9800,plain -editor.token.function4.style = #006696,bold +editor.token.function1.style = #006698,plain +editor.token.function2.style = #006698,plain +editor.token.function3.style = #6D9810,plain +editor.token.function4.style = #006698,bold -editor.token.keyword1.style = #309879,plain -editor.token.keyword2.style = #309879,plain -editor.token.keyword3.style = #6D9800,plain -editor.token.keyword4.style = #DB4D6E,plain -editor.token.keyword5.style = #E76700,plain -editor.token.keyword6.style = #309879,plain +editor.token.keyword1.style = #30987F,plain +editor.token.keyword2.style = #30987F,plain +editor.token.keyword3.style = #6D9810,plain +editor.token.keyword4.style = #DB4D7A,plain +editor.token.keyword5.style = #E7671C,plain +editor.token.keyword6.style = #30987F,plain -editor.token.literal1.style = #738A5B,plain -editor.token.literal2.style = #75488D,plain +editor.token.literal1.style = #738A63,plain +editor.token.literal2.style = #754891,plain -editor.token.operator.style = #006696,plain +editor.token.operator.style = #006698,plain -editor.token.label.style = #656560,bold +editor.token.label.style = #656565,bold -editor.token.comment1.style = #656560,plain -editor.token.comment2.style = #656560,plain +editor.token.comment1.style = #656565,plain +editor.token.comment2.style = #656565,plain -editor.token.invalid.style = #656560,bold +editor.token.invalid.style = #656565,bold diff --git a/build/shared/lib/themes/orpiment.txt b/build/shared/lib/themes/orpiment.txt index e006f00b5..070e21b54 100644 --- a/build/shared/lib/themes/orpiment.txt +++ b/build/shared/lib/themes/orpiment.txt @@ -7,30 +7,30 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 toolbar.rollover.color = #000000 -toolbar.gradient.top = #FFCC3A -toolbar.gradient.bottom = #FFCC3A +toolbar.gradient.top = #FFCC5F +toolbar.gradient.bottom = #FFCC5F # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 mode.title.color = #6C4900 # stolen from gradient bottom -mode.background.color = #FFCC3A +mode.background.color = #FFCC5F mode.outline.color = #906800 -toolbar.button.disabled.field = #EAB61B -toolbar.button.disabled.glyph = #D1A000 +toolbar.button.disabled.field = #EAB64A +toolbar.button.disabled.glyph = #D1A034 toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #FFFFF2 -toolbar.button.enabled.glyph = #CB9F25 +toolbar.button.enabled.field = #FFFFFE +toolbar.button.enabled.glyph = #D69A3C toolbar.button.enabled.stroke = none -toolbar.button.pressed.field = #997300 -toolbar.button.pressed.glyph = #FFFFF2 -toolbar.button.pressed.stroke = #FFFFF2 -toolbar.button.rollover.field = #FFFFF2 -toolbar.button.rollover.glyph = #784800 +toolbar.button.pressed.field = #A46E09 +toolbar.button.pressed.glyph = #FFFFFE +toolbar.button.pressed.stroke = #FFFFFE +toolbar.button.rollover.field = #FFFFFE +toolbar.button.rollover.glyph = #873F00 toolbar.button.rollover.stroke = none -toolbar.button.selected.field = #784800 -toolbar.button.selected.glyph = #FFFFF2 +toolbar.button.selected.field = #873F00 +toolbar.button.selected.glyph = #FFFFFE toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -54,11 +54,11 @@ toolbar.button.debug.selected.stroke = none status.notice.fgcolor = #401600 status.notice.bgcolor = #BA8600 -status.error.fgcolor = #FABC00 +status.error.fgcolor = #FFB628 status.error.bgcolor = #000000 -status.warning.bgcolor = #5B3400 -status.warning.fgcolor = #FFCC4B -status.url.fgcolor = #FFFFF2 +status.warning.bgcolor = #A56200 +status.warning.fgcolor = #FFD46C +status.url.fgcolor = #FFFFFE status.font = processing.sans,plain,13 # For the clipboard icon, needs to be a little larger on macOS status.emoji.font = Dialog,plain,22 @@ -68,14 +68,14 @@ status.emoji.font.macosx = Dialog,plain,22 ## EditorHeader - the tab area above the editor ## header.text.font = processing.sans,bold,14 -header.text.selected.color = #502900 -header.text.unselected.color = #AA8A3E -header.tab.arrow.color = #AA8A3E -header.tab.selected.color = #FFED85 -header.tab.unselected.color = #FFE079 +header.text.selected.color = #8A4B00 +header.text.unselected.color = #AA8A4F +header.tab.arrow.color = #AA8A4F +header.tab.selected.color = #FFED9C +header.tab.unselected.color = #FFE090 header.tab.modified.color = #000000 -header.gradient.top = #FFCC3A -header.gradient.bottom = #FFCC3A +header.gradient.top = #FFCC5F +header.gradient.bottom = #FFCC5F ## EditorFooter - the tabs below the editor ## @@ -85,46 +85,46 @@ footer.text.selected.color = #000000 footer.text.enabled.color = #6C4900 footer.icon.selected.color = #000000 footer.icon.enabled.color = #6C4900 -footer.gradient.top = #FFCC3A -footer.gradient.bottom = #FFCC3A -footer.tab.selected.color = #C29200 -footer.tab.enabled.color = #FFCC3A +footer.gradient.top = #FFCC5F +footer.gradient.bottom = #FFCC5F +footer.tab.selected.color = #C29225 +footer.tab.enabled.color = #FFCC5F footer.updates.text.color = #000000 -footer.updates.indicator.field.color = #FFF666 +footer.updates.indicator.field.color = #FFF688 footer.updates.indicator.text.color = #2D0000 ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #2A251A -console.output.color = #A79F8C +console.color = #49433A +console.output.color = #B5AEA3 # text color for errors printed in the console -console.error.color = #F2AC00 +console.error.color = #FFA300 -console.scrollbar.thumb.enabled.color = #5B5446 +console.scrollbar.thumb.enabled.color = #746D63 console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #241F14 +console.scrollbar.color = #3C362D ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors editor.fgcolor = #000000 -editor.bgcolor = #FFFFF2 +editor.bgcolor = #FFFFFE -editor.gradient.top = #FFCC3A -editor.gradient.bottom = #FFCC3A +editor.gradient.top = #FFCC5F +editor.gradient.bottom = #FFCC5F # highlight for the current line -editor.linehighlight.color = #FEEECA +editor.linehighlight.color = #FFEDD8 # highlight for the current line editor.linehighlight=true editor.caret.color = #000000 # also used by EditorHeader -editor.selection.color = #E2D2AC +editor.selection.color = #E6D1B9 # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #006696 +editor.brackethighlight.color = #006698 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #C29200 -editor.scrollbar.thumb.rollover.color = #AF8200 -editor.scrollbar.thumb.pressed.color = #AF8200 -editor.scrollbar.color = #EFBA22 +editor.scrollbar.thumb.enabled.color = #C29225 +editor.scrollbar.thumb.rollover.color = #AF820F +editor.scrollbar.thumb.pressed.color = #AF820F +editor.scrollbar.color = #EFBA4E ## PdeTextAreaPainter - extras added to the editor ## @@ -147,70 +147,83 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #2D0000 # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #C29200 +editor.gutter.linehighlight.color = #C29225 # squiggly line underneath errors in the editor editor.error.underline.color = #000000 # squiggly line underneath warnings -editor.warning.underline.color = #5B3400 +editor.warning.underline.color = #A56200 ## MarkerColumn - shows ticks adjacent the scroll bar ## # lines next to the scrollbar showing where errors are located editor.column.error.color = #000000 -editor.column.warning.color = #FFF666 +editor.column.warning.color = #FFF688 ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 errors.header.bgcolor = #3F2500 -errors.header.fgcolor = #B69F6E +errors.header.fgcolor = #B69F7A errors.bgcolor = #845D00 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #000000 -errors.row.bgcolor = #FFCF00 -errors.selection.fgcolor = #FFFFF2 -errors.selection.bgcolor = #5B3400 -errors.selection.error.bgcolor = #FFFFF2 -errors.selection.warning.bgcolor = #C08F00 -errors.indicator.error.color = #000000 -errors.indicator.warning.color = #BE8900 +errors.row.fgcolor = #FCCF80 +errors.row.bgcolor = #845D00 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #C29225 +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #684400 +errors.indicator.error.color = #FCCF80 +errors.indicator.warning.color = #B68818 ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #FFED85 -manager.tab.unselected.color = #FFD86A +manager.tab.selected.color = #FFED9C +manager.tab.unselected.color = #F1C677 manager.tab.text.font = processing.sans,bold,14 manager.tab.text.selected.color = #000000 -manager.tab.text.unselected.color = #856300 -manager.tab.gradient.top = #FFCC3A -manager.tab.gradient.bottom = #FFCC3A +manager.tab.text.unselected.color = #7B5B0D +manager.tab.gradient.top = #CE9E31 +manager.tab.gradient.bottom = #CE9E31 ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #FFCC3A +manager.tab.background = #CE9E31 ## ContributionTab +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.list.search.placeholder.color = #99752A +manager.list.search.background.color = #FFFFFE ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #FFED85 -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #8F6C00 +manager.list.background.color = #FFED9C +manager.list.header.color = #FFDF8F +manager.list.section.color = #FFED9C +manager.list.selection.color = #FAC277 manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.incompatible.selection.color = #FDD182 +manager.list.incompatible.text.color = #99752A + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #EEC375 +manager.panel.text.color = #000000 +manager.panel.link.color = #662900 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #006696,plain -editor.token.function2.style = #006696,plain -editor.token.function3.style = #6D9800,plain -editor.token.function4.style = #006696,bold +editor.token.function1.style = #006698,plain +editor.token.function2.style = #006698,plain +editor.token.function3.style = #6D9810,plain +editor.token.function4.style = #006698,bold -editor.token.keyword1.style = #309879,plain -editor.token.keyword2.style = #309879,plain -editor.token.keyword3.style = #6D9800,plain -editor.token.keyword4.style = #DB4D6E,plain -editor.token.keyword5.style = #E76700,plain -editor.token.keyword6.style = #309879,plain +editor.token.keyword1.style = #30987F,plain +editor.token.keyword2.style = #30987F,plain +editor.token.keyword3.style = #6D9810,plain +editor.token.keyword4.style = #DB4D7A,plain +editor.token.keyword5.style = #E7671C,plain +editor.token.keyword6.style = #30987F,plain -editor.token.literal1.style = #738A5B,plain -editor.token.literal2.style = #75488D,plain +editor.token.literal1.style = #738A63,plain +editor.token.literal2.style = #754891,plain -editor.token.operator.style = #006696,plain +editor.token.operator.style = #006698,plain -editor.token.label.style = #656560,bold +editor.token.label.style = #656565,bold -editor.token.comment1.style = #656560,plain -editor.token.comment2.style = #656560,plain +editor.token.comment1.style = #656565,plain +editor.token.comment2.style = #656565,plain -editor.token.invalid.style = #656560,bold +editor.token.invalid.style = #656565,bold diff --git a/build/shared/lib/themes/pyrite.txt b/build/shared/lib/themes/pyrite.txt index 40cc89b72..b4ed0b523 100644 --- a/build/shared/lib/themes/pyrite.txt +++ b/build/shared/lib/themes/pyrite.txt @@ -6,31 +6,31 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 -toolbar.rollover.color = #FFFFF2 -toolbar.gradient.top = #00474E -toolbar.gradient.bottom = #00474E +toolbar.rollover.color = #FFFFFE +toolbar.gradient.top = #004750 +toolbar.gradient.bottom = #004750 # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 -mode.title.color = #77B7BA +mode.title.color = #77B7C0 # stolen from gradient bottom -mode.background.color = #00474E -mode.outline.color = #5A9A9D +mode.background.color = #004750 +mode.outline.color = #5A9AA2 -toolbar.button.disabled.field = #125A60 -toolbar.button.disabled.glyph = #00474E +toolbar.button.disabled.field = #125A63 +toolbar.button.disabled.glyph = #004750 toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #99915B -toolbar.button.enabled.glyph = #004453 +toolbar.button.enabled.field = #999166 +toolbar.button.enabled.glyph = #004454 toolbar.button.enabled.stroke = none -toolbar.button.pressed.field = #002938 -toolbar.button.pressed.glyph = #D3C76F -toolbar.button.pressed.stroke = #D3C76F -toolbar.button.rollover.field = #D3C76F -toolbar.button.rollover.glyph = #004453 +toolbar.button.pressed.field = #002939 +toolbar.button.pressed.glyph = #D3C780 +toolbar.button.pressed.stroke = #D3C780 +toolbar.button.rollover.field = #D3C780 +toolbar.button.rollover.glyph = #004454 toolbar.button.rollover.stroke = none -toolbar.button.selected.field = #FFFFF2 -toolbar.button.selected.glyph = #4C4800 +toolbar.button.selected.field = #FFFFFE +toolbar.button.selected.glyph = #4C4806 toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -52,11 +52,11 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## -status.notice.fgcolor = #9BEFF2 -status.notice.bgcolor = #217F87 +status.notice.fgcolor = #9BEFFB +status.notice.bgcolor = #217F8A status.error.fgcolor = #383300 -status.error.bgcolor = #FFFFF2 -status.warning.bgcolor = #99915B +status.error.bgcolor = #FFFFFE +status.warning.bgcolor = #999166 status.warning.fgcolor = #2A2000 status.url.fgcolor = #000000 status.font = processing.sans,plain,13 @@ -68,63 +68,63 @@ status.emoji.font.macosx = Dialog,plain,22 ## EditorHeader - the tab area above the editor ## header.text.font = processing.sans,bold,14 -header.text.selected.color = #B0A663 -header.text.unselected.color = #57797A -header.tab.arrow.color = #57797A +header.text.selected.color = #B0A670 +header.text.unselected.color = #57797E +header.tab.arrow.color = #57797E header.tab.selected.color = #00181C -header.tab.unselected.color = #002A2F -header.tab.modified.color = #FFFFF2 -header.gradient.top = #00474E -header.gradient.bottom = #00474E +header.tab.unselected.color = #002A30 +header.tab.modified.color = #FFFFFE +header.gradient.top = #004750 +header.gradient.bottom = #004750 ## EditorFooter - the tabs below the editor ## footer.text.font = processing.sans,bold,12 -footer.text.selected.color = #FFFFF2 -footer.text.enabled.color = #77B7BA -footer.icon.selected.color = #FFFFF2 -footer.icon.enabled.color = #77B7BA -footer.gradient.top = #00474E -footer.gradient.bottom = #00474E -footer.tab.selected.color = #327479 -footer.tab.enabled.color = #00474E -footer.updates.text.color = #FFFFF2 -footer.updates.indicator.field.color = #000E16 +footer.text.selected.color = #FFFFFE +footer.text.enabled.color = #77B7C0 +footer.icon.selected.color = #FFFFFE +footer.icon.enabled.color = #77B7C0 +footer.gradient.top = #004750 +footer.gradient.bottom = #004750 +footer.tab.selected.color = #32747C +footer.tab.enabled.color = #004750 +footer.updates.text.color = #FFFFFE +footer.updates.indicator.field.color = #000E15 footer.updates.indicator.text.color = #C9FFFF ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #0E1F20 -console.output.color = #8B9F9B +console.color = #0E1F22 +console.output.color = #8B9FA2 # text color for errors printed in the console console.error.color = #C3BE00 -console.scrollbar.thumb.enabled.color = #3E5150 +console.scrollbar.thumb.enabled.color = #3E5153 console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #091B1C +console.scrollbar.color = #091B1D ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors -editor.fgcolor = #FFFFF2 +editor.fgcolor = #FFFFFE editor.bgcolor = #000000 -editor.gradient.top = #00474E -editor.gradient.bottom = #00474E +editor.gradient.top = #004750 +editor.gradient.bottom = #004750 # highlight for the current line -editor.linehighlight.color = #24210B +editor.linehighlight.color = #24210F # highlight for the current line editor.linehighlight=true -editor.caret.color = #FFFFF2 +editor.caret.color = #FFFFFE # also used by EditorHeader -editor.selection.color = #3A361A +editor.selection.color = #3A361F # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #99A6EA +editor.brackethighlight.color = #99A6F0 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #327479 -editor.scrollbar.thumb.rollover.color = #25686E -editor.scrollbar.thumb.pressed.color = #25686E -editor.scrollbar.color = #06545A +editor.scrollbar.thumb.enabled.color = #32747C +editor.scrollbar.thumb.rollover.color = #256871 +editor.scrollbar.thumb.pressed.color = #256871 +editor.scrollbar.color = #06545D ## PdeTextAreaPainter - extras added to the editor ## @@ -147,70 +147,83 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #C9FFFF # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #327479 +editor.gutter.linehighlight.color = #32747C # squiggly line underneath errors in the editor -editor.error.underline.color = #FFFFF2 +editor.error.underline.color = #FFFFFE # squiggly line underneath warnings -editor.warning.underline.color = #99915B +editor.warning.underline.color = #999166 ## MarkerColumn - shows ticks adjacent the scroll bar ## # lines next to the scrollbar showing where errors are located -editor.column.error.color = #FFFFF2 -editor.column.warning.color = #458589 +editor.column.error.color = #FFFFFE +editor.column.warning.color = #45858E ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 errors.header.bgcolor = #00181C -errors.header.fgcolor = #859A96 -errors.bgcolor = #002930 +errors.header.fgcolor = #859A9D +errors.bgcolor = #002931 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #FFFFF2 -errors.row.bgcolor = #595800 -errors.selection.fgcolor = #000000 -errors.selection.bgcolor = #99915B -errors.selection.error.bgcolor = #000000 -errors.selection.warning.bgcolor = #4B4900 -errors.indicator.error.color = #FFFFF2 -errors.indicator.warning.color = #8C8800 +errors.row.fgcolor = #9BC9D0 +errors.row.bgcolor = #002931 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #5D572F +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #B3A926 +errors.indicator.error.color = #9BC9D0 +errors.indicator.warning.color = #21656E ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #00181C -manager.tab.unselected.color = #00373B +manager.tab.selected.color = #004750 +manager.tab.unselected.color = #00282E manager.tab.text.font = processing.sans,bold,14 -manager.tab.text.selected.color = #FFFFF2 -manager.tab.text.unselected.color = #68989A -manager.tab.gradient.top = #00474E -manager.tab.gradient.bottom = #00474E +manager.tab.text.selected.color = #FFFFFE +manager.tab.text.unselected.color = #5F9096 +manager.tab.gradient.top = #00181C +manager.tab.gradient.bottom = #00181C ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #00474E +manager.tab.background = #00181C ## ContributionTab -manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + +manager.list.search.text.color = #FFFFFE +manager.list.search.placeholder.color = #60A0A9 +manager.list.search.background.color = #000000 ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #00181C -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #588586 -manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.background.color = #004750 +manager.list.header.color = #04535B +manager.list.section.color = #004750 +manager.list.selection.color = #7F784E +manager.list.text.color = #FFFFFE +manager.list.incompatible.selection.color = #195F68 +manager.list.incompatible.text.color = #60A0A9 + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #296C74 +manager.panel.text.color = #FFFFFE +manager.panel.link.color = #ECDF92 ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #99A6EA,plain -editor.token.function2.style = #99A6EA,plain -editor.token.function3.style = #F133F3,plain -editor.token.function4.style = #99A6EA,bold +editor.token.function1.style = #99A6F0,plain +editor.token.function2.style = #99A6F0,plain +editor.token.function3.style = #F133FA,plain +editor.token.function4.style = #99A6F0,bold -editor.token.keyword1.style = #654FEA,plain -editor.token.keyword2.style = #654FEA,plain -editor.token.keyword3.style = #F133F3,plain -editor.token.keyword4.style = #DA3744,plain +editor.token.keyword1.style = #654FED,plain +editor.token.keyword2.style = #654FED,plain +editor.token.keyword3.style = #F133FA,plain +editor.token.keyword4.style = #DA3756,plain editor.token.keyword5.style = #FF7500,plain -editor.token.keyword6.style = #654FEA,plain +editor.token.keyword6.style = #654FED,plain -editor.token.literal1.style = #008B7E,plain +editor.token.literal1.style = #008B81,plain editor.token.literal2.style = #0071B9,plain -editor.token.operator.style = #99A6EA,plain +editor.token.operator.style = #99A6F0,plain -editor.token.label.style = #5E5E59,bold +editor.token.label.style = #5E5E5E,bold -editor.token.comment1.style = #5E5E59,plain -editor.token.comment2.style = #5E5E59,plain +editor.token.comment1.style = #5E5E5E,plain +editor.token.comment2.style = #5E5E5E,plain -editor.token.invalid.style = #5E5E59,bold +editor.token.invalid.style = #5E5E5E,bold diff --git a/build/shared/lib/themes/serandite.txt b/build/shared/lib/themes/serandite.txt index 86f84241c..404a9348a 100644 --- a/build/shared/lib/themes/serandite.txt +++ b/build/shared/lib/themes/serandite.txt @@ -7,30 +7,30 @@ # TOOLBAR BUTTON TEXT toolbar.rollover.font = processing.sans,plain,12 toolbar.rollover.color = #000000 -toolbar.gradient.top = #EC6800 -toolbar.gradient.bottom = #EC6800 +toolbar.gradient.top = #EC6831 +toolbar.gradient.bottom = #EC6831 # MODE SELECTOR (EditorToolbar) mode.title.font = processing.sans,plain,12 mode.title.color = #7D0000 # stolen from gradient bottom -mode.background.color = #EC6800 +mode.background.color = #EC6831 mode.outline.color = #971E00 -toolbar.button.disabled.field = #D25300 -toolbar.button.disabled.glyph = #B93D00 +toolbar.button.disabled.field = #D2531C +toolbar.button.disabled.glyph = #B93D04 toolbar.button.disabled.stroke = none -toolbar.button.enabled.field = #FFFFF2 -toolbar.button.enabled.glyph = #C7377C +toolbar.button.enabled.field = #FFFFFE +toolbar.button.enabled.glyph = #C73785 toolbar.button.enabled.stroke = none -toolbar.button.pressed.field = #A40360 -toolbar.button.pressed.glyph = #FFFFF2 -toolbar.button.pressed.stroke = #FFFFF2 -toolbar.button.rollover.field = #FFFFF2 -toolbar.button.rollover.glyph = #480022 +toolbar.button.pressed.field = #A40367 +toolbar.button.pressed.glyph = #FFFFFE +toolbar.button.pressed.stroke = #FFFFFE +toolbar.button.rollover.field = #FFFFFE +toolbar.button.rollover.glyph = #480026 toolbar.button.rollover.stroke = none -toolbar.button.selected.field = #480022 -toolbar.button.selected.glyph = #FFFFF2 +toolbar.button.selected.field = #480026 +toolbar.button.selected.glyph = #FFFFFE toolbar.button.selected.stroke = none toolbar.button.debug.disabled.field = #000009 @@ -52,13 +52,13 @@ toolbar.button.debug.selected.stroke = none ## EditorStatus - status message bar directly below the editor ## -status.notice.fgcolor = #FFA900 +status.notice.fgcolor = #FFA95E status.notice.bgcolor = #C22000 -status.error.fgcolor = #FF83D3 +status.error.fgcolor = #FF83E1 status.error.bgcolor = #000000 -status.warning.bgcolor = #662140 -status.warning.fgcolor = #FFA7DB -status.url.fgcolor = #FFFFF2 +status.warning.bgcolor = #662145 +status.warning.fgcolor = #FFA7E8 +status.url.fgcolor = #FFFFFE status.font = processing.sans,plain,13 # For the clipboard icon, needs to be a little larger on macOS status.emoji.font = Dialog,plain,22 @@ -68,14 +68,14 @@ status.emoji.font.macosx = Dialog,plain,22 ## EditorHeader - the tab area above the editor ## header.text.font = processing.sans,bold,14 -header.text.selected.color = #5E0B36 -header.text.unselected.color = #994E19 -header.tab.arrow.color = #994E19 -header.tab.selected.color = #FFC67D -header.tab.unselected.color = #FFA45E +header.text.selected.color = #5E0B3B +header.text.unselected.color = #994E2E +header.tab.arrow.color = #994E2E +header.tab.selected.color = #FFC696 +header.tab.unselected.color = #FFA477 header.tab.modified.color = #000000 -header.gradient.top = #EC6800 -header.gradient.bottom = #EC6800 +header.gradient.top = #EC6831 +header.gradient.bottom = #EC6831 ## EditorFooter - the tabs below the editor ## @@ -85,46 +85,46 @@ footer.text.selected.color = #000000 footer.text.enabled.color = #7D0000 footer.icon.selected.color = #000000 footer.icon.enabled.color = #7D0000 -footer.gradient.top = #EC6800 -footer.gradient.bottom = #EC6800 -footer.tab.selected.color = #BC4000 -footer.tab.enabled.color = #EC6800 +footer.gradient.top = #EC6831 +footer.gradient.bottom = #EC6831 +footer.tab.selected.color = #BC4007 +footer.tab.enabled.color = #EC6831 footer.updates.text.color = #000000 -footer.updates.indicator.field.color = #FFD773 +footer.updates.indicator.field.color = #FFD797 footer.updates.indicator.text.color = #440000 ## EditorConsole - stack traces of doom and println() ## # The font is handled by preferences.txt, so its size/etc are modifiable. -console.color = #302219 -console.output.color = #AF9C8C +console.color = #30221C +console.output.color = #AF9C95 # text color for errors printed in the console -console.error.color = #FF3ECD +console.error.color = #FF3EDB -console.scrollbar.thumb.enabled.color = #625145 +console.scrollbar.thumb.enabled.color = #62514B console.scrollbar.thumb.rollover.color = #2F6A90 console.scrollbar.thumb.pressed.color = #2F6A90 -console.scrollbar.color = #291C13 +console.scrollbar.color = #291C17 ## PdeTextAreaDefaults - default colors for the editor ## # foreground and background colors editor.fgcolor = #000000 -editor.bgcolor = #FFFFF2 +editor.bgcolor = #FFFFFE -editor.gradient.top = #EC6800 -editor.gradient.bottom = #EC6800 +editor.gradient.top = #EC6831 +editor.gradient.bottom = #EC6831 # highlight for the current line -editor.linehighlight.color = #FFE8E8 +editor.linehighlight.color = #FFE8F5 # highlight for the current line editor.linehighlight=true editor.caret.color = #000000 # also used by EditorHeader -editor.selection.color = #EDCBCE +editor.selection.color = #EDCBD9 # little pooties at the end of lines that show where they finish editor.eolmarkers = false @@ -132,13 +132,13 @@ editor.eolmarkers.color = #999999 # bracket/brace highlighting editor.brackethighlight = true -editor.brackethighlight.color = #006696 +editor.brackethighlight.color = #006698 # colors for the custom scroll bar -editor.scrollbar.thumb.enabled.color = #BC4000 +editor.scrollbar.thumb.enabled.color = #BC4007 editor.scrollbar.thumb.rollover.color = #AE3400 editor.scrollbar.thumb.pressed.color = #AE3400 -editor.scrollbar.color = #DE5C00 +editor.scrollbar.color = #DE5C25 ## PdeTextAreaPainter - extras added to the editor ## @@ -147,70 +147,83 @@ editor.gutter.text.font = processing.mono,plain,11 editor.gutter.text.color = #440000 # bgcolor for the current (highlighted) line -editor.gutter.linehighlight.color = #BC4000 +editor.gutter.linehighlight.color = #BC4007 # squiggly line underneath errors in the editor editor.error.underline.color = #000000 # squiggly line underneath warnings -editor.warning.underline.color = #662140 +editor.warning.underline.color = #662145 ## MarkerColumn - shows ticks adjacent the scroll bar ## # lines next to the scrollbar showing where errors are located editor.column.error.color = #000000 -editor.column.warning.color = #FFD773 +editor.column.warning.color = #FFD797 ## ErrorTable - second tab below the console area, lists errors and warnings ## errors.header.font = processing.sans,plain,12 errors.header.bgcolor = #4F0000 -errors.header.fgcolor = #C7906D +errors.header.fgcolor = #C7907A errors.bgcolor = #8E1300 errors.row.font = processing.sans,plain,12 -errors.row.fgcolor = #000000 -errors.row.bgcolor = #FF55AB -errors.selection.fgcolor = #FFFFF2 -errors.selection.bgcolor = #662140 -errors.selection.error.bgcolor = #FFFFF2 -errors.selection.warning.bgcolor = #F461A1 -errors.indicator.error.color = #000000 -errors.indicator.warning.color = #D0007A +errors.row.fgcolor = #FFB183 +errors.row.bgcolor = #8E1300 +errors.selection.fgcolor = #FFFFFE +errors.selection.bgcolor = #BC4007 +errors.selection.error.bgcolor = #FFFFFE +errors.selection.warning.bgcolor = #FF803D +errors.indicator.error.color = #FFB183 +errors.indicator.warning.color = #CF501A ## ManagerTabs - tabs in the Contribution Manager ## -manager.tab.selected.color = #FFC67D -manager.tab.unselected.color = #FC8D42 +manager.tab.selected.color = #FFC696 +manager.tab.unselected.color = #F58C60 manager.tab.text.font = processing.sans,bold,14 manager.tab.text.selected.color = #000000 -manager.tab.text.unselected.color = #923200 -manager.tab.gradient.top = #EC6800 -manager.tab.gradient.bottom = #EC6800 +manager.tab.text.unselected.color = #8D340E +manager.tab.gradient.top = #C64811 +manager.tab.gradient.bottom = #C64811 ## ManagerFrame - main window for the Contribution Manager ## # same as manager.tab.gradient.top, because .bottom is between the tabs -manager.tab.background = #EC6800 +manager.tab.background = #C64811 ## ContributionTab +manager.scrollbar.thumb.enabled.color = #3E769D +manager.scrollbar.thumb.rollover.color = #2F6A90 +manager.scrollbar.thumb.pressed.color = #2F6A90 +manager.scrollbar.color = #5D93BA + manager.list.search.text.color = #000000 -manager.list.search.placeholder.color = #cccccc -manager.list.search.background.color = #ffffff +manager.list.search.placeholder.color = #B5562E +manager.list.search.background.color = #FFFFFE ## ListPanel – the listing inside a Contribution Manager tab ## -manager.list.background.color = #FFC67D -manager.list.header.color = #EBEBEB -manager.list.section.color = #f8f8f8 -manager.list.selection.color = #AC4E00 +manager.list.background.color = #FFC696 +manager.list.header.color = #FFB889 +manager.list.section.color = #FFC696 +manager.list.selection.color = #EF87B7 manager.list.text.color = #000000 -manager.list.incompatible.color = #CCCCCC +manager.list.incompatible.selection.color = #FFAA7C +manager.list.incompatible.text.color = #B5562E + + +## StatusPanel - the bottom panel with detail about a contribution + +manager.panel.background.color = #FF9C6F +manager.panel.text.color = #000000 +manager.panel.link.color = #95004E ## ZoomTreeCellRenderer - tree for Examples and Sketchbook windows ## @@ -223,26 +236,26 @@ tree.font = processing.sans,plain,12 # For an explanation of these tags, see Token.java: # processing/app/src/processing/app/syntax/Token.java -editor.token.function1.style = #006696,plain -editor.token.function2.style = #006696,plain -editor.token.function3.style = #6D9800,plain -editor.token.function4.style = #006696,bold +editor.token.function1.style = #006698,plain +editor.token.function2.style = #006698,plain +editor.token.function3.style = #6D9810,plain +editor.token.function4.style = #006698,bold -editor.token.keyword1.style = #309879,plain -editor.token.keyword2.style = #309879,plain -editor.token.keyword3.style = #6D9800,plain -editor.token.keyword4.style = #DB4D6E,plain -editor.token.keyword5.style = #E76700,plain -editor.token.keyword6.style = #309879,plain +editor.token.keyword1.style = #30987F,plain +editor.token.keyword2.style = #30987F,plain +editor.token.keyword3.style = #6D9810,plain +editor.token.keyword4.style = #DB4D7A,plain +editor.token.keyword5.style = #E7671C,plain +editor.token.keyword6.style = #30987F,plain -editor.token.literal1.style = #738A5B,plain -editor.token.literal2.style = #75488D,plain +editor.token.literal1.style = #738A63,plain +editor.token.literal2.style = #754891,plain -editor.token.operator.style = #006696,plain +editor.token.operator.style = #006698,plain -editor.token.label.style = #656560,bold +editor.token.label.style = #656565,bold -editor.token.comment1.style = #656560,plain -editor.token.comment2.style = #656560,plain +editor.token.comment1.style = #656565,plain +editor.token.comment2.style = #656565,plain -editor.token.invalid.style = #656560,bold +editor.token.invalid.style = #656565,bold