From cf8cc44147932220f80479ec6fbeff630ab8e919 Mon Sep 17 00:00:00 2001 From: eudaimon Date: Fri, 20 May 2022 18:31:39 +0200 Subject: [PATCH] Damn, it doesn't work --- source/templates/_theme_colors.scss | 18 ++++----- source/templates/_theme_colors.scss~ | 32 ++++++++-------- source/templates/process_variables.sh | 2 + source/templates/process_variables.sh~ | 5 +++ source/templates/theme_colors_.scss.processed | 37 +++++++++++++++++++ 5 files changed, 69 insertions(+), 25 deletions(-) mode change 100644 => 100755 source/templates/process_variables.sh~ create mode 100644 source/templates/theme_colors_.scss.processed diff --git a/source/templates/_theme_colors.scss b/source/templates/_theme_colors.scss index 057db45..d343240 100644 --- a/source/templates/_theme_colors.scss +++ b/source/templates/_theme_colors.scss @@ -1,4 +1,4 @@ -$window_fg: $vwindow_fg; +'$window_fg: '$vwindow_fg; $window_bg: $vwindow_bg; $text_widget_fg: $vtext_widget_fg; $text_widget_bg: $vtext_widget_bg; @@ -24,14 +24,14 @@ $successc: $vsuccessc; $titlebar_active_fg: $vtitlebar_active_fg; $titlebar_active_bg: $vtitlebar_active_bg; -$titlebar_backdrop_fg: $window_fg; -$titlebar_backdrop_bg: $window_bg; +$titlebar_backdrop_fg: $vtitlebar_backdrop_fg; +$titlebar_backdrop_bg: $vtitlebar_backdrop_bg; -$hint_fg: #002269; -$hint_bg: #6789b4; +$hint_fg: $vhint_fg; +$hint_bg: $vhint_bg; -$osd_fg: $hint_fg; -$osd_bg: $hint_bg; +$osd_fg: $vosd_fg; +$osd_bg: $vosd_bg; -$link_fg: #004B91; -$link_visited_fg: #680091; +$link_fg: $vlink_fg; +$link_visited_fg: $vlink_visited_fg; diff --git a/source/templates/_theme_colors.scss~ b/source/templates/_theme_colors.scss~ index 2c4e275..95cd0af 100644 --- a/source/templates/_theme_colors.scss~ +++ b/source/templates/_theme_colors.scss~ @@ -1,4 +1,4 @@ -$window_fg: $vwindow_fg; +"$window_fg: "$vwindow_fg; $window_bg: $vwindow_bg; $text_widget_fg: $vtext_widget_fg; $text_widget_bg: $vtext_widget_bg; @@ -12,26 +12,26 @@ $button_checked_bg: $vbutton_checked_bg; $button_checked_fg: $vbutton_checked_fg; -$disabled_fg: #552222; -$disabled_bg: #938989; +$disabled_fg: $vdisabled_fg; +$disabled_bg: $vdisabled_bg; /*Usually an automatic fg color on these backgrounds should check this value!*/ -$warningc: #f57900; -$errorc: #990000; -$successc: #73d216; +$warningc: $vdisabled_bg; +$errorc: $verrorc; +$successc: $vsuccessc; -$titlebar_active_fg: $selected_fg; -$titlebar_active_bg: $selected_bg; +$titlebar_active_fg: $vtitlebar_active_fg; +$titlebar_active_bg: $vtitlebar_active_bg; -$titlebar_backdrop_fg: $window_fg; -$titlebar_backdrop_bg: $window_bg; +$titlebar_backdrop_fg: $vtitlebar_backdrop_fg; +$titlebar_backdrop_bg: $vtitlebar_backdrop_bg; -$hint_fg: #002269; -$hint_bg: #6789b4; +$hint_fg: $vhint_fg; +$hint_bg: $vhint_bg; -$osd_fg: $hint_fg; -$osd_bg: $hint_bg; +$osd_fg: $vosd_fg; +$osd_bg: $vosd_bg; -$link_fg: #004B91; -$link_visited_fg: #680091; +$link_fg: $vlink_fg; +$link_visited_fg: $vlink_visited_fg; diff --git a/source/templates/process_variables.sh b/source/templates/process_variables.sh index 9306331..5e13e6b 100755 --- a/source/templates/process_variables.sh +++ b/source/templates/process_variables.sh @@ -1,3 +1,5 @@ #! /bin/bash source variables.sh + +envsubst <_theme_colors.scss >theme_colors_.scss.processed \ No newline at end of file diff --git a/source/templates/process_variables.sh~ b/source/templates/process_variables.sh~ old mode 100644 new mode 100755 index e69de29..6e29031 --- a/source/templates/process_variables.sh~ +++ b/source/templates/process_variables.sh~ @@ -0,0 +1,5 @@ +#! /bin/bash + +source variables.sh + +envsubst <_theme_colors.scss >theme_colors_.scss.ok \ No newline at end of file diff --git a/source/templates/theme_colors_.scss.processed b/source/templates/theme_colors_.scss.processed new file mode 100644 index 0000000..cb51366 --- /dev/null +++ b/source/templates/theme_colors_.scss.processed @@ -0,0 +1,37 @@ +': '#241f31; +: #a7a7a7; +: #241f31; +: #908f8d; + +: #000000; +: #b0dd7e; + +: #241f31; +: #bcbeb9; +: #b0dd7e; +: #000000; + + +: #552222; +: #938989; + +/*Usually an automatic fg color on these backgrounds should check this value!*/ +: #938989; +: #990000; +: #73d216; + + +: #000000; +: #b0dd7e; + +: #241f31; +: #a7a7a7; + +: #002269; +: #6789b4; + +: ; +: ; + +: #004B91; +: #680091;