Rename purple theme color to magenta
This commit is contained in:
@@ -99,7 +99,7 @@ Exceptions are allowed for bootstrap, preflight, migration, and package-helper s
|
||||
|
||||
- `config/` - default configs copied to `~/.config/`
|
||||
- `default/themed/*.tpl` - templates with `{{ variable }}` placeholders for theme colors
|
||||
- `themes/*/colors.toml` - theme color definitions (accent, background, foreground, red/green/yellow/blue/purple/cyan and bright_* variants)
|
||||
- `themes/*/colors.toml` - theme color definitions (accent, background, foreground, red/green/yellow/blue/magenta/cyan and bright_* variants)
|
||||
|
||||
# Tests
|
||||
|
||||
|
||||
@@ -39,6 +39,7 @@ awk -F= '
|
||||
alias_color("color2", "green")
|
||||
alias_color("color3", "yellow")
|
||||
alias_color("color4", "blue")
|
||||
alias_color("color5", "magenta")
|
||||
alias_color("color5", "purple")
|
||||
alias_color("color6", "cyan")
|
||||
alias_color("color7", "fg")
|
||||
@@ -54,7 +55,9 @@ awk -F= '
|
||||
alias_color("color11", "yellow")
|
||||
alias_color("color12", "bright_blue")
|
||||
alias_color("color12", "blue")
|
||||
alias_color("color13", "bright_magenta")
|
||||
alias_color("color13", "bright_purple")
|
||||
alias_color("color13", "magenta")
|
||||
alias_color("color13", "purple")
|
||||
alias_color("color14", "bright_cyan")
|
||||
alias_color("color14", "cyan")
|
||||
|
||||
@@ -338,18 +338,20 @@ if [[ -f $COLORS_FILE ]]; then
|
||||
[green]=color2
|
||||
[yellow]=color3
|
||||
[blue]=color4
|
||||
[purple]=color5
|
||||
[magenta]=color5
|
||||
[cyan]=color6
|
||||
[bright_red]=color9
|
||||
[bright_green]=color10
|
||||
[bright_yellow]=color11
|
||||
[bright_blue]=color12
|
||||
[bright_purple]=color13
|
||||
[bright_magenta]=color13
|
||||
[bright_cyan]=color14
|
||||
)
|
||||
for key in "${!legacy_alias[@]}"; do
|
||||
alias_theme_color "$key" "${legacy_alias[$key]}"
|
||||
done
|
||||
alias_theme_color magenta purple
|
||||
alias_theme_color bright_magenta bright_purple
|
||||
|
||||
[[ ${THEME_COLORS[light_fg]} ]] || THEME_COLORS[light_fg]="${THEME_COLORS[color7]:-${THEME_COLORS[foreground]}}"
|
||||
[[ ${THEME_COLORS[bright_fg]} ]] || THEME_COLORS[bright_fg]="${THEME_COLORS[color15]:-${THEME_COLORS[foreground]}}"
|
||||
@@ -368,7 +370,9 @@ if [[ -f $COLORS_FILE ]]; then
|
||||
[[ ${THEME_COLORS[bright_green]} ]] || THEME_COLORS[bright_green]=$(mix_color "${THEME_COLORS[green]}" "#ffffff" 20%)
|
||||
[[ ${THEME_COLORS[bright_cyan]} ]] || THEME_COLORS[bright_cyan]=$(mix_color "${THEME_COLORS[cyan]}" "#ffffff" 20%)
|
||||
[[ ${THEME_COLORS[bright_blue]} ]] || THEME_COLORS[bright_blue]=$(mix_color "${THEME_COLORS[blue]}" "#ffffff" 20%)
|
||||
[[ ${THEME_COLORS[bright_purple]} ]] || THEME_COLORS[bright_purple]=$(mix_color "${THEME_COLORS[purple]}" "#ffffff" 20%)
|
||||
[[ ${THEME_COLORS[bright_magenta]} ]] || THEME_COLORS[bright_magenta]=$(mix_color "${THEME_COLORS[magenta]}" "#ffffff" 20%)
|
||||
alias_theme_color purple magenta
|
||||
alias_theme_color bright_purple bright_magenta
|
||||
|
||||
# Keep semantic themes compatible with user templates that still reference
|
||||
# the legacy ANSI placeholders directly.
|
||||
@@ -378,7 +382,7 @@ if [[ -f $COLORS_FILE ]]; then
|
||||
[color2]=green
|
||||
[color3]=yellow
|
||||
[color4]=blue
|
||||
[color5]=purple
|
||||
[color5]=magenta
|
||||
[color6]=cyan
|
||||
[color7]=fg
|
||||
[color8]=muted
|
||||
@@ -386,7 +390,7 @@ if [[ -f $COLORS_FILE ]]; then
|
||||
[color10]=bright_green
|
||||
[color11]=bright_yellow
|
||||
[color12]=bright_blue
|
||||
[color13]=bright_purple
|
||||
[color13]=bright_magenta
|
||||
[color14]=bright_cyan
|
||||
[color15]=bright_fg
|
||||
)
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
# color0-7: Normal colors (black, red, green, yellow, blue, magenta, cyan, white)
|
||||
# color8-15: Bright variants
|
||||
# Semantic aliases are also available: {{ bg }}, {{ fg }}, {{ red }}, {{ green }},
|
||||
# {{ yellow }}, {{ blue }}, {{ purple }}, {{ cyan }}, {{ muted }} and the
|
||||
# {{ yellow }}, {{ blue }}, {{ magenta }}, {{ cyan }}, {{ muted }} and the
|
||||
# {{ bright_* }} variants. The two forms are kept in sync by
|
||||
# bin/omarchy-theme-set-templates.
|
||||
#
|
||||
@@ -75,7 +75,7 @@ red = "{{ red }}"
|
||||
green = "{{ green }}"
|
||||
yellow = "{{ yellow }}"
|
||||
blue = "{{ blue }}"
|
||||
magenta = "{{ purple }}"
|
||||
magenta = "{{ magenta }}"
|
||||
cyan = "{{ cyan }}"
|
||||
white = "{{ fg }}"
|
||||
|
||||
@@ -85,6 +85,6 @@ red = "{{ bright_red }}"
|
||||
green = "{{ bright_green }}"
|
||||
yellow = "{{ bright_yellow }}"
|
||||
blue = "{{ bright_blue }}"
|
||||
magenta = "{{ bright_purple }}"
|
||||
magenta = "{{ bright_magenta }}"
|
||||
cyan = "{{ bright_cyan }}"
|
||||
white = "{{ bright_fg }}"
|
||||
|
||||
@@ -32,7 +32,7 @@ red = "{{ red }}"
|
||||
green = "{{ green }}"
|
||||
yellow = "{{ yellow }}"
|
||||
blue = "{{ blue }}"
|
||||
magenta = "{{ purple }}"
|
||||
magenta = "{{ magenta }}"
|
||||
cyan = "{{ cyan }}"
|
||||
white = "{{ fg }}"
|
||||
|
||||
@@ -42,6 +42,6 @@ red = "{{ bright_red }}"
|
||||
green = "{{ bright_green }}"
|
||||
yellow = "{{ bright_yellow }}"
|
||||
blue = "{{ bright_blue }}"
|
||||
magenta = "{{ bright_purple }}"
|
||||
magenta = "{{ bright_magenta }}"
|
||||
cyan = "{{ bright_cyan }}"
|
||||
white = "{{ bright_fg }}"
|
||||
|
||||
@@ -29,7 +29,7 @@ theme[meter_bg]="{{ selection }}"
|
||||
theme[proc_misc]="{{ light_fg }}"
|
||||
|
||||
# CPU, Memory, Network, Proc box outline colors
|
||||
theme[cpu_box]="{{ purple }}"
|
||||
theme[cpu_box]="{{ magenta }}"
|
||||
theme[mem_box]="{{ green }}"
|
||||
theme[net_box]="{{ red }}"
|
||||
theme[proc_box]="{{ accent }}"
|
||||
@@ -42,20 +42,20 @@ theme[temp_start]="{{ green }}"
|
||||
theme[temp_mid]="{{ yellow }}"
|
||||
theme[temp_end]="{{ red }}"
|
||||
|
||||
# CPU graph colors (Teal -> Blue -> Purple)
|
||||
# CPU graph colors (Teal -> Blue -> Magenta)
|
||||
theme[cpu_start]="{{ cyan }}"
|
||||
theme[cpu_mid]="{{ blue }}"
|
||||
theme[cpu_end]="{{ purple }}"
|
||||
theme[cpu_end]="{{ magenta }}"
|
||||
|
||||
# Mem/Disk free meter
|
||||
theme[free_start]="{{ purple }}"
|
||||
theme[free_start]="{{ magenta }}"
|
||||
theme[free_mid]="{{ blue }}"
|
||||
theme[free_end]="{{ cyan }}"
|
||||
|
||||
# Mem/Disk cached meter
|
||||
theme[cached_start]="{{ blue }}"
|
||||
theme[cached_mid]="{{ cyan }}"
|
||||
theme[cached_end]="{{ purple }}"
|
||||
theme[cached_end]="{{ magenta }}"
|
||||
|
||||
# Mem/Disk available meter
|
||||
theme[available_start]="{{ yellow }}"
|
||||
@@ -80,7 +80,7 @@ theme[upload_end]="{{ blue }}"
|
||||
# Process box color gradient for threads, mem and cpu usage
|
||||
theme[process_start]="{{ cyan }}"
|
||||
theme[process_mid]="{{ blue }}"
|
||||
theme[process_end]="{{ purple }}"
|
||||
theme[process_end]="{{ magenta }}"
|
||||
|
||||
# Graph gradient colors (spectrum shades from background to foreground)
|
||||
theme[gradient_color_0]="{{ bg }}"
|
||||
|
||||
@@ -20,6 +20,6 @@ bright1={{ bright_red_strip }}
|
||||
bright2={{ bright_green_strip }}
|
||||
bright3={{ bright_yellow_strip }}
|
||||
bright4={{ bright_blue_strip }}
|
||||
bright5={{ bright_purple_strip }}
|
||||
bright5={{ bright_magenta_strip }}
|
||||
bright6={{ bright_cyan_strip }}
|
||||
bright7={{ bright_fg_strip }}
|
||||
|
||||
@@ -9,7 +9,7 @@ palette = 1={{ red }}
|
||||
palette = 2={{ green }}
|
||||
palette = 3={{ yellow }}
|
||||
palette = 4={{ blue }}
|
||||
palette = 5={{ purple }}
|
||||
palette = 5={{ magenta }}
|
||||
palette = 6={{ cyan }}
|
||||
palette = 7={{ fg }}
|
||||
palette = 8={{ muted }}
|
||||
@@ -17,6 +17,6 @@ palette = 9={{ bright_red }}
|
||||
palette = 10={{ bright_green }}
|
||||
palette = 11={{ bright_yellow }}
|
||||
palette = 12={{ bright_blue }}
|
||||
palette = 13={{ bright_purple }}
|
||||
palette = 13={{ bright_magenta }}
|
||||
palette = 14={{ bright_cyan }}
|
||||
palette = 15={{ bright_fg }}
|
||||
|
||||
@@ -126,7 +126,7 @@ color1 = "{{ red }}"
|
||||
color2 = "{{ green }}"
|
||||
color3 = "{{ yellow }}"
|
||||
color4 = "{{ blue }}"
|
||||
color5 = "{{ purple }}"
|
||||
color5 = "{{ magenta }}"
|
||||
color6 = "{{ cyan }}"
|
||||
color7 = "{{ foreground }}"
|
||||
color8 = "{{ muted }}"
|
||||
|
||||
@@ -14,7 +14,7 @@ color1 {{ red }}
|
||||
color2 {{ green }}
|
||||
color3 {{ yellow }}
|
||||
color4 {{ blue }}
|
||||
color5 {{ purple }}
|
||||
color5 {{ magenta }}
|
||||
color6 {{ cyan }}
|
||||
color7 {{ fg }}
|
||||
color8 {{ muted }}
|
||||
@@ -22,6 +22,6 @@ color9 {{ bright_red }}
|
||||
color10 {{ bright_green }}
|
||||
color11 {{ bright_yellow }}
|
||||
color12 {{ bright_blue }}
|
||||
color13 {{ bright_purple }}
|
||||
color13 {{ bright_magenta }}
|
||||
color14 {{ bright_cyan }}
|
||||
color15 {{ bright_fg }}
|
||||
|
||||
@@ -23,7 +23,7 @@ return {
|
||||
green = "{{ green }}",
|
||||
cyan = "{{ cyan }}",
|
||||
blue = "{{ blue }}",
|
||||
purple = "{{ purple }}",
|
||||
magenta = "{{ magenta }}",
|
||||
brown = "{{ brown }}",
|
||||
|
||||
bright_red = "{{ bright_red }}",
|
||||
@@ -31,7 +31,7 @@ return {
|
||||
bright_green = "{{ bright_green }}",
|
||||
bright_cyan = "{{ bright_cyan }}",
|
||||
bright_blue = "{{ bright_blue }}",
|
||||
bright_purple = "{{ bright_purple }}",
|
||||
bright_magenta = "{{ bright_magenta }}",
|
||||
|
||||
accent = "{{ accent }}",
|
||||
cursor = "{{ cursor }}",
|
||||
|
||||
@@ -19,8 +19,8 @@
|
||||
--text-title-h2: {{ green }};
|
||||
--text-title-h3: {{ yellow }};
|
||||
--text-title-h4: {{ blue }};
|
||||
--text-title-h5: {{ purple }};
|
||||
--text-title-h6: {{ purple }};
|
||||
--text-title-h5: {{ magenta }};
|
||||
--text-title-h6: {{ magenta }};
|
||||
|
||||
/* Links and accents */
|
||||
--text-link: {{ blue }};
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
"color2": "{{ green }}",
|
||||
"color3": "{{ yellow }}",
|
||||
"color4": "{{ blue }}",
|
||||
"color5": "{{ purple }}",
|
||||
"color5": "{{ magenta }}",
|
||||
"color6": "{{ cyan }}",
|
||||
"color7": "{{ foreground }}",
|
||||
"color8": "{{ muted }}",
|
||||
@@ -21,7 +21,7 @@
|
||||
"color10": "{{ bright_green }}",
|
||||
"color11": "{{ bright_yellow }}",
|
||||
"color12": "{{ bright_blue }}",
|
||||
"color13": "{{ bright_purple }}",
|
||||
"color13": "{{ bright_magenta }}",
|
||||
"color14": "{{ bright_cyan }}",
|
||||
"color15": "{{ bright_fg }}",
|
||||
"panel": "{{ mix background foreground 6% }}",
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"boolean": "{{ orange }}",
|
||||
"regexp": "{{ bright_cyan }}",
|
||||
"operator": "{{ bright_blue }}",
|
||||
"keyword": "{{ bright_purple }}",
|
||||
"keyword": "{{ bright_magenta }}",
|
||||
"comment": {"foreground": "{{ muted }}", "fontStyle": "italic"},
|
||||
"comment.documentation": {"foreground": "{{ muted }}", "fontStyle": "italic"}
|
||||
},
|
||||
@@ -254,33 +254,33 @@
|
||||
"editorInlayHint.foreground": "{{ muted }}",
|
||||
"editorInlayHint.typeBackground": "{{ yellow }}15",
|
||||
"editorInlayHint.typeForeground": "{{ yellow }}",
|
||||
"editorInlayHint.parameterBackground": "{{ bright_purple }}15",
|
||||
"editorInlayHint.parameterForeground": "{{ bright_purple }}",
|
||||
"editorInlayHint.parameterBackground": "{{ bright_magenta }}15",
|
||||
"editorInlayHint.parameterForeground": "{{ bright_magenta }}",
|
||||
"editorRuler.foreground": "{{ muted }}40",
|
||||
"editorCodeLens.foreground": "{{ muted }}",
|
||||
"editorLightBulb.foreground": "{{ yellow }}",
|
||||
"editorLightBulbAutoFix.foreground": "{{ green }}",
|
||||
"editorLightBulbAi.foreground": "{{ purple }}",
|
||||
"editorLightBulbAi.foreground": "{{ magenta }}",
|
||||
"editorBracketMatch.background": "{{ accent }}30",
|
||||
"editorBracketMatch.border": "{{ accent }}",
|
||||
"editorBracketHighlight.foreground1": "{{ blue }}",
|
||||
"editorBracketHighlight.foreground2": "{{ yellow }}",
|
||||
"editorBracketHighlight.foreground3": "{{ green }}",
|
||||
"editorBracketHighlight.foreground4": "{{ cyan }}",
|
||||
"editorBracketHighlight.foreground5": "{{ purple }}",
|
||||
"editorBracketHighlight.foreground5": "{{ magenta }}",
|
||||
"editorBracketHighlight.foreground6": "{{ orange }}",
|
||||
"editorBracketHighlight.unexpectedBracket.foreground": "{{ red }}",
|
||||
"editorBracketPairGuide.activeBackground1": "{{ blue }}60",
|
||||
"editorBracketPairGuide.activeBackground2": "{{ yellow }}60",
|
||||
"editorBracketPairGuide.activeBackground3": "{{ green }}60",
|
||||
"editorBracketPairGuide.activeBackground4": "{{ cyan }}60",
|
||||
"editorBracketPairGuide.activeBackground5": "{{ purple }}60",
|
||||
"editorBracketPairGuide.activeBackground5": "{{ magenta }}60",
|
||||
"editorBracketPairGuide.activeBackground6": "{{ orange }}60",
|
||||
"editorBracketPairGuide.background1": "{{ blue }}30",
|
||||
"editorBracketPairGuide.background2": "{{ yellow }}30",
|
||||
"editorBracketPairGuide.background3": "{{ green }}30",
|
||||
"editorBracketPairGuide.background4": "{{ cyan }}30",
|
||||
"editorBracketPairGuide.background5": "{{ purple }}30",
|
||||
"editorBracketPairGuide.background5": "{{ magenta }}30",
|
||||
"editorBracketPairGuide.background6": "{{ orange }}30",
|
||||
"editorOverviewRuler.background": "{{ background }}",
|
||||
"editorOverviewRuler.border": "{{ muted }}20",
|
||||
@@ -510,7 +510,7 @@
|
||||
"extensionIcon.starForeground": "{{ yellow }}",
|
||||
"extensionIcon.verifiedForeground": "{{ cyan }}",
|
||||
"extensionIcon.preReleaseForeground": "{{ yellow }}",
|
||||
"extensionIcon.sponsorForeground": "{{ purple }}",
|
||||
"extensionIcon.sponsorForeground": "{{ magenta }}",
|
||||
|
||||
"pickerGroup.border": "{{ muted }}",
|
||||
"pickerGroup.foreground": "{{ accent }}",
|
||||
@@ -546,7 +546,7 @@
|
||||
"terminal.ansiGreen": "{{ green }}",
|
||||
"terminal.ansiYellow": "{{ yellow }}",
|
||||
"terminal.ansiBlue": "{{ blue }}",
|
||||
"terminal.ansiMagenta": "{{ purple }}",
|
||||
"terminal.ansiMagenta": "{{ magenta }}",
|
||||
"terminal.ansiCyan": "{{ cyan }}",
|
||||
"terminal.ansiWhite": "{{ fg }}",
|
||||
"terminal.ansiBrightBlack": "{{ muted }}",
|
||||
@@ -554,7 +554,7 @@
|
||||
"terminal.ansiBrightGreen": "{{ bright_green }}",
|
||||
"terminal.ansiBrightYellow": "{{ bright_yellow }}",
|
||||
"terminal.ansiBrightBlue": "{{ bright_blue }}",
|
||||
"terminal.ansiBrightMagenta": "{{ bright_purple }}",
|
||||
"terminal.ansiBrightMagenta": "{{ bright_magenta }}",
|
||||
"terminal.ansiBrightCyan": "{{ bright_cyan }}",
|
||||
"terminal.ansiBrightWhite": "{{ bright_fg }}",
|
||||
"terminal.tab.activeBorder": "{{ accent }}",
|
||||
@@ -573,7 +573,7 @@
|
||||
"debugView.valueChangedHighlight": "{{ cyan }}40",
|
||||
"debugView.exceptionLabelForeground": "{{ background }}",
|
||||
"debugView.exceptionLabelBackground": "{{ red }}",
|
||||
"debugTokenExpression.name": "{{ purple }}",
|
||||
"debugTokenExpression.name": "{{ magenta }}",
|
||||
"debugTokenExpression.value": "{{ foreground }}",
|
||||
"debugTokenExpression.string": "{{ green }}",
|
||||
"debugTokenExpression.boolean": "{{ orange }}",
|
||||
@@ -612,7 +612,7 @@
|
||||
"gitDecoration.untrackedResourceForeground": "{{ green }}",
|
||||
"gitDecoration.ignoredResourceForeground": "{{ muted }}",
|
||||
"gitDecoration.conflictingResourceForeground": "{{ yellow }}",
|
||||
"gitDecoration.submoduleResourceForeground": "{{ purple }}",
|
||||
"gitDecoration.submoduleResourceForeground": "{{ magenta }}",
|
||||
|
||||
"settings.headerForeground": "{{ foreground }}",
|
||||
"settings.modifiedItemIndicator": "{{ accent }}",
|
||||
@@ -661,8 +661,8 @@
|
||||
"symbolIcon.folderForeground": "{{ foreground }}",
|
||||
"symbolIcon.functionForeground": "{{ blue }}",
|
||||
"symbolIcon.interfaceForeground": "{{ yellow }}",
|
||||
"symbolIcon.keyForeground": "{{ bright_purple }}",
|
||||
"symbolIcon.keywordForeground": "{{ bright_purple }}",
|
||||
"symbolIcon.keyForeground": "{{ bright_magenta }}",
|
||||
"symbolIcon.keywordForeground": "{{ bright_magenta }}",
|
||||
"symbolIcon.methodForeground": "{{ blue }}",
|
||||
"symbolIcon.moduleForeground": "{{ yellow }}",
|
||||
"symbolIcon.namespaceForeground": "{{ blue }}",
|
||||
@@ -672,14 +672,14 @@
|
||||
"symbolIcon.operatorForeground": "{{ bright_blue }}",
|
||||
"symbolIcon.packageForeground": "{{ yellow }}",
|
||||
"symbolIcon.propertyForeground": "{{ foreground }}",
|
||||
"symbolIcon.referenceForeground": "{{ bright_purple }}",
|
||||
"symbolIcon.referenceForeground": "{{ bright_magenta }}",
|
||||
"symbolIcon.snippetForeground": "{{ green }}",
|
||||
"symbolIcon.stringForeground": "{{ green }}",
|
||||
"symbolIcon.structForeground": "{{ yellow }}",
|
||||
"symbolIcon.textForeground": "{{ foreground }}",
|
||||
"symbolIcon.typeParameterForeground": "{{ yellow }}",
|
||||
"symbolIcon.unitForeground": "{{ orange }}",
|
||||
"symbolIcon.variableForeground": "{{ bright_purple }}",
|
||||
"symbolIcon.variableForeground": "{{ bright_magenta }}",
|
||||
|
||||
"debugIcon.breakpointForeground": "{{ red }}",
|
||||
"debugIcon.breakpointDisabledForeground": "{{ muted }}",
|
||||
@@ -693,7 +693,7 @@
|
||||
"debugIcon.restartForeground": "{{ green }}",
|
||||
"debugIcon.stepOverForeground": "{{ blue }}",
|
||||
"debugIcon.stepIntoForeground": "{{ cyan }}",
|
||||
"debugIcon.stepOutForeground": "{{ purple }}",
|
||||
"debugIcon.stepOutForeground": "{{ magenta }}",
|
||||
"debugIcon.continueForeground": "{{ green }}",
|
||||
"debugIcon.stepBackForeground": "{{ yellow }}",
|
||||
"debugConsole.infoForeground": "{{ blue }}",
|
||||
@@ -731,7 +731,7 @@
|
||||
"charts.yellow": "{{ yellow }}",
|
||||
"charts.orange": "{{ orange }}",
|
||||
"charts.green": "{{ green }}",
|
||||
"charts.purple": "{{ purple }}",
|
||||
"charts.purple": "{{ magenta }}",
|
||||
|
||||
"ports.iconRunningProcessForeground": "{{ accent }}",
|
||||
|
||||
@@ -818,7 +818,7 @@
|
||||
"name": "Keyword",
|
||||
"scope": ["keyword", "storage.type.class", "storage.type.function"],
|
||||
"settings": {
|
||||
"foreground": "{{ bright_purple }}"
|
||||
"foreground": "{{ bright_magenta }}"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -832,7 +832,7 @@
|
||||
"name": "Keyword Control",
|
||||
"scope": ["keyword.control", "keyword.control.flow"],
|
||||
"settings": {
|
||||
"foreground": "{{ bright_purple }}"
|
||||
"foreground": "{{ bright_magenta }}"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -974,7 +974,7 @@
|
||||
"name": "Constant Character Escape",
|
||||
"scope": ["constant.character.escape"],
|
||||
"settings": {
|
||||
"foreground": "{{ bright_purple }}"
|
||||
"foreground": "{{ bright_magenta }}"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -1080,7 +1080,7 @@
|
||||
"name": "JSON Key Level 3",
|
||||
"scope": ["source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"],
|
||||
"settings": {
|
||||
"foreground": "{{ bright_purple }}"
|
||||
"foreground": "{{ bright_magenta }}"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -1319,7 +1319,7 @@
|
||||
"name": "SQL Keyword",
|
||||
"scope": ["keyword.other.DML.sql", "keyword.other.DDL.sql"],
|
||||
"settings": {
|
||||
"foreground": "{{ bright_purple }}"
|
||||
"foreground": "{{ bright_magenta }}"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -227,14 +227,14 @@ red = "#ff0000"
|
||||
green = "#00ff00"
|
||||
yellow = "#ffff00"
|
||||
blue = "#0000ff"
|
||||
purple = "#ff00ff"
|
||||
magenta = "#ff00ff"
|
||||
cyan = "#00ffff"
|
||||
muted = "#111111"
|
||||
bright_red = "#ff1111"
|
||||
bright_green = "#11ff11"
|
||||
bright_yellow = "#ffff11"
|
||||
bright_blue = "#1111ff"
|
||||
bright_purple = "#ff11ff"
|
||||
bright_magenta = "#ff11ff"
|
||||
bright_cyan = "#11ffff"
|
||||
bright_fg = "#eeeeee"
|
||||
EOF
|
||||
@@ -258,6 +258,10 @@ cat >"$USER_THEMED/alias-test.txt.tpl" <<'EOF'
|
||||
color={{ color1 }}
|
||||
strip={{ color1_strip }}
|
||||
rgb={{ color1_rgb }}
|
||||
magenta={{ magenta }}
|
||||
legacy-purple={{ purple }}
|
||||
bright-magenta={{ bright_magenta }}
|
||||
legacy-bright-purple={{ bright_purple }}
|
||||
EOF
|
||||
|
||||
OMARCHY_PATH="$ROOT" HOME="$PI_TMPDIR" "$ROOT/bin/omarchy-theme-set-templates"
|
||||
@@ -269,6 +273,10 @@ pass "theme template color mix helpers work"
|
||||
grep -qx 'color=#ff0000' "$NEXT_THEME/alias-test.txt" || fail "theme template semantic aliases expose legacy colorN"
|
||||
grep -qx 'strip=ff0000' "$NEXT_THEME/alias-test.txt" || fail "theme template legacy colorN_strip works"
|
||||
grep -qx 'rgb=255,0,0' "$NEXT_THEME/alias-test.txt" || fail "theme template legacy colorN_rgb works"
|
||||
grep -qx 'magenta=#ff00ff' "$NEXT_THEME/alias-test.txt" || fail "theme template magenta helper works"
|
||||
grep -qx 'legacy-purple=#ff00ff' "$NEXT_THEME/alias-test.txt" || fail "theme template purple alias works"
|
||||
grep -qx 'bright-magenta=#ff11ff' "$NEXT_THEME/alias-test.txt" || fail "theme template bright magenta helper works"
|
||||
grep -qx 'legacy-bright-purple=#ff11ff' "$NEXT_THEME/alias-test.txt" || fail "theme template bright purple alias works"
|
||||
pass "theme template semantic aliases expose legacy colorN helpers"
|
||||
|
||||
osc_summary=$("$ROOT/bin/omarchy-theme-osc" "$NEXT_THEME/colors.toml" | python -c 'import sys; data = sys.stdin.buffer.read(); print(data.count(b"]4;"), b"]4;1;#ff0000" in data, b"]4;15;#eeeeee" in data)')
|
||||
|
||||
@@ -22,7 +22,7 @@ orange = "#d84e2b"
|
||||
green = "#40a02b"
|
||||
cyan = "#179299"
|
||||
blue = "#1e66f5"
|
||||
purple = "#ea76cb"
|
||||
magenta = "#ea76cb"
|
||||
brown = "#6c2715"
|
||||
dark_bg = "#e3e4e8"
|
||||
darker_bg = "#d7d8dc"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#df8e1d"
|
||||
bright_green = "#40a02b"
|
||||
bright_cyan = "#179299"
|
||||
bright_blue = "#1e66f5"
|
||||
bright_purple = "#ea76cb"
|
||||
bright_magenta = "#ea76cb"
|
||||
@@ -22,7 +22,7 @@ orange = "#f6b6ab"
|
||||
green = "#a6e3a1"
|
||||
cyan = "#94e2d5"
|
||||
blue = "#89b4fa"
|
||||
purple = "#f5c2e7"
|
||||
magenta = "#f5c2e7"
|
||||
brown = "#7b5b55"
|
||||
dark_bg = "#161622"
|
||||
darker_bg = "#101019"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#f9e2af"
|
||||
bright_green = "#a6e3a1"
|
||||
bright_cyan = "#94e2d5"
|
||||
bright_blue = "#89b4fa"
|
||||
bright_purple = "#f5c2e7"
|
||||
bright_magenta = "#f5c2e7"
|
||||
@@ -22,7 +22,7 @@ orange = "#eb8b54"
|
||||
green = "#92a593"
|
||||
cyan = "#a3bfd1"
|
||||
blue = "#7d82d9"
|
||||
purple = "#c89dc1"
|
||||
magenta = "#c89dc1"
|
||||
brown = "#75452a"
|
||||
dark_bg = "#040816"
|
||||
darker_bg = "#030610"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#f7dc9c"
|
||||
bright_green = "#c4cfc4"
|
||||
bright_cyan = "#dfeaf0"
|
||||
bright_blue = "#c2c4f0"
|
||||
bright_purple = "#ead7e7"
|
||||
bright_magenta = "#ead7e7"
|
||||
@@ -22,7 +22,7 @@ orange = "#e09d7f"
|
||||
green = "#a7c080"
|
||||
cyan = "#83c092"
|
||||
blue = "#7fbbb3"
|
||||
purple = "#d699b6"
|
||||
magenta = "#d699b6"
|
||||
brown = "#704e3f"
|
||||
dark_bg = "#21272c"
|
||||
darker_bg = "#181d20"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#dbbc7f"
|
||||
bright_green = "#a7c080"
|
||||
bright_cyan = "#83c092"
|
||||
bright_blue = "#7fbbb3"
|
||||
bright_purple = "#d699b6"
|
||||
bright_magenta = "#d699b6"
|
||||
@@ -22,7 +22,7 @@ orange = "#d0772b"
|
||||
green = "#879A39"
|
||||
cyan = "#3AA99F"
|
||||
blue = "#205EA6"
|
||||
purple = "#CE5D97"
|
||||
magenta = "#CE5D97"
|
||||
brown = "#683b15"
|
||||
dark_bg = "#f2efe4"
|
||||
darker_bg = "#e5e2d8"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#D0A215"
|
||||
bright_green = "#879A39"
|
||||
bright_cyan = "#3AA99F"
|
||||
bright_blue = "#4385BE"
|
||||
bright_purple = "#CE5D97"
|
||||
bright_magenta = "#CE5D97"
|
||||
@@ -22,7 +22,7 @@ orange = "#e1875c"
|
||||
green = "#a9b665"
|
||||
cyan = "#89b482"
|
||||
blue = "#7daea3"
|
||||
purple = "#d3869b"
|
||||
magenta = "#d3869b"
|
||||
brown = "#70432e"
|
||||
dark_bg = "#1e1e1e"
|
||||
darker_bg = "#161616"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#d8a657"
|
||||
bright_green = "#a9b665"
|
||||
bright_cyan = "#89b482"
|
||||
bright_blue = "#7daea3"
|
||||
bright_purple = "#d3869b"
|
||||
bright_magenta = "#d3869b"
|
||||
@@ -23,7 +23,7 @@ orange = "#50f7a3"
|
||||
green = "#4fe88f"
|
||||
cyan = "#7cf8f7"
|
||||
blue = "#829dd4"
|
||||
purple = "#86a7df"
|
||||
magenta = "#86a7df"
|
||||
brown = "#287b51"
|
||||
dark_bg = "#080910"
|
||||
darker_bg = "#06060c"
|
||||
@@ -32,4 +32,4 @@ bright_yellow = "#a4ffec"
|
||||
bright_green = "#9cf7c2"
|
||||
bright_cyan = "#d1fffe"
|
||||
bright_blue = "#c4d2ed"
|
||||
bright_purple = "#cddbf4"
|
||||
bright_magenta = "#cddbf4"
|
||||
@@ -22,7 +22,7 @@ orange = "#c17158"
|
||||
green = "#76946a"
|
||||
cyan = "#6a9589"
|
||||
blue = "#7e9cd8"
|
||||
purple = "#957fb8"
|
||||
magenta = "#957fb8"
|
||||
brown = "#60382c"
|
||||
dark_bg = "#17171e"
|
||||
darker_bg = "#111116"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#e6c384"
|
||||
bright_green = "#98bb6c"
|
||||
bright_cyan = "#7aa89f"
|
||||
bright_blue = "#7fb4ca"
|
||||
bright_purple = "#938aa9"
|
||||
bright_magenta = "#938aa9"
|
||||
@@ -32,10 +32,10 @@ yellow = "#6B5E73"
|
||||
green = "#87a9b0"
|
||||
cyan = "#a5a0b6"
|
||||
blue = "#b59790"
|
||||
purple = "#c4d8e2"
|
||||
magenta = "#c4d8e2"
|
||||
bright_red = "#c38b7b"
|
||||
bright_yellow = "#6B5E73"
|
||||
bright_green = "#87a9b0"
|
||||
bright_cyan = "#a5a0b6"
|
||||
bright_blue = "#b59790"
|
||||
bright_purple = "#c4d8e2"
|
||||
bright_magenta = "#c4d8e2"
|
||||
@@ -27,7 +27,7 @@ orange = "#8bc9eb"
|
||||
green = "#5e95bc"
|
||||
cyan = "#b4e4f6"
|
||||
blue = "#6fb8e3"
|
||||
purple = "#8bc9eb"
|
||||
magenta = "#8bc9eb"
|
||||
brown = "#456475"
|
||||
dark_bg = "#101b21"
|
||||
darker_bg = "#0b1216"
|
||||
@@ -36,4 +36,4 @@ bright_yellow = "#9dcae5"
|
||||
bright_green = "#86b7d8"
|
||||
bright_cyan = "#d1eef8"
|
||||
bright_blue = "#f2fcff"
|
||||
bright_purple = "#b1d8ee"
|
||||
bright_magenta = "#b1d8ee"
|
||||
@@ -22,7 +22,7 @@ orange = "#c63d3d"
|
||||
green = "#FFC107"
|
||||
cyan = "#bebebe"
|
||||
blue = "#e68e0d"
|
||||
purple = "#D35F5F"
|
||||
magenta = "#D35F5F"
|
||||
brown = "#631e1e"
|
||||
dark_bg = "#0d0d0d"
|
||||
darker_bg = "#090909"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#b90a0a"
|
||||
bright_green = "#FFC107"
|
||||
bright_cyan = "#eaeaea"
|
||||
bright_blue = "#f59e0b"
|
||||
bright_purple = "#B91C1C"
|
||||
bright_magenta = "#B91C1C"
|
||||
@@ -22,7 +22,7 @@ orange = "#8d6242"
|
||||
green = "#5f875f"
|
||||
cyan = "#c9a554"
|
||||
blue = "#78824b"
|
||||
purple = "#bb7744"
|
||||
magenta = "#bb7744"
|
||||
brown = "#463121"
|
||||
dark_bg = "#191919"
|
||||
darker_bg = "#121212"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#b36d43"
|
||||
bright_green = "#5f875f"
|
||||
bright_cyan = "#c9a554"
|
||||
bright_blue = "#78824b"
|
||||
bright_purple = "#bb7744"
|
||||
bright_magenta = "#bb7744"
|
||||
@@ -22,7 +22,7 @@ orange = "#d5967a"
|
||||
green = "#a3be8c"
|
||||
cyan = "#88c0d0"
|
||||
blue = "#81a1c1"
|
||||
purple = "#b48ead"
|
||||
magenta = "#b48ead"
|
||||
brown = "#6a4b3d"
|
||||
dark_bg = "#222730"
|
||||
darker_bg = "#191c23"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#ebcb8b"
|
||||
bright_green = "#a3be8c"
|
||||
bright_cyan = "#8fbcbb"
|
||||
bright_blue = "#81a1c1"
|
||||
bright_purple = "#b48ead"
|
||||
bright_magenta = "#b48ead"
|
||||
@@ -22,7 +22,7 @@ orange = "#a2734b"
|
||||
green = "#549e6a"
|
||||
cyan = "#2DD5B7"
|
||||
blue = "#509475"
|
||||
purple = "#D2689C"
|
||||
magenta = "#D2689C"
|
||||
brown = "#513925"
|
||||
dark_bg = "#0c1512"
|
||||
darker_bg = "#090f0d"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#E5C736"
|
||||
bright_green = "#63b07a"
|
||||
bright_cyan = "#8CD3CB"
|
||||
bright_blue = "#ACD4CF"
|
||||
bright_purple = "#75bbb3"
|
||||
bright_magenta = "#75bbb3"
|
||||
@@ -22,7 +22,7 @@ orange = "#faa968"
|
||||
green = "#028391"
|
||||
cyan = "#8cbfb8"
|
||||
blue = "#3f8f8a"
|
||||
purple = "#3f8f8a"
|
||||
magenta = "#3f8f8a"
|
||||
brown = "#743d1e"
|
||||
dark_bg = "#031222"
|
||||
darker_bg = "#020c17"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#e97b3c"
|
||||
bright_green = "#028391"
|
||||
bright_cyan = "#8cbfb8"
|
||||
bright_blue = "#faa968"
|
||||
bright_purple = "#3f8f8a"
|
||||
bright_magenta = "#3f8f8a"
|
||||
@@ -22,7 +22,7 @@ orange = "#fb9a77"
|
||||
green = "#adda78"
|
||||
cyan = "#85dacc"
|
||||
blue = "#f38d70"
|
||||
purple = "#a8a9eb"
|
||||
magenta = "#a8a9eb"
|
||||
brown = "#7d4d3b"
|
||||
dark_bg = "#211b1b"
|
||||
darker_bg = "#181414"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#fcd675"
|
||||
bright_green = "#c8e292"
|
||||
bright_cyan = "#9bf1e1"
|
||||
bright_blue = "#f8a788"
|
||||
bright_purple = "#bebffd"
|
||||
bright_magenta = "#bebffd"
|
||||
@@ -22,7 +22,7 @@ orange = "#cf8057"
|
||||
green = "#286983"
|
||||
cyan = "#d7827e"
|
||||
blue = "#56949f"
|
||||
purple = "#907aa9"
|
||||
magenta = "#907aa9"
|
||||
brown = "#67402b"
|
||||
dark_bg = "#ede7e1"
|
||||
darker_bg = "#e1dbd5"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#ea9d34"
|
||||
bright_green = "#286983"
|
||||
bright_cyan = "#d7827e"
|
||||
bright_blue = "#56949f"
|
||||
bright_purple = "#907aa9"
|
||||
bright_magenta = "#907aa9"
|
||||
@@ -32,10 +32,10 @@ yellow = "#d9dbdc"
|
||||
green = "#9fa5a9"
|
||||
cyan = "#707070"
|
||||
blue = "#798186"
|
||||
purple = "#aeaeae"
|
||||
magenta = "#aeaeae"
|
||||
bright_red = "#de6145"
|
||||
bright_yellow = "#c9c2b4"
|
||||
bright_green = "#343d41"
|
||||
bright_cyan = "#707070"
|
||||
bright_blue = "#5d6367"
|
||||
bright_purple = "#9a9a9a"
|
||||
bright_magenta = "#9a9a9a"
|
||||
@@ -23,7 +23,7 @@ orange = "#eb927b"
|
||||
green = "#9ece6a"
|
||||
cyan = "#449dab"
|
||||
blue = "#7aa2f7"
|
||||
purple = "#ad8ee6"
|
||||
magenta = "#ad8ee6"
|
||||
brown = "#75493d"
|
||||
dark_bg = "#13141c"
|
||||
darker_bg = "#0e0e14"
|
||||
@@ -32,4 +32,4 @@ bright_yellow = "#ff9e64"
|
||||
bright_green = "#b9f27c"
|
||||
bright_cyan = "#0db9d7"
|
||||
bright_blue = "#7da6ff"
|
||||
bright_purple = "#bb9af7"
|
||||
bright_magenta = "#bb9af7"
|
||||
@@ -22,7 +22,7 @@ orange = "#b9b9b9"
|
||||
green = "#b6b6b6"
|
||||
cyan = "#b0b0b0"
|
||||
blue = "#8d8d8d"
|
||||
purple = "#9b9b9b"
|
||||
magenta = "#9b9b9b"
|
||||
brown = "#5c5c5c"
|
||||
dark_bg = "#090909"
|
||||
darker_bg = "#070707"
|
||||
@@ -31,4 +31,4 @@ bright_yellow = "#cecece"
|
||||
bright_green = "#b6b6b6"
|
||||
bright_cyan = "#b0b0b0"
|
||||
bright_blue = "#8d8d8d"
|
||||
bright_purple = "#9b9b9b"
|
||||
bright_magenta = "#9b9b9b"
|
||||
@@ -26,10 +26,10 @@ yellow = "#4a4a4a"
|
||||
green = "#3a3a3a"
|
||||
cyan = "#3e3e3e"
|
||||
blue = "#1a1a1a"
|
||||
purple = "#2e2e2e"
|
||||
magenta = "#2e2e2e"
|
||||
bright_red = "#2a2a2a"
|
||||
bright_yellow = "#4a4a4a"
|
||||
bright_green = "#3a3a3a"
|
||||
bright_cyan = "#3e3e3e"
|
||||
bright_blue = "#1a1a1a"
|
||||
bright_purple = "#2e2e2e"
|
||||
bright_magenta = "#2e2e2e"
|
||||
Reference in New Issue
Block a user