Merge remote-tracking branch

'origin/GP-5135_dragonmacher_PR-7193_gemesa_listing-highlight-color'
(Closes #7193)
This commit is contained in:
Ryan Kurtz 2024-11-15 13:22:50 -05:00
commit a9c2c6efc7
2 changed files with 3 additions and 5 deletions

View File

@ -821,7 +821,6 @@ src/main/resources/images/field.header.up.png||GHIDRA||||END|
src/main/resources/images/fingerPointer.png||GHIDRA||||END| src/main/resources/images/fingerPointer.png||GHIDRA||||END|
src/main/resources/images/flag-green.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/flag-green.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
src/main/resources/images/flag-yellow.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END| src/main/resources/images/flag-yellow.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
src/main/resources/images/folder-downloads-32.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
src/main/resources/images/format-text-bold.png||Tango Icons - Public Domain|||tango icon set|END| src/main/resources/images/format-text-bold.png||Tango Icons - Public Domain|||tango icon set|END|
src/main/resources/images/functionDef.png||GHIDRA||||END| src/main/resources/images/functionDef.png||GHIDRA||||END|
src/main/resources/images/function_graph.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END| src/main/resources/images/function_graph.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END|

View File

@ -115,9 +115,8 @@ font.listing.header = SansSerif-PLAIN-11
color.bg.highlight.listing.diff = #4D4D2A color.bg.highlight.listing.diff = #4D4D2A
// non-palette colors; these are currently ugly, but bright enough for easy scanning color.bg.listing.highlighter.default = #666600
color.bg.listing.highlighter.default = yellow color.bg.listing.highlighter.scoped.read = #996600
color.bg.listing.highlighter.scoped.read = darkorange color.bg.listing.highlighter.scoped.write = #009900
color.bg.listing.highlighter.scoped.write = lime