From a92df5cb4c9aa128580f229444f57a77dd86b24a Mon Sep 17 00:00:00 2001 From: Zac de Lusignan <40217480+lusignan@users.noreply.github.com> Date: Thu, 10 Dec 2020 19:08:49 -0800 Subject: [PATCH 01/21] Add files via upload --- inst/templates/material-ocean.R | 80 ++++++++++++++++ inst/templates/material-ocean.scss | 141 +++++++++++++++++++++++++++++ 2 files changed, 221 insertions(+) create mode 100644 inst/templates/material-ocean.R create mode 100644 inst/templates/material-ocean.scss diff --git a/inst/templates/material-ocean.R b/inst/templates/material-ocean.R new file mode 100644 index 0000000..938295c --- /dev/null +++ b/inst/templates/material-ocean.R @@ -0,0 +1,80 @@ +rstheme( + "Material Ocean", + theme_dark = TRUE, + theme_flat = TRUE, + theme_path = here::here("rsthemes-main/inst/templates/material-ocean.scss"), + theme_apply = TRUE, + theme_as_sass = TRUE, + theme_palette = list( + base00 = "#090D14", + base01 = "#0F121C", + base02 = "#1c1e26", + base03 = "#232530", + base04 = "#2e303e", + base05 = "#6c6f93", + base06 = "#A5ABD0", + base07 = "#acafc3", + base08 = "#ffffff", + purple = "#C792E9", + blue = "#81AAFF", + sky = "#88DDFE", + aqua = "#84ffff", + teal = "#81D4CC", + green = "#C3E88D", + gold = "#FFC956", + orange = "#F88C6C", + red = "#F07178" + ), + ui_background = "$base01", + ui_foreground = "$base06", + code_string = "$green", + code_function = "$blue", + code_value = "$orange", + code_comment = "$base05", + code_variable = "$gold", + code_message = "$sky", + code_reserved = "$purple", + code_operator = "$sky", + code_namespace = "$red", + code_identifier = "$base06", + ui_rstudio_background = "$base00", + ui_rstudio_foreground = "$base06", + ui_rstudio_toolbar_foreground = "$base05", + ui_rstudio_tabs_active_background = "$base00", + ui_rstudio_tabs_active_foreground = "$base08", + ui_rstudio_tabs_inactive_background = "$base00", + ui_rstudio_tabs_inactive_foreground = "$base06", + ui_rstudio_job_progress_bar = "$blue", + ui_selection = "#1F2233", + ui_console_selection = "$base00", + ui_line_active = "$base00", + ui_line_active_selection = "$base03", + ui_margin_line = "$base03", + rmd_chunk_background = "$base00", + ui_cursor = "$gold", + ui_gutter_foreground = "#242937", + ui_debug_background = "$base03", + rmd_chunk_header = "$teal", + rmd_heading_foreground = "$gold", + rmd_href = "#e9436f", + ui_completions_background = "$base00", + ui_completions_border = "$base00", + ui_completions_foreground = "$base08", + ui_completions_selected_foreground = "$base08", + rstheme_command_palette(), + rstheme_large_tabs(), + rstheme_dialog_options(), + rstheme_rainbow_parentheses( + "$gold", "$red", "$purple", "$green", "$blue", "$orange", "$teal" + ), + '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 3px 0 $aqua inset; + border-radius: 0 !important; + .gwt-Label { + font-weight: 600; + } + } + } + ' +) \ No newline at end of file diff --git a/inst/templates/material-ocean.scss b/inst/templates/material-ocean.scss new file mode 100644 index 0000000..32d582f --- /dev/null +++ b/inst/templates/material-ocean.scss @@ -0,0 +1,141 @@ +/* rs-theme-name: Material Ocean {rsthemes} */ +/* rs-theme-is-dark: TRUE */ +$base00: #090D14; +$base01: #0F121C; +$base02: #1c1e26; +$base03: #232530; +$base04: #2e303e; +$base05: #6c6f93; +$base06: #A5ABD0; +$base07: #acafc3; +$base08: #ffffff; +$purple: #C792E9; +$blue: #81AAFF; +$sky: #88DDFE; +$aqua: #84ffff; +$teal: #81D4CC; +$green: #C3E88D; +$gold: #FFC956; +$orange: #F88C6C; +$red: #F07178; +$ui_background: $base01; +$ui_foreground: $base06; +$code_string: $green; +$code_function: $blue; +$code_value: $orange; +$code_variable: $gold; +$code_message: $sky; +$ui_rstudio_background: $base00; +$ui_rstudio_foreground: $base06; +$ui_rstudio_border: $ui_background; +$rmd_chunk_background: $base00; +$ui_rstudio_tabs_inactive_background: $base00; +$ui_rstudio_tabs_inactive_foreground: $base06; +$ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; +$ui_rstudio_tabs_active_background: $base00; +$ui_rstudio_tabs_active_foreground: $base08; +$ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; +$ui_rstudio_toolbar_foreground: $base05; +$ui_rstudio_search: $ui_rstudio_toolbar_background; +$ui_rstudio_scrollbar_background: $ui_background; +$ui_rstudio_scrollbar_handle: $rmd_chunk_background; +$ui_cursor: $gold; +$ui_cursor_normal_mode: $ui_cursor; +$ui_gutter_foreground: #242937; +$ui_gutter_background: $ui_background; +$ui_line_active: $base00; +$ui_selection: #1F2233; +$ui_line_active_selection: $base03; +$ui_line_active_gutter: $ui_background; +$ui_bracket: transparentize($ui_cursor, 0.6); +$ui_invisible: transparentize($ui_foreground, 0.7); +$ui_indent_guide: $ui_invisible; +$ui_margin_line: $base03; +$ui_debug_background: $base03; +$ui_fold_arrows_foreground: $ui_cursor; +$ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); +$ui_line_find: $ui_selection; +$ui_console_selection: $base00; +$ui_completions_background: $base00; +$ui_completions_foreground: $base08; +$ui_completions_border: $base00; +$ui_completions_selected_background: $ui_line_active_selection; +$ui_completions_selected_foreground: $base08; +$ui_rstudio_job_progress_bar: $blue; +$code_comment: $base05; +$code_namespace_font_style: italic; +$code_reserved: $purple; +$code_operator: $sky; +$code_bracket: $code_function; +$code_namespace: $red; +$code_identifier: $base06; +$code_string_background: inherit; +$code_function_background: inherit; +$code_value_background: inherit; +$code_variable_background: inherit; +$code_message_background: inherit; +$code_comment_background: inherit; +$code_reserved_background: inherit; +$code_operator_background: inherit; +$code_bracket_background: inherit; +$code_namespace_background: inherit; +$code_identifier_background: inherit; +$code_other: $code_string; +$rmd_heading_weight: 600; +$rmd_heading_foreground: $gold; +$rmd_heading_background: $code_string_background; +$rmd_chunk_header: $teal; +$rmd_chunk_header_background: $code_function_background; +$rmd_href: #e9436f; +$rmd_href_background: $code_reserved_background; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 3px 0 $aqua inset; + border-radius: 0 !important; + .gwt-Label { + font-weight: 600; + } + } + } + +$ui_command_palette_background: $ui_background; +$ui_command_palette_search_background: $ui_command_palette_background; +$ui_command_palette_border: $ui_command_palette_background; +$ui_command_palette_item_background: $ui_command_palette_background; +$ui_command_palette_item_color: $ui_foreground; +$ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); +$ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); +$ui_rstudio_dialog_background: $ui_rstudio_background; +$ui_rstudio_dialog_foreground: $ui_rstudio_foreground; +$ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); +$ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_selected_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_heading_foreground: $code_function; +$ui_rstudio_dialog_help_foreground: $code_value; +$ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_button_hover_foreground: lighten($ui_rstudio_dialog_button_foreground, 10%); +$ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); +$ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_input_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_input_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_foreground: $ui_rstudio_dialog_foreground; +$ui_paren_0: $gold; +$ui_paren_1: $red; +$ui_paren_2: $purple; +$ui_paren_3: $green; +$ui_paren_4: $blue; +$ui_paren_5: $orange; +$ui_paren_6: $teal; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; From 52181415d94a3be4161d92f4c899a903682b06b2 Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Thu, 10 Dec 2020 23:36:05 -0500 Subject: [PATCH 02/21] Fix path to scss output --- inst/templates/material-ocean.R | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inst/templates/material-ocean.R b/inst/templates/material-ocean.R index 938295c..f07f906 100644 --- a/inst/templates/material-ocean.R +++ b/inst/templates/material-ocean.R @@ -2,7 +2,7 @@ rstheme( "Material Ocean", theme_dark = TRUE, theme_flat = TRUE, - theme_path = here::here("rsthemes-main/inst/templates/material-ocean.scss"), + theme_path = here::here("inst/templates/material-ocean.scss"), theme_apply = TRUE, theme_as_sass = TRUE, theme_palette = list( @@ -22,7 +22,7 @@ rstheme( teal = "#81D4CC", green = "#C3E88D", gold = "#FFC956", - orange = "#F88C6C", + orange = "#F88C6C", red = "#F07178" ), ui_background = "$base01", @@ -77,4 +77,4 @@ rstheme( } } ' -) \ No newline at end of file +) From 484859639ef0540815a0ac1e75e1817f2b0fb33a Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Thu, 10 Dec 2020 23:42:25 -0500 Subject: [PATCH 03/21] Remove material-ocean.scss for a cleaner PR --- inst/templates/material-ocean.scss | 141 ----------------------------- 1 file changed, 141 deletions(-) delete mode 100644 inst/templates/material-ocean.scss diff --git a/inst/templates/material-ocean.scss b/inst/templates/material-ocean.scss deleted file mode 100644 index 32d582f..0000000 --- a/inst/templates/material-ocean.scss +++ /dev/null @@ -1,141 +0,0 @@ -/* rs-theme-name: Material Ocean {rsthemes} */ -/* rs-theme-is-dark: TRUE */ -$base00: #090D14; -$base01: #0F121C; -$base02: #1c1e26; -$base03: #232530; -$base04: #2e303e; -$base05: #6c6f93; -$base06: #A5ABD0; -$base07: #acafc3; -$base08: #ffffff; -$purple: #C792E9; -$blue: #81AAFF; -$sky: #88DDFE; -$aqua: #84ffff; -$teal: #81D4CC; -$green: #C3E88D; -$gold: #FFC956; -$orange: #F88C6C; -$red: #F07178; -$ui_background: $base01; -$ui_foreground: $base06; -$code_string: $green; -$code_function: $blue; -$code_value: $orange; -$code_variable: $gold; -$code_message: $sky; -$ui_rstudio_background: $base00; -$ui_rstudio_foreground: $base06; -$ui_rstudio_border: $ui_background; -$rmd_chunk_background: $base00; -$ui_rstudio_tabs_inactive_background: $base00; -$ui_rstudio_tabs_inactive_foreground: $base06; -$ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; -$ui_rstudio_tabs_active_background: $base00; -$ui_rstudio_tabs_active_foreground: $base08; -$ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; -$ui_rstudio_toolbar_foreground: $base05; -$ui_rstudio_search: $ui_rstudio_toolbar_background; -$ui_rstudio_scrollbar_background: $ui_background; -$ui_rstudio_scrollbar_handle: $rmd_chunk_background; -$ui_cursor: $gold; -$ui_cursor_normal_mode: $ui_cursor; -$ui_gutter_foreground: #242937; -$ui_gutter_background: $ui_background; -$ui_line_active: $base00; -$ui_selection: #1F2233; -$ui_line_active_selection: $base03; -$ui_line_active_gutter: $ui_background; -$ui_bracket: transparentize($ui_cursor, 0.6); -$ui_invisible: transparentize($ui_foreground, 0.7); -$ui_indent_guide: $ui_invisible; -$ui_margin_line: $base03; -$ui_debug_background: $base03; -$ui_fold_arrows_foreground: $ui_cursor; -$ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); -$ui_line_find: $ui_selection; -$ui_console_selection: $base00; -$ui_completions_background: $base00; -$ui_completions_foreground: $base08; -$ui_completions_border: $base00; -$ui_completions_selected_background: $ui_line_active_selection; -$ui_completions_selected_foreground: $base08; -$ui_rstudio_job_progress_bar: $blue; -$code_comment: $base05; -$code_namespace_font_style: italic; -$code_reserved: $purple; -$code_operator: $sky; -$code_bracket: $code_function; -$code_namespace: $red; -$code_identifier: $base06; -$code_string_background: inherit; -$code_function_background: inherit; -$code_value_background: inherit; -$code_variable_background: inherit; -$code_message_background: inherit; -$code_comment_background: inherit; -$code_reserved_background: inherit; -$code_operator_background: inherit; -$code_bracket_background: inherit; -$code_namespace_background: inherit; -$code_identifier_background: inherit; -$code_other: $code_string; -$rmd_heading_weight: 600; -$rmd_heading_foreground: $gold; -$rmd_heading_background: $code_string_background; -$rmd_chunk_header: $teal; -$rmd_chunk_header_background: $code_function_background; -$rmd_href: #e9436f; -$rmd_href_background: $code_reserved_background; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; -.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { - .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { - box-shadow: 0 3px 0 $aqua inset; - border-radius: 0 !important; - .gwt-Label { - font-weight: 600; - } - } - } - -$ui_command_palette_background: $ui_background; -$ui_command_palette_search_background: $ui_command_palette_background; -$ui_command_palette_border: $ui_command_palette_background; -$ui_command_palette_item_background: $ui_command_palette_background; -$ui_command_palette_item_color: $ui_foreground; -$ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); -$ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); -$ui_rstudio_dialog_background: $ui_rstudio_background; -$ui_rstudio_dialog_foreground: $ui_rstudio_foreground; -$ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); -$ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; -$ui_rstudio_dialog_selected_foreground: $ui_rstudio_dialog_foreground; -$ui_rstudio_dialog_heading_foreground: $code_function; -$ui_rstudio_dialog_help_foreground: $code_value; -$ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; -$ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; -$ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; -$ui_rstudio_dialog_button_hover_foreground: lighten($ui_rstudio_dialog_button_foreground, 10%); -$ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); -$ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; -$ui_rstudio_dialog_input_foreground: $ui_rstudio_dialog_foreground; -$ui_rstudio_dialog_input_background: $ui_rstudio_dialog_background; -$ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; -$ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; -$ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); -$ui_rstudio_dialog_select_background: lighten($ui_rstudio_dialog_background, 5%); -$ui_rstudio_dialog_select_foreground: $ui_rstudio_dialog_foreground; -$ui_paren_0: $gold; -$ui_paren_1: $red; -$ui_paren_2: $purple; -$ui_paren_3: $green; -$ui_paren_4: $blue; -$ui_paren_5: $orange; -$ui_paren_6: $teal; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; From 99d7d32f810e0a21ce024b5180fa011bb0b221c8 Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Thu, 10 Dec 2020 23:54:46 -0500 Subject: [PATCH 04/21] Tweak menu item hover and selected colors --- inst/templates/material-ocean.R | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/inst/templates/material-ocean.R b/inst/templates/material-ocean.R index f07f906..975dfe6 100644 --- a/inst/templates/material-ocean.R +++ b/inst/templates/material-ocean.R @@ -61,7 +61,11 @@ rstheme( ui_completions_border = "$base00", ui_completions_foreground = "$base08", ui_completions_selected_foreground = "$base08", - rstheme_command_palette(), + ui_completions_selected_background = "mix($teal, $ui_rstudio_background, 40%)", + rstheme_command_palette( + item_selected_background = "mix($teal, $ui_rstudio_background, 40%)", + item_hover_background = "mix($teal, $ui_rstudio_background, 20%)" + ), rstheme_large_tabs(), rstheme_dialog_options(), rstheme_rainbow_parentheses( From c1dbe985d94f4b6555140527f22467230f89af9b Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Fri, 11 Dec 2020 09:34:23 -0500 Subject: [PATCH 05/21] Update tab style to match Material theme (underline) --- inst/templates/material-ocean.R | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/inst/templates/material-ocean.R b/inst/templates/material-ocean.R index 975dfe6..aee25d8 100644 --- a/inst/templates/material-ocean.R +++ b/inst/templates/material-ocean.R @@ -73,11 +73,8 @@ rstheme( ), '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { - box-shadow: 0 3px 0 $aqua inset; + box-shadow: 0 -2px 0 $aqua inset; border-radius: 0 !important; - .gwt-Label { - font-weight: 600; - } } } ' From 84adb9f883c2d3f99f935c2bcdcb9d444361b3ee Mon Sep 17 00:00:00 2001 From: Zac de Lusignan <40217480+lusignan@users.noreply.github.com> Date: Fri, 11 Dec 2020 08:49:01 -0800 Subject: [PATCH 06/21] Minor color tweaks --- inst/templates/material-ocean.R | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/inst/templates/material-ocean.R b/inst/templates/material-ocean.R index aee25d8..9e77664 100644 --- a/inst/templates/material-ocean.R +++ b/inst/templates/material-ocean.R @@ -10,10 +10,10 @@ rstheme( base01 = "#0F121C", base02 = "#1c1e26", base03 = "#232530", - base04 = "#2e303e", + base04 = "#242937", base05 = "#6c6f93", base06 = "#A5ABD0", - base07 = "#acafc3", + base07 = "#1F2233", base08 = "#ffffff", purple = "#C792E9", blue = "#81AAFF", @@ -45,18 +45,18 @@ rstheme( ui_rstudio_tabs_inactive_background = "$base00", ui_rstudio_tabs_inactive_foreground = "$base06", ui_rstudio_job_progress_bar = "$blue", - ui_selection = "#1F2233", + ui_selection = "$base07", ui_console_selection = "$base00", ui_line_active = "$base00", ui_line_active_selection = "$base03", ui_margin_line = "$base03", rmd_chunk_background = "$base00", ui_cursor = "$gold", - ui_gutter_foreground = "#242937", + ui_gutter_foreground = "$base04", ui_debug_background = "$base03", rmd_chunk_header = "$teal", rmd_heading_foreground = "$gold", - rmd_href = "#e9436f", + rmd_href = "$red", ui_completions_background = "$base00", ui_completions_border = "$base00", ui_completions_foreground = "$base08", @@ -67,7 +67,14 @@ rstheme( item_hover_background = "mix($teal, $ui_rstudio_background, 20%)" ), rstheme_large_tabs(), - rstheme_dialog_options(), + rstheme_dialog_options( + selected_foreground = "$base08", + help_foreground = "$base08", + input_foreground = "$orange", + input_background = "$base01", + select_foreground = "$base06", + select_background = "$base01" + ), rstheme_rainbow_parentheses( "$gold", "$red", "$purple", "$green", "$blue", "$orange", "$teal" ), @@ -77,5 +84,10 @@ rstheme( border-radius: 0 !important; } } + ', + '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } ' -) +) \ No newline at end of file From 8a901c4f86516f93aac6f13808a39c40481409e4 Mon Sep 17 00:00:00 2001 From: Zac de Lusignan <40217480+lusignan@users.noreply.github.com> Date: Sun, 13 Dec 2020 12:50:44 -0800 Subject: [PATCH 07/21] Add themes --- inst/templates/ayu-dark.R | 90 ++++++++++++++++ inst/templates/ayu-dark.scss | 144 +++++++++++++++++++++++++ inst/templates/ayu-light.R | 89 +++++++++++++++ inst/templates/ayu-light.scss | 143 ++++++++++++++++++++++++ inst/templates/ayu-mirage.R | 89 +++++++++++++++ inst/templates/ayu-mirage.scss | 143 ++++++++++++++++++++++++ inst/templates/dracula.R | 84 +++++++++++++++ inst/templates/dracula.scss | 138 ++++++++++++++++++++++++ inst/templates/material-palenight.R | 81 ++++++++++++++ inst/templates/material-palenight.scss | 142 ++++++++++++++++++++++++ 10 files changed, 1143 insertions(+) create mode 100644 inst/templates/ayu-dark.R create mode 100644 inst/templates/ayu-dark.scss create mode 100644 inst/templates/ayu-light.R create mode 100644 inst/templates/ayu-light.scss create mode 100644 inst/templates/ayu-mirage.R create mode 100644 inst/templates/ayu-mirage.scss create mode 100644 inst/templates/dracula.R create mode 100644 inst/templates/dracula.scss create mode 100644 inst/templates/material-palenight.R create mode 100644 inst/templates/material-palenight.scss diff --git a/inst/templates/ayu-dark.R b/inst/templates/ayu-dark.R new file mode 100644 index 0000000..99a5d58 --- /dev/null +++ b/inst/templates/ayu-dark.R @@ -0,0 +1,90 @@ +rstheme( + "Ayu Dark", + theme_dark = TRUE, + theme_flat = TRUE, + theme_path = here::here("inst/templates/ayu-dark.scss"), + theme_apply = TRUE, + theme_as_sass = TRUE, + theme_palette = list( + base00 = "#0D1016", + base01 = "#0A0E14", + base02 = "#4D5566", + base03 = "#4D5566B3", + base04 = "#273747", + base05 = "#B3B1AD", + base06 = "#626A73", + base07 = "#4D556699", + base08 = "#c4c6d4", + yelpur = "#FFEE99", + blue = "#59C2FF", + teal = "#95E6CB", + green = "#C2D94C", + orange01 = "#E6B450", + orange02 = "#FFB454", + orange03 = "#FF8F40", + orange04 = "#E6B673", + orange05 = "#F29668", + pink = "#F07178" + ), + ui_background = "$base01", + ui_foreground = "$base05", + code_string = "$green", + code_function = "$orange02", + code_value = "$orange04", + code_comment = "$base06", + code_variable = "$blue", + code_message = "$teal", + code_reserved = "$orange03", + code_operator = "$orange01", + code_bracket = "$base05", + code_namespace = "$pink", + code_identifier = "$base05", + ui_rstudio_background = "$base00", + ui_rstudio_foreground = "$base02", #options menu text + ui_rstudio_toolbar_foreground = "$base02", #ui text on toolbar. Go to VSCode for better example + ui_rstudio_tabs_active_background = "$base00", + ui_rstudio_tabs_active_foreground = "$base05", #selected tab text + ui_rstudio_tabs_inactive_background = "$base00", + ui_rstudio_job_progress_bar = "$teal", + ui_selection = "$base04", + ui_console_selection = "$base04", + ui_line_active = "$base00", + ui_line_active_selection = "$base03", + ui_margin_line = "$base03", + rmd_chunk_background = "$base00", + ui_cursor = "$orange01", + ui_gutter_foreground = "$base07", + ui_debug_background = "$base03", + rmd_chunk_header = "$green", + rmd_heading_foreground = "$pink", + rmd_href = "$pink", + ui_completions_background = "$base00", + ui_completions_border = "$base00", + ui_completions_foreground = "$base03", + ui_completions_selected_foreground = "$base00", + rstheme_command_palette(), + rstheme_large_tabs(), + rstheme_dialog_options( + selected_foreground = "$base08", + help_foreground = "$base08", + input_foreground = "$code_value", + input_background = "$base01", + select_foreground = "$base06", + select_background = "$base01" + ), + rstheme_rainbow_parentheses( + "$teal", "$pink", "$base05", "$yelpur", "$blue", "$green" + ), + '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $teal inset; + border-radius: 0 !important; + } + } + ', + '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + ' +) \ No newline at end of file diff --git a/inst/templates/ayu-dark.scss b/inst/templates/ayu-dark.scss new file mode 100644 index 0000000..72f8f5e --- /dev/null +++ b/inst/templates/ayu-dark.scss @@ -0,0 +1,144 @@ +/* rs-theme-name: Ayu Dark {rsthemes} */ +/* rs-theme-is-dark: TRUE */ +$base00: #0D1016; +$base01: #0A0E14; +$base02: #4D5566; +$base03: #4D5566B3; +$base04: #273747; +$base05: #B3B1AD; +$base06: #626A73; +$base07: #4D556699; +$base08: #c4c6d4; +$yelpur: #FFEE99; +$blue: #59C2FF; +$teal: #95E6CB; +$green: #C2D94C; +$orange01: #E6B450; +$orange02: #FFB454; +$orange03: #FF8F40; +$orange04: #E6B673; +$orange05: #F29668; +$pink: #F07178; +$ui_background: $base01; +$ui_foreground: $base05; +$code_string: $green; +$code_function: $orange02; +$code_value: $orange04; +$code_variable: $blue; +$code_message: $teal; +$ui_rstudio_background: $base00; +$ui_rstudio_foreground: $base02; +$ui_rstudio_border: $ui_background; +$rmd_chunk_background: $base00; +$ui_rstudio_tabs_inactive_background: $base00; +$ui_rstudio_tabs_inactive_foreground: transparentize($ui_foreground, 0.4); +$ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; +$ui_rstudio_tabs_active_background: $base00; +$ui_rstudio_tabs_active_foreground: $base05; +$ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; +$ui_rstudio_toolbar_foreground: $base02; +$ui_rstudio_search: $ui_rstudio_toolbar_background; +$ui_rstudio_scrollbar_background: $ui_background; +$ui_rstudio_scrollbar_handle: $rmd_chunk_background; +$ui_cursor: $orange01; +$ui_cursor_normal_mode: $ui_cursor; +$ui_gutter_foreground: $base07; +$ui_gutter_background: $ui_background; +$ui_line_active: $base00; +$ui_selection: $base04; +$ui_line_active_selection: $base03; +$ui_line_active_gutter: $ui_background; +$ui_bracket: transparentize($ui_cursor, 0.6); +$ui_invisible: transparentize($ui_foreground, 0.7); +$ui_indent_guide: $ui_invisible; +$ui_margin_line: $base03; +$ui_debug_background: $base03; +$ui_fold_arrows_foreground: $ui_cursor; +$ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); +$ui_line_find: $ui_selection; +$ui_console_selection: $base04; +$ui_completions_background: $base00; +$ui_completions_foreground: $base03; +$ui_completions_border: $base00; +$ui_completions_selected_background: $ui_line_active_selection; +$ui_completions_selected_foreground: $base00; +$ui_rstudio_job_progress_bar: $teal; +$code_comment: $base06; +$code_namespace_font_style: italic; +$code_reserved: $orange03; +$code_operator: $orange01; +$code_bracket: $base05; +$code_namespace: $pink; +$code_identifier: $base05; +$code_string_background: inherit; +$code_function_background: inherit; +$code_value_background: inherit; +$code_variable_background: inherit; +$code_message_background: inherit; +$code_comment_background: inherit; +$code_reserved_background: inherit; +$code_operator_background: inherit; +$code_bracket_background: inherit; +$code_namespace_background: inherit; +$code_identifier_background: inherit; +$code_other: $code_string; +$rmd_heading_weight: 600; +$rmd_heading_foreground: $pink; +$rmd_heading_background: $code_string_background; +$rmd_chunk_header: $green; +$rmd_chunk_header_background: $code_function_background; +$rmd_href: $pink; +$rmd_href_background: $code_reserved_background; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $teal inset; + border-radius: 0 !important; + } + } + +.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + +$ui_command_palette_background: $ui_background; +$ui_command_palette_search_background: $ui_command_palette_background; +$ui_command_palette_border: $ui_command_palette_background; +$ui_command_palette_item_background: $ui_command_palette_background; +$ui_command_palette_item_color: $ui_foreground; +$ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); +$ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); +$ui_rstudio_dialog_background: $ui_rstudio_background; +$ui_rstudio_dialog_foreground: $ui_rstudio_foreground; +$ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); +$ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_selected_foreground: $base08; +$ui_rstudio_dialog_heading_foreground: $code_function; +$ui_rstudio_dialog_help_foreground: $base08; +$ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_button_hover_foreground: lighten($ui_rstudio_dialog_button_foreground, 10%); +$ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); +$ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_input_foreground: $code_value; +$ui_rstudio_dialog_input_background: $base01; +$ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_background: $base01; +$ui_rstudio_dialog_select_foreground: $base06; +$ui_paren_0: $teal; +$ui_paren_1: $pink; +$ui_paren_2: $base05; +$ui_paren_3: $yelpur; +$ui_paren_4: $blue; +$ui_paren_5: $green; +$ui_paren_6: violet; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/ayu-light.R b/inst/templates/ayu-light.R new file mode 100644 index 0000000..3f6bc2f --- /dev/null +++ b/inst/templates/ayu-light.R @@ -0,0 +1,89 @@ +rstheme( + "Ayu Light", + theme_dark = FALSE, + theme_flat = TRUE, + theme_path = here::here("inst/templates/ayu-light.scss"), + theme_apply = TRUE, + theme_as_sass = TRUE, + theme_palette = list( + base00 = "#FFFFFF", + base01 = "#FAFAFA", + base02 = "#8A9199", + base03 = "#8A919959", + base04 = "#D1E4F4", + base05 = "#575F66", + base06 = "#ABB0B6", + base07 = "#8A919966", + purple = "#A37ACC", + blue = "#399EE6", + teal = "#4CBF99", + green = "#86B300", + orange01 = "#FF9940", + orange02 = "#F2AE49", + orange03 = "#FA8D3E", + orange04 = "#E6BA7E", + orange05 = "#ED9366", + pink = "#F07171" + ), + ui_background = "$base01", + ui_foreground = "$base05", + code_string = "$green", + code_function = "$orange02", + code_value = "$purple", + code_comment = "$base06", + code_variable = "$blue", + code_message = "$teal", + code_reserved = "$orange03", + code_operator = "$orange01", + code_bracket = "$base05", + code_namespace = "$pink", + code_identifier = "$base05", + ui_rstudio_background = "$base00", + ui_rstudio_foreground = "$base02", + ui_rstudio_toolbar_foreground = "$base02", + ui_rstudio_tabs_active_background = "$base00", + ui_rstudio_tabs_active_foreground = "$base05", + ui_rstudio_tabs_inactive_background = "$base00", + ui_rstudio_job_progress_bar = "$teal", + ui_selection = "$base04", + ui_console_selection = "$base04", + ui_line_active = "$base00", + ui_line_active_selection = "$base03", + ui_margin_line = "$base03", + rmd_chunk_background = "$base00", + ui_cursor = "$orange01", + ui_gutter_foreground = "$base07", + ui_debug_background = "$base03", + rmd_chunk_header = "$green", + rmd_heading_foreground = "$green", + rmd_href = "$pink", + ui_completions_background = "$base00", + ui_completions_border = "$base00", + ui_completions_foreground = "$base03", + ui_completions_selected_foreground = "$base03", + rstheme_command_palette(), + rstheme_large_tabs(), + rstheme_dialog_options( + selected_foreground = "$base05", + help_foreground = "$base05", + input_foreground = "$code_value", + input_background = "$base01", + select_foreground = "$base06", + select_background = "$base01" + ), + rstheme_rainbow_parentheses( + "$teal", "$pink", "$base05", "$purple", "$blue", "$green" + ), + '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $teal inset; + border-radius: 0 !important; + } + } + ', + '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + ' +) \ No newline at end of file diff --git a/inst/templates/ayu-light.scss b/inst/templates/ayu-light.scss new file mode 100644 index 0000000..0334bcb --- /dev/null +++ b/inst/templates/ayu-light.scss @@ -0,0 +1,143 @@ +/* rs-theme-name: Ayu Light {rsthemes} */ +/* rs-theme-is-dark: FALSE */ +$base00: #FFFFFF; +$base01: #FAFAFA; +$base02: #8A9199; +$base03: #8A919959; +$base04: #D1E4F4; +$base05: #575F66; +$base06: #ABB0B6; +$base07: #8A919966; +$purple: #A37ACC; +$blue: #399EE6; +$teal: #4CBF99; +$green: #86B300; +$orange01: #FF9940; +$orange02: #F2AE49; +$orange03: #FA8D3E; +$orange04: #E6BA7E; +$orange05: #ED9366; +$pink: #F07171; +$ui_background: $base01; +$ui_foreground: $base05; +$code_string: $green; +$code_function: $orange02; +$code_value: $purple; +$code_variable: $blue; +$code_message: $teal; +$ui_rstudio_background: $base00; +$ui_rstudio_foreground: $base02; +$ui_rstudio_border: $ui_background; +$rmd_chunk_background: $base00; +$ui_rstudio_tabs_inactive_background: $base00; +$ui_rstudio_tabs_inactive_foreground: transparentize($ui_foreground, 0.4); +$ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; +$ui_rstudio_tabs_active_background: $base00; +$ui_rstudio_tabs_active_foreground: $base05; +$ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; +$ui_rstudio_toolbar_foreground: $base02; +$ui_rstudio_search: $ui_rstudio_toolbar_background; +$ui_rstudio_scrollbar_background: $ui_background; +$ui_rstudio_scrollbar_handle: $rmd_chunk_background; +$ui_cursor: $orange01; +$ui_cursor_normal_mode: $ui_cursor; +$ui_gutter_foreground: $base07; +$ui_gutter_background: $ui_background; +$ui_line_active: $base00; +$ui_selection: $base04; +$ui_line_active_selection: $base03; +$ui_line_active_gutter: $ui_background; +$ui_bracket: transparentize($ui_cursor, 0.6); +$ui_invisible: transparentize($ui_foreground, 0.7); +$ui_indent_guide: $ui_invisible; +$ui_margin_line: $base03; +$ui_debug_background: $base03; +$ui_fold_arrows_foreground: $ui_cursor; +$ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); +$ui_line_find: $ui_selection; +$ui_console_selection: $base04; +$ui_completions_background: $base00; +$ui_completions_foreground: $base03; +$ui_completions_border: $base00; +$ui_completions_selected_background: $ui_line_active_selection; +$ui_completions_selected_foreground: $base03; +$ui_rstudio_job_progress_bar: $teal; +$code_comment: $base06; +$code_namespace_font_style: italic; +$code_reserved: $orange03; +$code_operator: $orange01; +$code_bracket: $base05; +$code_namespace: $pink; +$code_identifier: $base05; +$code_string_background: inherit; +$code_function_background: inherit; +$code_value_background: inherit; +$code_variable_background: inherit; +$code_message_background: inherit; +$code_comment_background: inherit; +$code_reserved_background: inherit; +$code_operator_background: inherit; +$code_bracket_background: inherit; +$code_namespace_background: inherit; +$code_identifier_background: inherit; +$code_other: $code_string; +$rmd_heading_weight: 600; +$rmd_heading_foreground: $green; +$rmd_heading_background: $code_string_background; +$rmd_chunk_header: $green; +$rmd_chunk_header_background: $code_function_background; +$rmd_href: $pink; +$rmd_href_background: $code_reserved_background; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-light.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-light-flatter.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $teal inset; + border-radius: 0 !important; + } + } + +.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + +$ui_command_palette_background: $ui_background; +$ui_command_palette_search_background: $ui_command_palette_background; +$ui_command_palette_border: $ui_command_palette_background; +$ui_command_palette_item_background: $ui_command_palette_background; +$ui_command_palette_item_color: $ui_foreground; +$ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); +$ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); +$ui_rstudio_dialog_background: $ui_rstudio_background; +$ui_rstudio_dialog_foreground: $ui_rstudio_foreground; +$ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); +$ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_selected_foreground: $base05; +$ui_rstudio_dialog_heading_foreground: $code_function; +$ui_rstudio_dialog_help_foreground: $base05; +$ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_button_hover_foreground: lighten($ui_rstudio_dialog_button_foreground, 10%); +$ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); +$ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_input_foreground: $code_value; +$ui_rstudio_dialog_input_background: $base01; +$ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_background: $base01; +$ui_rstudio_dialog_select_foreground: $base06; +$ui_paren_0: $teal; +$ui_paren_1: $pink; +$ui_paren_2: $base05; +$ui_paren_3: $purple; +$ui_paren_4: $blue; +$ui_paren_5: $green; +$ui_paren_6: violet; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/ayu-mirage.R b/inst/templates/ayu-mirage.R new file mode 100644 index 0000000..e58d294 --- /dev/null +++ b/inst/templates/ayu-mirage.R @@ -0,0 +1,89 @@ +rstheme( + "Ayu Mirage", + theme_dark = TRUE, + theme_flat = TRUE, + theme_path = here::here("inst/templates/ayu-mirage.scss"), + theme_apply = TRUE, + theme_as_sass = TRUE, + theme_palette = list( + base00 = "#232834", + base01 = "#1F2430", + base02 = "#707A8C", + base03 = "#707A8C4D", + base04 = "#33415E", + base05 = "#CBCCC6", + base06 = "#5C6773", + base07 = "#707A8C66", + purple = "#D4BFFF", + blue = "#73D0FF", + teal = "#95E6CB", + green = "#BAE67E", + orange01 = "#FFCC66", + orange02 = "#FFD580", + orange03 = "#FFA759", + orange04 = "#FFE6B3", + orange05 = "#F29E74", + pink = "#F28779" + ), + ui_background = "$base01", + ui_foreground = "$base05", + code_string = "$green", + code_function = "$orange02", + code_value = "$orange04", + code_comment = "$base06", + code_variable = "$blue", + code_message = "$teal", + code_reserved = "$orange03", + code_operator = "$orange01", + code_bracket = "$base05", + code_namespace = "$pink", + code_identifier = "$base05", + ui_rstudio_background = "$base00", + ui_rstudio_foreground = "$base02", + ui_rstudio_toolbar_foreground = "$base02", + ui_rstudio_tabs_active_background = "$base00", + ui_rstudio_tabs_active_foreground = "$base05", + ui_rstudio_tabs_inactive_background = "$base00", + ui_rstudio_job_progress_bar = "$teal", + ui_selection = "$base04", + ui_console_selection = "$base04", + ui_line_active = "$base00", + ui_line_active_selection = "$base03", + ui_margin_line = "$base03", + rmd_chunk_background = "$base00", + ui_cursor = "$orange01", + ui_gutter_foreground = "$base07", + ui_debug_background = "$base03", + rmd_chunk_header = "$green", + rmd_heading_foreground = "$pink", + rmd_href = "$pink", + ui_completions_background = "$base00", + ui_completions_border = "$base00", + ui_completions_foreground = "$base03", + ui_completions_selected_foreground = "$base00", + rstheme_command_palette(), + rstheme_large_tabs(), + rstheme_dialog_options( + selected_foreground = "$base05", + help_foreground = "$base05", + input_foreground = "$code_value", + input_background = "$base01", + select_foreground = "$base06", + select_background = "$base01" + ), + rstheme_rainbow_parentheses( + "$teal", "$pink", "$base05", "$purple", "$blue", "$green" + ), + '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $teal inset; + border-radius: 0 !important; + } + } + ', + '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + ' +) \ No newline at end of file diff --git a/inst/templates/ayu-mirage.scss b/inst/templates/ayu-mirage.scss new file mode 100644 index 0000000..2047030 --- /dev/null +++ b/inst/templates/ayu-mirage.scss @@ -0,0 +1,143 @@ +/* rs-theme-name: Ayu Mirage {rsthemes} */ +/* rs-theme-is-dark: TRUE */ +$base00: #232834; +$base01: #1F2430; +$base02: #707A8C; +$base03: #707A8C4D; +$base04: #33415E; +$base05: #CBCCC6; +$base06: #5C6773; +$base07: #707A8C66; +$purple: #D4BFFF; +$blue: #73D0FF; +$teal: #95E6CB; +$green: #BAE67E; +$orange01: #FFCC66; +$orange02: #FFD580; +$orange03: #FFA759; +$orange04: #FFE6B3; +$orange05: #F29E74; +$pink: #F28779; +$ui_background: $base01; +$ui_foreground: $base05; +$code_string: $green; +$code_function: $orange02; +$code_value: $orange04; +$code_variable: $blue; +$code_message: $teal; +$ui_rstudio_background: $base00; +$ui_rstudio_foreground: $base02; +$ui_rstudio_border: $ui_background; +$rmd_chunk_background: $base00; +$ui_rstudio_tabs_inactive_background: $base00; +$ui_rstudio_tabs_inactive_foreground: transparentize($ui_foreground, 0.4); +$ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; +$ui_rstudio_tabs_active_background: $base00; +$ui_rstudio_tabs_active_foreground: $base05; +$ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; +$ui_rstudio_toolbar_foreground: $base02; +$ui_rstudio_search: $ui_rstudio_toolbar_background; +$ui_rstudio_scrollbar_background: $ui_background; +$ui_rstudio_scrollbar_handle: $rmd_chunk_background; +$ui_cursor: $orange01; +$ui_cursor_normal_mode: $ui_cursor; +$ui_gutter_foreground: $base07; +$ui_gutter_background: $ui_background; +$ui_line_active: $base00; +$ui_selection: $base04; +$ui_line_active_selection: $base03; +$ui_line_active_gutter: $ui_background; +$ui_bracket: transparentize($ui_cursor, 0.6); +$ui_invisible: transparentize($ui_foreground, 0.7); +$ui_indent_guide: $ui_invisible; +$ui_margin_line: $base03; +$ui_debug_background: $base03; +$ui_fold_arrows_foreground: $ui_cursor; +$ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); +$ui_line_find: $ui_selection; +$ui_console_selection: $base04; +$ui_completions_background: $base00; +$ui_completions_foreground: $base03; +$ui_completions_border: $base00; +$ui_completions_selected_background: $ui_line_active_selection; +$ui_completions_selected_foreground: $base00; +$ui_rstudio_job_progress_bar: $teal; +$code_comment: $base06; +$code_namespace_font_style: italic; +$code_reserved: $orange03; +$code_operator: $orange01; +$code_bracket: $base05; +$code_namespace: $pink; +$code_identifier: $base05; +$code_string_background: inherit; +$code_function_background: inherit; +$code_value_background: inherit; +$code_variable_background: inherit; +$code_message_background: inherit; +$code_comment_background: inherit; +$code_reserved_background: inherit; +$code_operator_background: inherit; +$code_bracket_background: inherit; +$code_namespace_background: inherit; +$code_identifier_background: inherit; +$code_other: $code_string; +$rmd_heading_weight: 600; +$rmd_heading_foreground: $pink; +$rmd_heading_background: $code_string_background; +$rmd_chunk_header: $green; +$rmd_chunk_header_background: $code_function_background; +$rmd_href: $pink; +$rmd_href_background: $code_reserved_background; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $teal inset; + border-radius: 0 !important; + } + } + +.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + +$ui_command_palette_background: $ui_background; +$ui_command_palette_search_background: $ui_command_palette_background; +$ui_command_palette_border: $ui_command_palette_background; +$ui_command_palette_item_background: $ui_command_palette_background; +$ui_command_palette_item_color: $ui_foreground; +$ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); +$ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); +$ui_rstudio_dialog_background: $ui_rstudio_background; +$ui_rstudio_dialog_foreground: $ui_rstudio_foreground; +$ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); +$ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_selected_foreground: $base05; +$ui_rstudio_dialog_heading_foreground: $code_function; +$ui_rstudio_dialog_help_foreground: $base05; +$ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_button_hover_foreground: lighten($ui_rstudio_dialog_button_foreground, 10%); +$ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); +$ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_input_foreground: $code_value; +$ui_rstudio_dialog_input_background: $base01; +$ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_background: $base01; +$ui_rstudio_dialog_select_foreground: $base06; +$ui_paren_0: $teal; +$ui_paren_1: $pink; +$ui_paren_2: $base05; +$ui_paren_3: $purple; +$ui_paren_4: $blue; +$ui_paren_5: $green; +$ui_paren_6: violet; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/dracula.R b/inst/templates/dracula.R new file mode 100644 index 0000000..1bf2fa9 --- /dev/null +++ b/inst/templates/dracula.R @@ -0,0 +1,84 @@ +rstheme( + "Dracula", + theme_dark = TRUE, + theme_flat = TRUE, + theme_path = here::here("inst/templates/dracula.scss"), + theme_apply = TRUE, + theme_as_sass = TRUE, + theme_palette = list( + base00 = "#21232D", + base01 = "#282A36", + base02 = "#44475A", + base03 = "#6272A4", + base04 = "#6071A8", + white = "#F8F8F2", + yellow = "#F1FA8C", + cyan = "#8BE9FD", + green = "#50FA7B", + orange = "#FFB86C", + red = "#FF5555", + pink = "#FF79C6", + purple = "#BD93F9" + ), + ui_background = "$base01", + ui_foreground = "mix($base03, $white, 70%)", + code_string = "$yellow", + code_function = "$green", + code_value = "$purple", + code_comment = "$base03", + code_variable = "$orange", + code_message = "$purple", + code_reserved = "$cyan", + code_operator = "$pink", + code_bracket = "$white", + code_namespace = "$pink", + code_identifier = "$white", + ui_rstudio_background = "$base00", + ui_rstudio_foreground = "mix($base03, $white, 70%)", + ui_rstudio_toolbar_foreground = "$base03", + ui_rstudio_tabs_active_background = "$base00", + ui_rstudio_tabs_active_foreground = "$white", + ui_rstudio_tabs_inactive_background = "$base00", + ui_rstudio_job_progress_bar = "$orange", + ui_selection = "$base03", + ui_console_selection = "$base03", + ui_line_active = "$base00", + ui_line_active_selection = "$base03", + ui_margin_line = "$base03", + rmd_chunk_background = "$base00", + ui_cursor = "transparentize($white, 0.25)", + ui_gutter_foreground = "$base04", + ui_debug_background = "$base03", + rmd_chunk_header = "$orange", + rmd_heading_foreground = "$purple", + rmd_href = "$cyan", + ui_completions_background = "$base00", + ui_completions_border = "$base00", + ui_completions_foreground = "$base03", + ui_completions_selected_foreground = "$base00", + rstheme_command_palette(), + rstheme_large_tabs(), + rstheme_dialog_options( + selected_foreground = "$white", + help_foreground = "$white", + input_foreground = "$code_value", + input_background = "$base01", + select_foreground = "$base03", + select_background = "$base01" + ), + rstheme_rainbow_parentheses( + "$cyan", "$pink", "$white", "$yellow", "$red", "$green" + ), + '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $pink inset; + border-radius: 0 !important; + } + } + ', + '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + ' +) \ No newline at end of file diff --git a/inst/templates/dracula.scss b/inst/templates/dracula.scss new file mode 100644 index 0000000..8908161 --- /dev/null +++ b/inst/templates/dracula.scss @@ -0,0 +1,138 @@ +/* rs-theme-name: Dracula {rsthemes} */ +/* rs-theme-is-dark: TRUE */ +$base00: #21232D; +$base01: #282A36; +$base02: #44475A; +$base03: #6272A4; +$base04: #6071A8; +$white: #F8F8F2; +$yellow: #F1FA8C; +$cyan: #8BE9FD; +$green: #50FA7B; +$orange: #FFB86C; +$red: #FF5555; +$pink: #FF79C6; +$purple: #BD93F9; +$ui_background: $base01; +$ui_foreground: mix($base03, $white, 70%); +$code_string: $yellow; +$code_function: $green; +$code_value: $purple; +$code_variable: $orange; +$code_message: $purple; +$ui_rstudio_background: $base00; +$ui_rstudio_foreground: mix($base03, $white, 70%); +$ui_rstudio_border: $ui_background; +$rmd_chunk_background: $base00; +$ui_rstudio_tabs_inactive_background: $base00; +$ui_rstudio_tabs_inactive_foreground: transparentize($ui_foreground, 0.4); +$ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; +$ui_rstudio_tabs_active_background: $base00; +$ui_rstudio_tabs_active_foreground: $white; +$ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; +$ui_rstudio_toolbar_foreground: $base03; +$ui_rstudio_search: $ui_rstudio_toolbar_background; +$ui_rstudio_scrollbar_background: $ui_background; +$ui_rstudio_scrollbar_handle: $rmd_chunk_background; +$ui_cursor: transparentize($white, 0.25); +$ui_cursor_normal_mode: $ui_cursor; +$ui_gutter_foreground: $base04; +$ui_gutter_background: $ui_background; +$ui_line_active: $base00; +$ui_selection: $base03; +$ui_line_active_selection: $base03; +$ui_line_active_gutter: $ui_background; +$ui_bracket: transparentize($ui_cursor, 0.6); +$ui_invisible: transparentize($ui_foreground, 0.7); +$ui_indent_guide: $ui_invisible; +$ui_margin_line: $base03; +$ui_debug_background: $base03; +$ui_fold_arrows_foreground: $ui_cursor; +$ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); +$ui_line_find: $ui_selection; +$ui_console_selection: $base03; +$ui_completions_background: $base00; +$ui_completions_foreground: $base03; +$ui_completions_border: $base00; +$ui_completions_selected_background: $ui_line_active_selection; +$ui_completions_selected_foreground: $base00; +$ui_rstudio_job_progress_bar: $orange; +$code_comment: $base03; +$code_namespace_font_style: italic; +$code_reserved: $cyan; +$code_operator: $pink; +$code_bracket: $white; +$code_namespace: $pink; +$code_identifier: $white; +$code_string_background: inherit; +$code_function_background: inherit; +$code_value_background: inherit; +$code_variable_background: inherit; +$code_message_background: inherit; +$code_comment_background: inherit; +$code_reserved_background: inherit; +$code_operator_background: inherit; +$code_bracket_background: inherit; +$code_namespace_background: inherit; +$code_identifier_background: inherit; +$code_other: $code_string; +$rmd_heading_weight: 600; +$rmd_heading_foreground: $purple; +$rmd_heading_background: $code_string_background; +$rmd_chunk_header: $orange; +$rmd_chunk_header_background: $code_function_background; +$rmd_href: $cyan; +$rmd_href_background: $code_reserved_background; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $pink inset; + border-radius: 0 !important; + } + } + +.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + +$ui_command_palette_background: $ui_background; +$ui_command_palette_search_background: $ui_command_palette_background; +$ui_command_palette_border: $ui_command_palette_background; +$ui_command_palette_item_background: $ui_command_palette_background; +$ui_command_palette_item_color: $ui_foreground; +$ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); +$ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); +$ui_rstudio_dialog_background: $ui_rstudio_background; +$ui_rstudio_dialog_foreground: $ui_rstudio_foreground; +$ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); +$ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_selected_foreground: $white; +$ui_rstudio_dialog_heading_foreground: $code_function; +$ui_rstudio_dialog_help_foreground: $white; +$ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_button_hover_foreground: lighten($ui_rstudio_dialog_button_foreground, 10%); +$ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); +$ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_input_foreground: $code_value; +$ui_rstudio_dialog_input_background: $base01; +$ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_background: $base01; +$ui_rstudio_dialog_select_foreground: $base03; +$ui_paren_0: $cyan; +$ui_paren_1: $pink; +$ui_paren_2: $white; +$ui_paren_3: $yellow; +$ui_paren_4: $red; +$ui_paren_5: $green; +$ui_paren_6: violet; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/material-palenight.R b/inst/templates/material-palenight.R new file mode 100644 index 0000000..f7746f8 --- /dev/null +++ b/inst/templates/material-palenight.R @@ -0,0 +1,81 @@ +rstheme( + "Material Palenight", + theme_dark = TRUE, + theme_flat = TRUE, + theme_path = here::here("inst/templates/material-palenight.scss"), + theme_apply = TRUE, + theme_as_sass = TRUE, + theme_palette = list( + base00 = "#222736", + base01 = "#282E3F", + base02 = "#1c1e26", + base03 = "#232530", + base04 = "#2e303e", + base05 = "#6c6f93", + base06 = "#A5ABD0", + base07 = "#ffffff", + purple = "#C792E9", + blue = "#81AAFF", + sky = "#88DDFE", + aqua = "#84ffff", + teal = "#81D4CC", + green = "#C3E88D", + gold = "#FFC956", + orange = "#F88C6C", + red = "#F07178" + ), + ui_background = "$base01", + ui_foreground = "$base06", + code_string = "$green", + code_function = "$blue", + code_value = "$orange", + code_comment = "$base05", + code_variable = "$gold", + code_message = "$sky", + code_reserved = "$purple", + code_operator = "$sky", + code_namespace = "$red", + code_identifier = "$base06", + ui_rstudio_background = "$base00", + ui_rstudio_foreground = "$base06", + ui_rstudio_toolbar_foreground = "$base05", + ui_rstudio_tabs_active_background = "$base00", + ui_rstudio_tabs_active_foreground = "$base07", + ui_rstudio_tabs_inactive_background = "$base00", + ui_rstudio_tabs_inactive_foreground = "$base06", + ui_rstudio_job_progress_bar = "$blue", + ui_selection = "transparentize($base06, 0.8)", + ui_console_selection = "$base00", + ui_line_active = "$base00", + ui_line_active_selection = "$base03", + ui_margin_line = "$base03", + rmd_chunk_background = "$base00", + ui_cursor = "$gold", + ui_gutter_foreground = "$base04", + ui_debug_background = "$base03", + rmd_chunk_header = "$teal", + rmd_heading_foreground = "$gold", + rmd_href = "$red", + ui_completions_background = "$base01", + ui_completions_border = "$base00", + ui_completions_foreground = "$base07", + ui_completions_selected_foreground = "$base07", + rstheme_command_palette(), + rstheme_large_tabs(), + rstheme_dialog_options(), + rstheme_rainbow_parentheses( + "$gold", "$red", "$purple", "$green", "$blue", "$orange", "$teal" + ), + '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $purple inset; + border-radius: 0 !important; + } + } + ', + '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + ' +) \ No newline at end of file diff --git a/inst/templates/material-palenight.scss b/inst/templates/material-palenight.scss new file mode 100644 index 0000000..bfa8d6c --- /dev/null +++ b/inst/templates/material-palenight.scss @@ -0,0 +1,142 @@ +/* rs-theme-name: Material Palenight {rsthemes} */ +/* rs-theme-is-dark: TRUE */ +$base00: #222736; +$base01: #282E3F; +$base02: #1c1e26; +$base03: #232530; +$base04: #2e303e; +$base05: #6c6f93; +$base06: #A5ABD0; +$base07: #ffffff; +$purple: #C792E9; +$blue: #81AAFF; +$sky: #88DDFE; +$aqua: #84ffff; +$teal: #81D4CC; +$green: #C3E88D; +$gold: #FFC956; +$orange: #F88C6C; +$red: #F07178; +$ui_background: $base01; +$ui_foreground: $base06; +$code_string: $green; +$code_function: $blue; +$code_value: $orange; +$code_variable: $gold; +$code_message: $sky; +$ui_rstudio_background: $base00; +$ui_rstudio_foreground: $base06; +$ui_rstudio_border: $ui_background; +$rmd_chunk_background: $base00; +$ui_rstudio_tabs_inactive_background: $base00; +$ui_rstudio_tabs_inactive_foreground: $base06; +$ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; +$ui_rstudio_tabs_active_background: $base00; +$ui_rstudio_tabs_active_foreground: $base07; +$ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; +$ui_rstudio_toolbar_foreground: $base05; +$ui_rstudio_search: $ui_rstudio_toolbar_background; +$ui_rstudio_scrollbar_background: $ui_background; +$ui_rstudio_scrollbar_handle: $rmd_chunk_background; +$ui_cursor: $gold; +$ui_cursor_normal_mode: $ui_cursor; +$ui_gutter_foreground: $base04; +$ui_gutter_background: $ui_background; +$ui_line_active: $base00; +$ui_selection: transparentize($base06, 0.8); +$ui_line_active_selection: $base03; +$ui_line_active_gutter: $ui_background; +$ui_bracket: transparentize($ui_cursor, 0.6); +$ui_invisible: transparentize($ui_foreground, 0.7); +$ui_indent_guide: $ui_invisible; +$ui_margin_line: $base03; +$ui_debug_background: $base03; +$ui_fold_arrows_foreground: $ui_cursor; +$ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); +$ui_line_find: $ui_selection; +$ui_console_selection: $base00; +$ui_completions_background: $base01; +$ui_completions_foreground: $base07; +$ui_completions_border: $base00; +$ui_completions_selected_background: $ui_line_active_selection; +$ui_completions_selected_foreground: $base07; +$ui_rstudio_job_progress_bar: $blue; +$code_comment: $base05; +$code_namespace_font_style: italic; +$code_reserved: $purple; +$code_operator: $sky; +$code_bracket: $code_function; +$code_namespace: $red; +$code_identifier: $base06; +$code_string_background: inherit; +$code_function_background: inherit; +$code_value_background: inherit; +$code_variable_background: inherit; +$code_message_background: inherit; +$code_comment_background: inherit; +$code_reserved_background: inherit; +$code_operator_background: inherit; +$code_bracket_background: inherit; +$code_namespace_background: inherit; +$code_identifier_background: inherit; +$code_other: $code_string; +$rmd_heading_weight: 600; +$rmd_heading_foreground: $gold; +$rmd_heading_background: $code_string_background; +$rmd_chunk_header: $teal; +$rmd_chunk_header_background: $code_function_background; +$rmd_href: $red; +$rmd_href_background: $code_reserved_background; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $purple inset; + border-radius: 0 !important; + } + } + +.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + +$ui_command_palette_background: $ui_background; +$ui_command_palette_search_background: $ui_command_palette_background; +$ui_command_palette_border: $ui_command_palette_background; +$ui_command_palette_item_background: $ui_command_palette_background; +$ui_command_palette_item_color: $ui_foreground; +$ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); +$ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); +$ui_rstudio_dialog_background: $ui_rstudio_background; +$ui_rstudio_dialog_foreground: $ui_rstudio_foreground; +$ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); +$ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_selected_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_heading_foreground: $code_function; +$ui_rstudio_dialog_help_foreground: $code_value; +$ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_button_hover_foreground: lighten($ui_rstudio_dialog_button_foreground, 10%); +$ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); +$ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_input_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_input_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_foreground: $ui_rstudio_dialog_foreground; +$ui_paren_0: $gold; +$ui_paren_1: $red; +$ui_paren_2: $purple; +$ui_paren_3: $green; +$ui_paren_4: $blue; +$ui_paren_5: $orange; +$ui_paren_6: $teal; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; From 903c16b0fe7849136469cc4c0b226e8f54dfe5ae Mon Sep 17 00:00:00 2001 From: Zac de Lusignan <40217480+lusignan@users.noreply.github.com> Date: Sun, 13 Dec 2020 21:21:58 -0800 Subject: [PATCH 08/21] Fixed gutter coloring --- inst/templates/material-palenight.R | 2 +- inst/templates/material-palenight.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inst/templates/material-palenight.R b/inst/templates/material-palenight.R index f7746f8..57ad62c 100644 --- a/inst/templates/material-palenight.R +++ b/inst/templates/material-palenight.R @@ -51,7 +51,7 @@ rstheme( ui_margin_line = "$base03", rmd_chunk_background = "$base00", ui_cursor = "$gold", - ui_gutter_foreground = "$base04", + ui_gutter_foreground = "mix($base05, $base01, 40%)", ui_debug_background = "$base03", rmd_chunk_header = "$teal", rmd_heading_foreground = "$gold", diff --git a/inst/templates/material-palenight.scss b/inst/templates/material-palenight.scss index bfa8d6c..6e9d08c 100644 --- a/inst/templates/material-palenight.scss +++ b/inst/templates/material-palenight.scss @@ -40,7 +40,7 @@ $ui_rstudio_scrollbar_background: $ui_background; $ui_rstudio_scrollbar_handle: $rmd_chunk_background; $ui_cursor: $gold; $ui_cursor_normal_mode: $ui_cursor; -$ui_gutter_foreground: $base04; +$ui_gutter_foreground: mix($base05, $base01, 40%); $ui_gutter_background: $ui_background; $ui_line_active: $base00; $ui_selection: transparentize($base06, 0.8); From 6674ee55cf4c2555dd75841d89da4256f9d7cec6 Mon Sep 17 00:00:00 2001 From: Zac de Lusignan <40217480+lusignan@users.noreply.github.com> Date: Sat, 19 Dec 2020 20:33:24 -0800 Subject: [PATCH 09/21] Add themes Delete ayu-dark.R Delete ayu-dark.scss Delete ayu-light.R Delete dracula.R Delete material-lighter.R Delete material-darker.scss Delete ayu-mirage.scss Delete material.scss Delete material-palenight.R Delete material-lighter.scss Delete material-darker.R Delete ayu-mirage.R Delete dracula.scss Delete material-ocean.R Delete material-ocean.scss Delete ayu-light.scss Delete material-palenight.scss Delete material.R Add themes --- inst/templates/ayu-dark.R | 17 +-- inst/templates/ayu-dark.scss | 24 ++--- inst/templates/ayu-light.R | 4 +- inst/templates/ayu-light.scss | 18 ++-- inst/templates/ayu-mirage.R | 5 +- inst/templates/ayu-mirage.scss | 18 ++-- inst/templates/dracula.R | 11 +- inst/templates/dracula.scss | 25 +++-- inst/templates/material-darker.R | 88 +++++++++++++++ inst/templates/material-darker.scss | 141 ++++++++++++++++++++++++ inst/templates/material-lighter.R | 89 ++++++++++++++++ inst/templates/material-lighter.scss | 142 +++++++++++++++++++++++++ inst/templates/material-ocean.R | 65 +++++------ inst/templates/material-ocean.scss | 140 ++++++++++++++++++++++++ inst/templates/material-palenight.R | 51 +++++---- inst/templates/material-palenight.scss | 76 +++++++------ inst/templates/material.R | 88 +++++++++++++++ inst/templates/material.scss | 141 ++++++++++++++++++++++++ 18 files changed, 986 insertions(+), 157 deletions(-) create mode 100644 inst/templates/material-darker.R create mode 100644 inst/templates/material-darker.scss create mode 100644 inst/templates/material-lighter.R create mode 100644 inst/templates/material-lighter.scss create mode 100644 inst/templates/material-ocean.scss create mode 100644 inst/templates/material.R create mode 100644 inst/templates/material.scss diff --git a/inst/templates/ayu-dark.R b/inst/templates/ayu-dark.R index 99a5d58..2d59c21 100644 --- a/inst/templates/ayu-dark.R +++ b/inst/templates/ayu-dark.R @@ -15,7 +15,7 @@ rstheme( base06 = "#626A73", base07 = "#4D556699", base08 = "#c4c6d4", - yelpur = "#FFEE99", + yellow = "#FFEE99", blue = "#59C2FF", teal = "#95E6CB", green = "#C2D94C", @@ -40,10 +40,10 @@ rstheme( code_namespace = "$pink", code_identifier = "$base05", ui_rstudio_background = "$base00", - ui_rstudio_foreground = "$base02", #options menu text - ui_rstudio_toolbar_foreground = "$base02", #ui text on toolbar. Go to VSCode for better example + ui_rstudio_foreground = "$base02", + ui_rstudio_toolbar_foreground = "$base02", ui_rstudio_tabs_active_background = "$base00", - ui_rstudio_tabs_active_foreground = "$base05", #selected tab text + ui_rstudio_tabs_active_foreground = "$base05", ui_rstudio_tabs_inactive_background = "$base00", ui_rstudio_job_progress_bar = "$teal", ui_selection = "$base04", @@ -55,7 +55,7 @@ rstheme( ui_cursor = "$orange01", ui_gutter_foreground = "$base07", ui_debug_background = "$base03", - rmd_chunk_header = "$green", + rmd_chunk_header = "$yellow", rmd_heading_foreground = "$pink", rmd_href = "$pink", ui_completions_background = "$base00", @@ -69,11 +69,12 @@ rstheme( help_foreground = "$base08", input_foreground = "$code_value", input_background = "$base01", - select_foreground = "$base06", - select_background = "$base01" + select_foreground = "$base08", + select_background = "$base01", + button_hover_foreground = "$base08" ), rstheme_rainbow_parentheses( - "$teal", "$pink", "$base05", "$yelpur", "$blue", "$green" + "$teal", "$pink", "$base05", "$yellow", "$blue", "$green" ), '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { diff --git a/inst/templates/ayu-dark.scss b/inst/templates/ayu-dark.scss index 72f8f5e..388e29d 100644 --- a/inst/templates/ayu-dark.scss +++ b/inst/templates/ayu-dark.scss @@ -9,7 +9,7 @@ $base05: #B3B1AD; $base06: #626A73; $base07: #4D556699; $base08: #c4c6d4; -$yelpur: #FFEE99; +$yellow: #FFEE99; $blue: #59C2FF; $teal: #95E6CB; $green: #C2D94C; @@ -85,13 +85,13 @@ $code_other: $code_string; $rmd_heading_weight: 600; $rmd_heading_foreground: $pink; $rmd_heading_background: $code_string_background; -$rmd_chunk_header: $green; +$rmd_chunk_header: $yellow; $rmd_chunk_header_background: $code_function_background; $rmd_href: $pink; $rmd_href_background: $code_reserved_background; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $teal inset; @@ -121,7 +121,7 @@ $ui_rstudio_dialog_help_foreground: $base08; $ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; $ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; $ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; -$ui_rstudio_dialog_button_hover_foreground: lighten($ui_rstudio_dialog_button_foreground, 10%); +$ui_rstudio_dialog_button_hover_foreground: $base08; $ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); $ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; $ui_rstudio_dialog_input_foreground: $code_value; @@ -130,15 +130,15 @@ $ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; $ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; $ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); $ui_rstudio_dialog_select_background: $base01; -$ui_rstudio_dialog_select_foreground: $base06; +$ui_rstudio_dialog_select_foreground: $base08; $ui_paren_0: $teal; $ui_paren_1: $pink; $ui_paren_2: $base05; -$ui_paren_3: $yelpur; +$ui_paren_3: $yellow; $ui_paren_4: $blue; $ui_paren_5: $green; $ui_paren_6: violet; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/ayu-light.R b/inst/templates/ayu-light.R index 3f6bc2f..5b06a8e 100644 --- a/inst/templates/ayu-light.R +++ b/inst/templates/ayu-light.R @@ -69,7 +69,9 @@ rstheme( input_foreground = "$code_value", input_background = "$base01", select_foreground = "$base06", - select_background = "$base01" + select_background = "$base01", + button_hover_background = "$base01", + button_hover_foreground = "$base05" ), rstheme_rainbow_parentheses( "$teal", "$pink", "$base05", "$purple", "$blue", "$green" diff --git a/inst/templates/ayu-light.scss b/inst/templates/ayu-light.scss index 0334bcb..c396c66 100644 --- a/inst/templates/ayu-light.scss +++ b/inst/templates/ayu-light.scss @@ -88,9 +88,9 @@ $rmd_chunk_header: $green; $rmd_chunk_header_background: $code_function_background; $rmd_href: $pink; $rmd_href_background: $code_reserved_background; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-light.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-light-flatter.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-light.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-light-flatter.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $teal inset; @@ -120,8 +120,8 @@ $ui_rstudio_dialog_help_foreground: $base05; $ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; $ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; $ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; -$ui_rstudio_dialog_button_hover_foreground: lighten($ui_rstudio_dialog_button_foreground, 10%); -$ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); +$ui_rstudio_dialog_button_hover_foreground: $base05; +$ui_rstudio_dialog_button_hover_background: $base01; $ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; $ui_rstudio_dialog_input_foreground: $code_value; $ui_rstudio_dialog_input_background: $base01; @@ -137,7 +137,7 @@ $ui_paren_3: $purple; $ui_paren_4: $blue; $ui_paren_5: $green; $ui_paren_6: violet; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/ayu-mirage.R b/inst/templates/ayu-mirage.R index e58d294..7a6eb85 100644 --- a/inst/templates/ayu-mirage.R +++ b/inst/templates/ayu-mirage.R @@ -68,8 +68,9 @@ rstheme( help_foreground = "$base05", input_foreground = "$code_value", input_background = "$base01", - select_foreground = "$base06", - select_background = "$base01" + select_foreground = "$base05", + select_background = "$base01", + button_hover_foreground = "$base05" ), rstheme_rainbow_parentheses( "$teal", "$pink", "$base05", "$purple", "$blue", "$green" diff --git a/inst/templates/ayu-mirage.scss b/inst/templates/ayu-mirage.scss index 2047030..028c5b9 100644 --- a/inst/templates/ayu-mirage.scss +++ b/inst/templates/ayu-mirage.scss @@ -88,9 +88,9 @@ $rmd_chunk_header: $green; $rmd_chunk_header_background: $code_function_background; $rmd_href: $pink; $rmd_href_background: $code_reserved_background; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $teal inset; @@ -120,7 +120,7 @@ $ui_rstudio_dialog_help_foreground: $base05; $ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; $ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; $ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; -$ui_rstudio_dialog_button_hover_foreground: lighten($ui_rstudio_dialog_button_foreground, 10%); +$ui_rstudio_dialog_button_hover_foreground: $base05; $ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); $ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; $ui_rstudio_dialog_input_foreground: $code_value; @@ -129,7 +129,7 @@ $ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; $ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; $ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); $ui_rstudio_dialog_select_background: $base01; -$ui_rstudio_dialog_select_foreground: $base06; +$ui_rstudio_dialog_select_foreground: $base05; $ui_paren_0: $teal; $ui_paren_1: $pink; $ui_paren_2: $base05; @@ -137,7 +137,7 @@ $ui_paren_3: $purple; $ui_paren_4: $blue; $ui_paren_5: $green; $ui_paren_6: violet; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/dracula.R b/inst/templates/dracula.R index 1bf2fa9..c098e53 100644 --- a/inst/templates/dracula.R +++ b/inst/templates/dracula.R @@ -10,7 +10,6 @@ rstheme( base01 = "#282A36", base02 = "#44475A", base03 = "#6272A4", - base04 = "#6071A8", white = "#F8F8F2", yellow = "#F1FA8C", cyan = "#8BE9FD", @@ -31,7 +30,7 @@ rstheme( code_reserved = "$cyan", code_operator = "$pink", code_bracket = "$white", - code_namespace = "$pink", + code_namespace = "$orange", code_identifier = "$white", ui_rstudio_background = "$base00", ui_rstudio_foreground = "mix($base03, $white, 70%)", @@ -47,7 +46,7 @@ rstheme( ui_margin_line = "$base03", rmd_chunk_background = "$base00", ui_cursor = "transparentize($white, 0.25)", - ui_gutter_foreground = "$base04", + ui_gutter_foreground = "$base03", ui_debug_background = "$base03", rmd_chunk_header = "$orange", rmd_heading_foreground = "$purple", @@ -60,11 +59,13 @@ rstheme( rstheme_large_tabs(), rstheme_dialog_options( selected_foreground = "$white", + heading_foreground = "$orange", help_foreground = "$white", input_foreground = "$code_value", input_background = "$base01", - select_foreground = "$base03", - select_background = "$base01" + select_foreground = "$white", + select_background = "$base01", + button_hover_foreground = "$white" ), rstheme_rainbow_parentheses( "$cyan", "$pink", "$white", "$yellow", "$red", "$green" diff --git a/inst/templates/dracula.scss b/inst/templates/dracula.scss index 8908161..a1ac8ae 100644 --- a/inst/templates/dracula.scss +++ b/inst/templates/dracula.scss @@ -4,7 +4,6 @@ $base00: #21232D; $base01: #282A36; $base02: #44475A; $base03: #6272A4; -$base04: #6071A8; $white: #F8F8F2; $yellow: #F1FA8C; $cyan: #8BE9FD; @@ -36,7 +35,7 @@ $ui_rstudio_scrollbar_background: $ui_background; $ui_rstudio_scrollbar_handle: $rmd_chunk_background; $ui_cursor: transparentize($white, 0.25); $ui_cursor_normal_mode: $ui_cursor; -$ui_gutter_foreground: $base04; +$ui_gutter_foreground: $base03; $ui_gutter_background: $ui_background; $ui_line_active: $base00; $ui_selection: $base03; @@ -62,7 +61,7 @@ $code_namespace_font_style: italic; $code_reserved: $cyan; $code_operator: $pink; $code_bracket: $white; -$code_namespace: $pink; +$code_namespace: $orange; $code_identifier: $white; $code_string_background: inherit; $code_function_background: inherit; @@ -83,9 +82,9 @@ $rmd_chunk_header: $orange; $rmd_chunk_header_background: $code_function_background; $rmd_href: $cyan; $rmd_href_background: $code_reserved_background; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $pink inset; @@ -110,12 +109,12 @@ $ui_rstudio_dialog_foreground: $ui_rstudio_foreground; $ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); $ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; $ui_rstudio_dialog_selected_foreground: $white; -$ui_rstudio_dialog_heading_foreground: $code_function; +$ui_rstudio_dialog_heading_foreground: $orange; $ui_rstudio_dialog_help_foreground: $white; $ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; $ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; $ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; -$ui_rstudio_dialog_button_hover_foreground: lighten($ui_rstudio_dialog_button_foreground, 10%); +$ui_rstudio_dialog_button_hover_foreground: $white; $ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); $ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; $ui_rstudio_dialog_input_foreground: $code_value; @@ -124,7 +123,7 @@ $ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; $ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; $ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); $ui_rstudio_dialog_select_background: $base01; -$ui_rstudio_dialog_select_foreground: $base03; +$ui_rstudio_dialog_select_foreground: $white; $ui_paren_0: $cyan; $ui_paren_1: $pink; $ui_paren_2: $white; @@ -132,7 +131,7 @@ $ui_paren_3: $yellow; $ui_paren_4: $red; $ui_paren_5: $green; $ui_paren_6: violet; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/material-darker.R b/inst/templates/material-darker.R new file mode 100644 index 0000000..31375da --- /dev/null +++ b/inst/templates/material-darker.R @@ -0,0 +1,88 @@ +rstheme( + "Material Darker", + theme_dark = TRUE, + theme_flat = TRUE, + theme_path = here::here("inst/templates/material-darker.scss"), + theme_apply = TRUE, + theme_as_sass = TRUE, + theme_palette = list( + base00 = "#1B1B1B", + base01 = "#222222", + base02 = "#232530", + base03 = "#616161", + base04 = "#EAFFFF", + base05 = "#ffffff", + base06 = "#848484", + purple = "#C792E9", + blue = "#81AAFF", + sky = "#88DDFE", + aqua = "#84ffff", + teal = "#81D4CC", + green = "#C3E88D", + gold = "#FDCA68", + orange = "#F88C6C", + red = "#F07178" + ), + ui_background = "$base01", + ui_foreground = "$base06", + code_string = "$green", + code_function = "$blue", + code_value = "$orange", + code_comment = "$base03", + code_variable = "$gold", + code_message = "$sky", + code_reserved = "$purple", + code_operator = "$sky", + code_bracket = "$sky", + code_namespace = "$red", + code_identifier = "$base05", + ui_rstudio_background = "$base00", + ui_rstudio_foreground = "$base04", + ui_rstudio_toolbar_foreground = "$base03", + ui_rstudio_tabs_active_background = "$base00", + ui_rstudio_tabs_active_foreground = "$base05", + ui_rstudio_tabs_inactive_background = "$base00", + ui_rstudio_tabs_inactive_foreground = "$base06", + ui_rstudio_job_progress_bar = "$orange", + ui_selection = "mix($base04, $base01, 10%)", + ui_console_selection = "$base00", + ui_line_active = "$base00", + ui_line_active_selection = "$base02", + ui_margin_line = "$base02", + rmd_chunk_background = "$base00", + ui_cursor = "$gold", + ui_gutter_foreground = "mix($base03, $base01, 50%)", + ui_debug_background = "$base02", + rmd_chunk_header = "$teal", + rmd_heading_foreground = "$gold", + rmd_href = "$red", + ui_completions_background = "$base01", + ui_completions_border = "$base00", + ui_completions_foreground = "$base05", + ui_completions_selected_foreground = "$base05", + rstheme_command_palette(), + rstheme_large_tabs(), + rstheme_dialog_options( + heading_foreground = "$orange", + help_foreground = "$base05", + selected_foreground = "$base05", + foreground = "$base06", + input_foreground = "$gold", + button_hover_foreground = "$base05" + ), + rstheme_rainbow_parentheses( + "$blue", "$gold", "$red", "$purple", "$green", "$orange", "$teal" + ), + '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $orange inset; + border-radius: 0 !important; + } + } + ', + '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + ' +) \ No newline at end of file diff --git a/inst/templates/material-darker.scss b/inst/templates/material-darker.scss new file mode 100644 index 0000000..861f23f --- /dev/null +++ b/inst/templates/material-darker.scss @@ -0,0 +1,141 @@ +/* rs-theme-name: Material Darker {rsthemes} */ +/* rs-theme-is-dark: TRUE */ +$base00: #1B1B1B; +$base01: #222222; +$base02: #232530; +$base03: #616161; +$base04: #EAFFFF; +$base05: #ffffff; +$base06: #848484; +$purple: #C792E9; +$blue: #81AAFF; +$sky: #88DDFE; +$aqua: #84ffff; +$teal: #81D4CC; +$green: #C3E88D; +$gold: #FDCA68; +$orange: #F88C6C; +$red: #F07178; +$ui_background: $base01; +$ui_foreground: $base06; +$code_string: $green; +$code_function: $blue; +$code_value: $orange; +$code_variable: $gold; +$code_message: $sky; +$ui_rstudio_background: $base00; +$ui_rstudio_foreground: $base04; +$ui_rstudio_border: $ui_background; +$rmd_chunk_background: $base00; +$ui_rstudio_tabs_inactive_background: $base00; +$ui_rstudio_tabs_inactive_foreground: $base06; +$ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; +$ui_rstudio_tabs_active_background: $base00; +$ui_rstudio_tabs_active_foreground: $base05; +$ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; +$ui_rstudio_toolbar_foreground: $base03; +$ui_rstudio_search: $ui_rstudio_toolbar_background; +$ui_rstudio_scrollbar_background: $ui_background; +$ui_rstudio_scrollbar_handle: $rmd_chunk_background; +$ui_cursor: $gold; +$ui_cursor_normal_mode: $ui_cursor; +$ui_gutter_foreground: mix($base03, $base01, 50%); +$ui_gutter_background: $ui_background; +$ui_line_active: $base00; +$ui_selection: mix($base04, $base01, 10%); +$ui_line_active_selection: $base02; +$ui_line_active_gutter: $ui_background; +$ui_bracket: transparentize($ui_cursor, 0.6); +$ui_invisible: transparentize($ui_foreground, 0.7); +$ui_indent_guide: $ui_invisible; +$ui_margin_line: $base02; +$ui_debug_background: $base02; +$ui_fold_arrows_foreground: $ui_cursor; +$ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); +$ui_line_find: $ui_selection; +$ui_console_selection: $base00; +$ui_completions_background: $base01; +$ui_completions_foreground: $base05; +$ui_completions_border: $base00; +$ui_completions_selected_background: $ui_line_active_selection; +$ui_completions_selected_foreground: $base05; +$ui_rstudio_job_progress_bar: $orange; +$code_comment: $base03; +$code_namespace_font_style: italic; +$code_reserved: $purple; +$code_operator: $sky; +$code_bracket: $sky; +$code_namespace: $red; +$code_identifier: $base05; +$code_string_background: inherit; +$code_function_background: inherit; +$code_value_background: inherit; +$code_variable_background: inherit; +$code_message_background: inherit; +$code_comment_background: inherit; +$code_reserved_background: inherit; +$code_operator_background: inherit; +$code_bracket_background: inherit; +$code_namespace_background: inherit; +$code_identifier_background: inherit; +$code_other: $code_string; +$rmd_heading_weight: 600; +$rmd_heading_foreground: $gold; +$rmd_heading_background: $code_string_background; +$rmd_chunk_header: $teal; +$rmd_chunk_header_background: $code_function_background; +$rmd_href: $red; +$rmd_href_background: $code_reserved_background; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $orange inset; + border-radius: 0 !important; + } + } + +.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + +$ui_command_palette_background: $ui_background; +$ui_command_palette_search_background: $ui_command_palette_background; +$ui_command_palette_border: $ui_command_palette_background; +$ui_command_palette_item_background: $ui_command_palette_background; +$ui_command_palette_item_color: $ui_foreground; +$ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); +$ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); +$ui_rstudio_dialog_background: $ui_rstudio_background; +$ui_rstudio_dialog_foreground: $base06; +$ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); +$ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_selected_foreground: $base05; +$ui_rstudio_dialog_heading_foreground: $orange; +$ui_rstudio_dialog_help_foreground: $base05; +$ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_button_hover_foreground: $base05; +$ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); +$ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_input_foreground: $gold; +$ui_rstudio_dialog_input_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_foreground: $ui_rstudio_dialog_foreground; +$ui_paren_0: $blue; +$ui_paren_1: $gold; +$ui_paren_2: $red; +$ui_paren_3: $purple; +$ui_paren_4: $green; +$ui_paren_5: $orange; +$ui_paren_6: $teal; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/material-lighter.R b/inst/templates/material-lighter.R new file mode 100644 index 0000000..99729f0 --- /dev/null +++ b/inst/templates/material-lighter.R @@ -0,0 +1,89 @@ +rstheme( + "Material Lighter", + theme_dark = FALSE, + theme_flat = TRUE, + theme_path = here::here("inst/templates/material-lighter.scss"), + theme_apply = TRUE, + theme_as_sass = TRUE, + theme_palette = list( + base00 = "#F3F4F5", + base01 = "#FFFFFF", + base02 = "#232530", + base03 = "#4D707B", + base04 = "#EAFFFF", + base05 = "#000000", + base06 = "#8BA4AF", + base07 = "#DAF3F0", + purple = "#AA2DE2", + blue = "#5A82BC", + sky = "#88DDFE", + aqua = "#84ffff", + teal = "#00B0B7", + green = "#87BA48", + gold = "#EE8F00", + orange = "#FF6337", + red = "#F91A27" + ), + ui_background = "$base01", + ui_foreground = "$base06", + code_string = "$green", + code_function = "$blue", + code_value = "$orange", + code_comment = "$base03", + code_variable = "$gold", + code_message = "$sky", + code_reserved = "$purple", + code_operator = "$teal", + code_bracket = "$teal", + code_namespace = "$red", + code_identifier = "$base05", + ui_rstudio_background = "$base00", + ui_rstudio_foreground = "$base04", + ui_rstudio_toolbar_foreground = "$base03", + ui_rstudio_tabs_active_background = "$base00", + ui_rstudio_tabs_active_foreground = "$base05", + ui_rstudio_tabs_inactive_background = "$base00", + ui_rstudio_tabs_inactive_foreground = "$base06", + ui_rstudio_job_progress_bar = "$sky", + ui_selection = "$base07", + ui_console_selection = "$base07", + ui_line_active = "$base00", + ui_line_active_selection = "$base07", + ui_margin_line = "$base02", + rmd_chunk_background = "$base00", + ui_cursor = "$gold", + ui_gutter_foreground = "mix($base03, $base01, 50%)", + ui_debug_background = "$base02", + rmd_chunk_header = "$teal", + rmd_heading_foreground = "$gold", + rmd_href = "$red", + ui_completions_background = "$base01", + ui_completions_border = "$base00", + ui_completions_foreground = "$base05", + ui_completions_selected_foreground = "$base05", + rstheme_command_palette(), + rstheme_large_tabs(), + rstheme_dialog_options( + heading_foreground = "$sky", + help_foreground = "$base05", + selected_foreground = "$base05", + foreground = "$base06", + input_foreground = "$gold", + button_hover_foreground = "$base05" + ), + rstheme_rainbow_parentheses( + "$blue", "$gold", "$red", "$purple", "$green", "$orange", "$teal" + ), + '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $sky inset; + border-radius: 0 !important; + } + } + ', + '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + ' +) \ No newline at end of file diff --git a/inst/templates/material-lighter.scss b/inst/templates/material-lighter.scss new file mode 100644 index 0000000..422bd94 --- /dev/null +++ b/inst/templates/material-lighter.scss @@ -0,0 +1,142 @@ +/* rs-theme-name: Material Lighter {rsthemes} */ +/* rs-theme-is-dark: FALSE */ +$base00: #F3F4F5; +$base01: #FFFFFF; +$base02: #232530; +$base03: #4D707B; +$base04: #EAFFFF; +$base05: #000000; +$base06: #8BA4AF; +$base07: #DAF3F0; +$purple: #AA2DE2; +$blue: #5A82BC; +$sky: #88DDFE; +$aqua: #84ffff; +$teal: #00B0B7; +$green: #87BA48; +$gold: #EE8F00; +$orange: #FF6337; +$red: #F91A27; +$ui_background: $base01; +$ui_foreground: $base06; +$code_string: $green; +$code_function: $blue; +$code_value: $orange; +$code_variable: $gold; +$code_message: $sky; +$ui_rstudio_background: $base00; +$ui_rstudio_foreground: $base04; +$ui_rstudio_border: $ui_background; +$rmd_chunk_background: $base00; +$ui_rstudio_tabs_inactive_background: $base00; +$ui_rstudio_tabs_inactive_foreground: $base06; +$ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; +$ui_rstudio_tabs_active_background: $base00; +$ui_rstudio_tabs_active_foreground: $base05; +$ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; +$ui_rstudio_toolbar_foreground: $base03; +$ui_rstudio_search: $ui_rstudio_toolbar_background; +$ui_rstudio_scrollbar_background: $ui_background; +$ui_rstudio_scrollbar_handle: $rmd_chunk_background; +$ui_cursor: $gold; +$ui_cursor_normal_mode: $ui_cursor; +$ui_gutter_foreground: mix($base03, $base01, 50%); +$ui_gutter_background: $ui_background; +$ui_line_active: $base00; +$ui_selection: $base07; +$ui_line_active_selection: $base07; +$ui_line_active_gutter: $ui_background; +$ui_bracket: transparentize($ui_cursor, 0.6); +$ui_invisible: transparentize($ui_foreground, 0.7); +$ui_indent_guide: $ui_invisible; +$ui_margin_line: $base02; +$ui_debug_background: $base02; +$ui_fold_arrows_foreground: $ui_cursor; +$ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); +$ui_line_find: $ui_selection; +$ui_console_selection: $base07; +$ui_completions_background: $base01; +$ui_completions_foreground: $base05; +$ui_completions_border: $base00; +$ui_completions_selected_background: $ui_line_active_selection; +$ui_completions_selected_foreground: $base05; +$ui_rstudio_job_progress_bar: $sky; +$code_comment: $base03; +$code_namespace_font_style: italic; +$code_reserved: $purple; +$code_operator: $teal; +$code_bracket: $teal; +$code_namespace: $red; +$code_identifier: $base05; +$code_string_background: inherit; +$code_function_background: inherit; +$code_value_background: inherit; +$code_variable_background: inherit; +$code_message_background: inherit; +$code_comment_background: inherit; +$code_reserved_background: inherit; +$code_operator_background: inherit; +$code_bracket_background: inherit; +$code_namespace_background: inherit; +$code_identifier_background: inherit; +$code_other: $code_string; +$rmd_heading_weight: 600; +$rmd_heading_foreground: $gold; +$rmd_heading_background: $code_string_background; +$rmd_chunk_header: $teal; +$rmd_chunk_header_background: $code_function_background; +$rmd_href: $red; +$rmd_href_background: $code_reserved_background; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-light.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-light-flatter.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $sky inset; + border-radius: 0 !important; + } + } + +.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + +$ui_command_palette_background: $ui_background; +$ui_command_palette_search_background: $ui_command_palette_background; +$ui_command_palette_border: $ui_command_palette_background; +$ui_command_palette_item_background: $ui_command_palette_background; +$ui_command_palette_item_color: $ui_foreground; +$ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); +$ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); +$ui_rstudio_dialog_background: $ui_rstudio_background; +$ui_rstudio_dialog_foreground: $base06; +$ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); +$ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_selected_foreground: $base05; +$ui_rstudio_dialog_heading_foreground: $sky; +$ui_rstudio_dialog_help_foreground: $base05; +$ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_button_hover_foreground: $base05; +$ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); +$ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_input_foreground: $gold; +$ui_rstudio_dialog_input_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_foreground: $ui_rstudio_dialog_foreground; +$ui_paren_0: $blue; +$ui_paren_1: $gold; +$ui_paren_2: $red; +$ui_paren_3: $purple; +$ui_paren_4: $green; +$ui_paren_5: $orange; +$ui_paren_6: $teal; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/material-ocean.R b/inst/templates/material-ocean.R index 9e77664..36987f5 100644 --- a/inst/templates/material-ocean.R +++ b/inst/templates/material-ocean.R @@ -8,75 +8,68 @@ rstheme( theme_palette = list( base00 = "#090D14", base01 = "#0F121C", - base02 = "#1c1e26", - base03 = "#232530", - base04 = "#242937", - base05 = "#6c6f93", - base06 = "#A5ABD0", - base07 = "#1F2233", - base08 = "#ffffff", + base02 = "#232530", + base03 = "#6C6F93", + base04 = "#A5ABD0", + base05 = "#ffffff", purple = "#C792E9", blue = "#81AAFF", sky = "#88DDFE", aqua = "#84ffff", teal = "#81D4CC", green = "#C3E88D", - gold = "#FFC956", + gold = "#FDCA68", orange = "#F88C6C", red = "#F07178" ), ui_background = "$base01", - ui_foreground = "$base06", + ui_foreground = "$base04", code_string = "$green", code_function = "$blue", code_value = "$orange", - code_comment = "$base05", + code_comment = "$base03", code_variable = "$gold", code_message = "$sky", code_reserved = "$purple", code_operator = "$sky", + code_bracket = "$sky", code_namespace = "$red", - code_identifier = "$base06", + code_identifier = "$base04", ui_rstudio_background = "$base00", - ui_rstudio_foreground = "$base06", - ui_rstudio_toolbar_foreground = "$base05", + ui_rstudio_foreground = "$base04", + ui_rstudio_toolbar_foreground = "$base03", ui_rstudio_tabs_active_background = "$base00", - ui_rstudio_tabs_active_foreground = "$base08", + ui_rstudio_tabs_active_foreground = "$base05", ui_rstudio_tabs_inactive_background = "$base00", - ui_rstudio_tabs_inactive_foreground = "$base06", - ui_rstudio_job_progress_bar = "$blue", - ui_selection = "$base07", + ui_rstudio_tabs_inactive_foreground = "$base04", + ui_rstudio_job_progress_bar = "$aqua", + ui_selection = "mix($base04, $base01, 10%)", ui_console_selection = "$base00", ui_line_active = "$base00", - ui_line_active_selection = "$base03", - ui_margin_line = "$base03", + ui_line_active_selection = "$base02", + ui_margin_line = "$base02", rmd_chunk_background = "$base00", ui_cursor = "$gold", - ui_gutter_foreground = "$base04", - ui_debug_background = "$base03", + ui_gutter_foreground = "mix($base03, $base01, 50%)", + ui_debug_background = "$base02", rmd_chunk_header = "$teal", rmd_heading_foreground = "$gold", rmd_href = "$red", - ui_completions_background = "$base00", + ui_completions_background = "$base01", ui_completions_border = "$base00", - ui_completions_foreground = "$base08", - ui_completions_selected_foreground = "$base08", - ui_completions_selected_background = "mix($teal, $ui_rstudio_background, 40%)", - rstheme_command_palette( - item_selected_background = "mix($teal, $ui_rstudio_background, 40%)", - item_hover_background = "mix($teal, $ui_rstudio_background, 20%)" - ), + ui_completions_foreground = "$base05", + ui_completions_selected_foreground = "$base05", + rstheme_command_palette(), rstheme_large_tabs(), rstheme_dialog_options( - selected_foreground = "$base08", - help_foreground = "$base08", - input_foreground = "$orange", - input_background = "$base01", - select_foreground = "$base06", - select_background = "$base01" + heading_foreground = "$aqua", + help_foreground = "$base05", + selected_foreground = "$base05", + input_foreground = "$gold", + button_hover_foreground = "$base05" ), rstheme_rainbow_parentheses( - "$gold", "$red", "$purple", "$green", "$blue", "$orange", "$teal" + "$blue", "$gold", "$red", "$purple", "$green", "$orange", "$teal" ), '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { diff --git a/inst/templates/material-ocean.scss b/inst/templates/material-ocean.scss new file mode 100644 index 0000000..0ef8cfd --- /dev/null +++ b/inst/templates/material-ocean.scss @@ -0,0 +1,140 @@ +/* rs-theme-name: Material Ocean {rsthemes} */ +/* rs-theme-is-dark: TRUE */ +$base00: #090D14; +$base01: #0F121C; +$base02: #232530; +$base03: #6C6F93; +$base04: #A5ABD0; +$base05: #ffffff; +$purple: #C792E9; +$blue: #81AAFF; +$sky: #88DDFE; +$aqua: #84ffff; +$teal: #81D4CC; +$green: #C3E88D; +$gold: #FDCA68; +$orange: #F88C6C; +$red: #F07178; +$ui_background: $base01; +$ui_foreground: $base04; +$code_string: $green; +$code_function: $blue; +$code_value: $orange; +$code_variable: $gold; +$code_message: $sky; +$ui_rstudio_background: $base00; +$ui_rstudio_foreground: $base04; +$ui_rstudio_border: $ui_background; +$rmd_chunk_background: $base00; +$ui_rstudio_tabs_inactive_background: $base00; +$ui_rstudio_tabs_inactive_foreground: $base04; +$ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; +$ui_rstudio_tabs_active_background: $base00; +$ui_rstudio_tabs_active_foreground: $base05; +$ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; +$ui_rstudio_toolbar_foreground: $base03; +$ui_rstudio_search: $ui_rstudio_toolbar_background; +$ui_rstudio_scrollbar_background: $ui_background; +$ui_rstudio_scrollbar_handle: $rmd_chunk_background; +$ui_cursor: $gold; +$ui_cursor_normal_mode: $ui_cursor; +$ui_gutter_foreground: mix($base03, $base01, 50%); +$ui_gutter_background: $ui_background; +$ui_line_active: $base00; +$ui_selection: mix($base04, $base01, 10%); +$ui_line_active_selection: $base02; +$ui_line_active_gutter: $ui_background; +$ui_bracket: transparentize($ui_cursor, 0.6); +$ui_invisible: transparentize($ui_foreground, 0.7); +$ui_indent_guide: $ui_invisible; +$ui_margin_line: $base02; +$ui_debug_background: $base02; +$ui_fold_arrows_foreground: $ui_cursor; +$ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); +$ui_line_find: $ui_selection; +$ui_console_selection: $base00; +$ui_completions_background: $base01; +$ui_completions_foreground: $base05; +$ui_completions_border: $base00; +$ui_completions_selected_background: $ui_line_active_selection; +$ui_completions_selected_foreground: $base05; +$ui_rstudio_job_progress_bar: $aqua; +$code_comment: $base03; +$code_namespace_font_style: italic; +$code_reserved: $purple; +$code_operator: $sky; +$code_bracket: $sky; +$code_namespace: $red; +$code_identifier: $base04; +$code_string_background: inherit; +$code_function_background: inherit; +$code_value_background: inherit; +$code_variable_background: inherit; +$code_message_background: inherit; +$code_comment_background: inherit; +$code_reserved_background: inherit; +$code_operator_background: inherit; +$code_bracket_background: inherit; +$code_namespace_background: inherit; +$code_identifier_background: inherit; +$code_other: $code_string; +$rmd_heading_weight: 600; +$rmd_heading_foreground: $gold; +$rmd_heading_background: $code_string_background; +$rmd_chunk_header: $teal; +$rmd_chunk_header_background: $code_function_background; +$rmd_href: $red; +$rmd_href_background: $code_reserved_background; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $aqua inset; + border-radius: 0 !important; + } + } + +.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + +$ui_command_palette_background: $ui_background; +$ui_command_palette_search_background: $ui_command_palette_background; +$ui_command_palette_border: $ui_command_palette_background; +$ui_command_palette_item_background: $ui_command_palette_background; +$ui_command_palette_item_color: $ui_foreground; +$ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); +$ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); +$ui_rstudio_dialog_background: $ui_rstudio_background; +$ui_rstudio_dialog_foreground: $ui_rstudio_foreground; +$ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); +$ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_selected_foreground: $base05; +$ui_rstudio_dialog_heading_foreground: $aqua; +$ui_rstudio_dialog_help_foreground: $base05; +$ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_button_hover_foreground: $base05; +$ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); +$ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_input_foreground: $gold; +$ui_rstudio_dialog_input_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_foreground: $ui_rstudio_dialog_foreground; +$ui_paren_0: $blue; +$ui_paren_1: $gold; +$ui_paren_2: $red; +$ui_paren_3: $purple; +$ui_paren_4: $green; +$ui_paren_5: $orange; +$ui_paren_6: $teal; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/material-palenight.R b/inst/templates/material-palenight.R index 57ad62c..a1e6bbf 100644 --- a/inst/templates/material-palenight.R +++ b/inst/templates/material-palenight.R @@ -8,63 +8,68 @@ rstheme( theme_palette = list( base00 = "#222736", base01 = "#282E3F", - base02 = "#1c1e26", - base03 = "#232530", - base04 = "#2e303e", - base05 = "#6c6f93", - base06 = "#A5ABD0", - base07 = "#ffffff", + base02 = "#232530", + base03 = "#6C6F93", + base04 = "#A5ABD0", + base05 = "#ffffff", purple = "#C792E9", blue = "#81AAFF", sky = "#88DDFE", aqua = "#84ffff", teal = "#81D4CC", green = "#C3E88D", - gold = "#FFC956", + gold = "#FDCA68", orange = "#F88C6C", red = "#F07178" ), ui_background = "$base01", - ui_foreground = "$base06", + ui_foreground = "$base04", code_string = "$green", code_function = "$blue", code_value = "$orange", - code_comment = "$base05", + code_comment = "$base03", code_variable = "$gold", code_message = "$sky", code_reserved = "$purple", code_operator = "$sky", + code_bracket = "$sky", code_namespace = "$red", - code_identifier = "$base06", + code_identifier = "$base04", ui_rstudio_background = "$base00", - ui_rstudio_foreground = "$base06", - ui_rstudio_toolbar_foreground = "$base05", + ui_rstudio_foreground = "$base04", + ui_rstudio_toolbar_foreground = "$base03", ui_rstudio_tabs_active_background = "$base00", - ui_rstudio_tabs_active_foreground = "$base07", + ui_rstudio_tabs_active_foreground = "$base05", ui_rstudio_tabs_inactive_background = "$base00", - ui_rstudio_tabs_inactive_foreground = "$base06", + ui_rstudio_tabs_inactive_foreground = "$base04", ui_rstudio_job_progress_bar = "$blue", - ui_selection = "transparentize($base06, 0.8)", + ui_selection = "mix($base04, $base01, 10%)", ui_console_selection = "$base00", ui_line_active = "$base00", - ui_line_active_selection = "$base03", - ui_margin_line = "$base03", + ui_line_active_selection = "$base02", + ui_margin_line = "$base02", rmd_chunk_background = "$base00", ui_cursor = "$gold", - ui_gutter_foreground = "mix($base05, $base01, 40%)", - ui_debug_background = "$base03", + ui_gutter_foreground = "mix($base03, $base01, 50%)", + ui_debug_background = "$base02", rmd_chunk_header = "$teal", rmd_heading_foreground = "$gold", rmd_href = "$red", ui_completions_background = "$base01", ui_completions_border = "$base00", - ui_completions_foreground = "$base07", - ui_completions_selected_foreground = "$base07", + ui_completions_foreground = "$base05", + ui_completions_selected_foreground = "$base05", rstheme_command_palette(), rstheme_large_tabs(), - rstheme_dialog_options(), + rstheme_dialog_options( + heading_foreground = "$purple", + help_foreground = "$base05", + selected_foreground = "$base05", + input_foreground = "$gold", + button_hover_foreground = "$base05" + ), rstheme_rainbow_parentheses( - "$gold", "$red", "$purple", "$green", "$blue", "$orange", "$teal" + "$blue", "$gold", "$red", "$purple", "$green", "$orange", "$teal" ), '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { diff --git a/inst/templates/material-palenight.scss b/inst/templates/material-palenight.scss index 6e9d08c..9fc3fd0 100644 --- a/inst/templates/material-palenight.scss +++ b/inst/templates/material-palenight.scss @@ -2,72 +2,70 @@ /* rs-theme-is-dark: TRUE */ $base00: #222736; $base01: #282E3F; -$base02: #1c1e26; -$base03: #232530; -$base04: #2e303e; -$base05: #6c6f93; -$base06: #A5ABD0; -$base07: #ffffff; +$base02: #232530; +$base03: #6C6F93; +$base04: #A5ABD0; +$base05: #ffffff; $purple: #C792E9; $blue: #81AAFF; $sky: #88DDFE; $aqua: #84ffff; $teal: #81D4CC; $green: #C3E88D; -$gold: #FFC956; +$gold: #FDCA68; $orange: #F88C6C; $red: #F07178; $ui_background: $base01; -$ui_foreground: $base06; +$ui_foreground: $base04; $code_string: $green; $code_function: $blue; $code_value: $orange; $code_variable: $gold; $code_message: $sky; $ui_rstudio_background: $base00; -$ui_rstudio_foreground: $base06; +$ui_rstudio_foreground: $base04; $ui_rstudio_border: $ui_background; $rmd_chunk_background: $base00; $ui_rstudio_tabs_inactive_background: $base00; -$ui_rstudio_tabs_inactive_foreground: $base06; +$ui_rstudio_tabs_inactive_foreground: $base04; $ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; $ui_rstudio_tabs_active_background: $base00; -$ui_rstudio_tabs_active_foreground: $base07; +$ui_rstudio_tabs_active_foreground: $base05; $ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; -$ui_rstudio_toolbar_foreground: $base05; +$ui_rstudio_toolbar_foreground: $base03; $ui_rstudio_search: $ui_rstudio_toolbar_background; $ui_rstudio_scrollbar_background: $ui_background; $ui_rstudio_scrollbar_handle: $rmd_chunk_background; $ui_cursor: $gold; $ui_cursor_normal_mode: $ui_cursor; -$ui_gutter_foreground: mix($base05, $base01, 40%); +$ui_gutter_foreground: mix($base03, $base01, 50%); $ui_gutter_background: $ui_background; $ui_line_active: $base00; -$ui_selection: transparentize($base06, 0.8); -$ui_line_active_selection: $base03; +$ui_selection: mix($base04, $base01, 10%); +$ui_line_active_selection: $base02; $ui_line_active_gutter: $ui_background; $ui_bracket: transparentize($ui_cursor, 0.6); $ui_invisible: transparentize($ui_foreground, 0.7); $ui_indent_guide: $ui_invisible; -$ui_margin_line: $base03; -$ui_debug_background: $base03; +$ui_margin_line: $base02; +$ui_debug_background: $base02; $ui_fold_arrows_foreground: $ui_cursor; $ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); $ui_line_find: $ui_selection; $ui_console_selection: $base00; $ui_completions_background: $base01; -$ui_completions_foreground: $base07; +$ui_completions_foreground: $base05; $ui_completions_border: $base00; $ui_completions_selected_background: $ui_line_active_selection; -$ui_completions_selected_foreground: $base07; +$ui_completions_selected_foreground: $base05; $ui_rstudio_job_progress_bar: $blue; -$code_comment: $base05; +$code_comment: $base03; $code_namespace_font_style: italic; $code_reserved: $purple; $code_operator: $sky; -$code_bracket: $code_function; +$code_bracket: $sky; $code_namespace: $red; -$code_identifier: $base06; +$code_identifier: $base04; $code_string_background: inherit; $code_function_background: inherit; $code_value_background: inherit; @@ -87,9 +85,9 @@ $rmd_chunk_header: $teal; $rmd_chunk_header_background: $code_function_background; $rmd_href: $red; $rmd_href_background: $code_reserved_background; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $purple inset; @@ -113,30 +111,30 @@ $ui_rstudio_dialog_background: $ui_rstudio_background; $ui_rstudio_dialog_foreground: $ui_rstudio_foreground; $ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); $ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; -$ui_rstudio_dialog_selected_foreground: $ui_rstudio_dialog_foreground; -$ui_rstudio_dialog_heading_foreground: $code_function; -$ui_rstudio_dialog_help_foreground: $code_value; +$ui_rstudio_dialog_selected_foreground: $base05; +$ui_rstudio_dialog_heading_foreground: $purple; +$ui_rstudio_dialog_help_foreground: $base05; $ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; $ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; $ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; -$ui_rstudio_dialog_button_hover_foreground: lighten($ui_rstudio_dialog_button_foreground, 10%); +$ui_rstudio_dialog_button_hover_foreground: $base05; $ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); $ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; -$ui_rstudio_dialog_input_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_input_foreground: $gold; $ui_rstudio_dialog_input_background: $ui_rstudio_dialog_background; $ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; $ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; $ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); $ui_rstudio_dialog_select_background: lighten($ui_rstudio_dialog_background, 5%); $ui_rstudio_dialog_select_foreground: $ui_rstudio_dialog_foreground; -$ui_paren_0: $gold; -$ui_paren_1: $red; -$ui_paren_2: $purple; -$ui_paren_3: $green; -$ui_paren_4: $blue; +$ui_paren_0: $blue; +$ui_paren_1: $gold; +$ui_paren_2: $red; +$ui_paren_3: $purple; +$ui_paren_4: $green; $ui_paren_5: $orange; $ui_paren_6: $teal; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "/Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/material.R b/inst/templates/material.R new file mode 100644 index 0000000..229d238 --- /dev/null +++ b/inst/templates/material.R @@ -0,0 +1,88 @@ +rstheme( + "Material", + theme_dark = TRUE, + theme_flat = TRUE, + theme_path = here::here("inst/templates/material.scss"), + theme_apply = TRUE, + theme_as_sass = TRUE, + theme_palette = list( + base00 = "#162327", + base01 = "#233338", + base02 = "#232530", + base03 = "#4D707B", + base04 = "#EAFFFF", + base05 = "#ffffff", + base06 = "#577C88", + purple = "#C792E9", + blue = "#81AAFF", + sky = "#88DDFE", + aqua = "#84ffff", + teal = "#81D4CC", + green = "#C3E88D", + gold = "#FDCA68", + orange = "#F88C6C", + red = "#F07178" + ), + ui_background = "$base01", + ui_foreground = "$base06", + code_string = "$green", + code_function = "$blue", + code_value = "$orange", + code_comment = "$base03", + code_variable = "$gold", + code_message = "$sky", + code_reserved = "$purple", + code_operator = "$sky", + code_bracket = "$sky", + code_namespace = "$red", + code_identifier = "$base05", + ui_rstudio_background = "$base00", + ui_rstudio_foreground = "$base04", + ui_rstudio_toolbar_foreground = "$base03", + ui_rstudio_tabs_active_background = "$base00", + ui_rstudio_tabs_active_foreground = "$base05", + ui_rstudio_tabs_inactive_background = "$base00", + ui_rstudio_tabs_inactive_foreground = "$base06", + ui_rstudio_job_progress_bar = "$teal", + ui_selection = "mix($base04, $base01, 10%)", + ui_console_selection = "$base00", + ui_line_active = "$base00", + ui_line_active_selection = "$base02", + ui_margin_line = "$base02", + rmd_chunk_background = "$base00", + ui_cursor = "$gold", + ui_gutter_foreground = "mix($base03, $base01, 50%)", + ui_debug_background = "$base02", + rmd_chunk_header = "$teal", + rmd_heading_foreground = "$gold", + rmd_href = "$red", + ui_completions_background = "$base01", + ui_completions_border = "$base00", + ui_completions_foreground = "$base05", + ui_completions_selected_foreground = "$base05", + rstheme_command_palette(), + rstheme_large_tabs(), + rstheme_dialog_options( + heading_foreground = "$teal", + help_foreground = "$base05", + selected_foreground = "$base05", + foreground = "$base06", + input_foreground = "$gold", + button_hover_foreground = "$base05" + ), + rstheme_rainbow_parentheses( + "$blue", "$gold", "$red", "$purple", "$green", "$orange", "$teal" + ), + '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $teal inset; + border-radius: 0 !important; + } + } + ', + '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + ' +) \ No newline at end of file diff --git a/inst/templates/material.scss b/inst/templates/material.scss new file mode 100644 index 0000000..1ce7357 --- /dev/null +++ b/inst/templates/material.scss @@ -0,0 +1,141 @@ +/* rs-theme-name: Material {rsthemes} */ +/* rs-theme-is-dark: TRUE */ +$base00: #162327; +$base01: #233338; +$base02: #232530; +$base03: #4D707B; +$base04: #EAFFFF; +$base05: #ffffff; +$base06: #577C88; +$purple: #C792E9; +$blue: #81AAFF; +$sky: #88DDFE; +$aqua: #84ffff; +$teal: #81D4CC; +$green: #C3E88D; +$gold: #FDCA68; +$orange: #F88C6C; +$red: #F07178; +$ui_background: $base01; +$ui_foreground: $base06; +$code_string: $green; +$code_function: $blue; +$code_value: $orange; +$code_variable: $gold; +$code_message: $sky; +$ui_rstudio_background: $base00; +$ui_rstudio_foreground: $base04; +$ui_rstudio_border: $ui_background; +$rmd_chunk_background: $base00; +$ui_rstudio_tabs_inactive_background: $base00; +$ui_rstudio_tabs_inactive_foreground: $base06; +$ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; +$ui_rstudio_tabs_active_background: $base00; +$ui_rstudio_tabs_active_foreground: $base05; +$ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; +$ui_rstudio_toolbar_foreground: $base03; +$ui_rstudio_search: $ui_rstudio_toolbar_background; +$ui_rstudio_scrollbar_background: $ui_background; +$ui_rstudio_scrollbar_handle: $rmd_chunk_background; +$ui_cursor: $gold; +$ui_cursor_normal_mode: $ui_cursor; +$ui_gutter_foreground: mix($base03, $base01, 50%); +$ui_gutter_background: $ui_background; +$ui_line_active: $base00; +$ui_selection: mix($base04, $base01, 10%); +$ui_line_active_selection: $base02; +$ui_line_active_gutter: $ui_background; +$ui_bracket: transparentize($ui_cursor, 0.6); +$ui_invisible: transparentize($ui_foreground, 0.7); +$ui_indent_guide: $ui_invisible; +$ui_margin_line: $base02; +$ui_debug_background: $base02; +$ui_fold_arrows_foreground: $ui_cursor; +$ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); +$ui_line_find: $ui_selection; +$ui_console_selection: $base00; +$ui_completions_background: $base01; +$ui_completions_foreground: $base05; +$ui_completions_border: $base00; +$ui_completions_selected_background: $ui_line_active_selection; +$ui_completions_selected_foreground: $base05; +$ui_rstudio_job_progress_bar: $teal; +$code_comment: $base03; +$code_namespace_font_style: italic; +$code_reserved: $purple; +$code_operator: $sky; +$code_bracket: $sky; +$code_namespace: $red; +$code_identifier: $base05; +$code_string_background: inherit; +$code_function_background: inherit; +$code_value_background: inherit; +$code_variable_background: inherit; +$code_message_background: inherit; +$code_comment_background: inherit; +$code_reserved_background: inherit; +$code_operator_background: inherit; +$code_bracket_background: inherit; +$code_namespace_background: inherit; +$code_identifier_background: inherit; +$code_other: $code_string; +$rmd_heading_weight: 600; +$rmd_heading_foreground: $gold; +$rmd_heading_background: $code_string_background; +$rmd_chunk_header: $teal; +$rmd_chunk_header_background: $code_function_background; +$rmd_href: $red; +$rmd_href_background: $code_reserved_background; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { + box-shadow: 0 -2px 0 $teal inset; + border-radius: 0 !important; + } + } + +.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + background-color: $base00 !important; + border-color: $base00 !important; + } + +$ui_command_palette_background: $ui_background; +$ui_command_palette_search_background: $ui_command_palette_background; +$ui_command_palette_border: $ui_command_palette_background; +$ui_command_palette_item_background: $ui_command_palette_background; +$ui_command_palette_item_color: $ui_foreground; +$ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); +$ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); +$ui_rstudio_dialog_background: $ui_rstudio_background; +$ui_rstudio_dialog_foreground: $base06; +$ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); +$ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_selected_foreground: $base05; +$ui_rstudio_dialog_heading_foreground: $teal; +$ui_rstudio_dialog_help_foreground: $base05; +$ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_button_hover_foreground: $base05; +$ui_rstudio_dialog_button_hover_background: lighten($ui_rstudio_dialog_button_background, 10%); +$ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_input_foreground: $gold; +$ui_rstudio_dialog_input_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_input_border: $ui_rstudio_dialog_border; +$ui_rstudio_dialog_checkbox_foreground: $ui_rstudio_dialog_foreground; +$ui_rstudio_dialog_checkbox_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_background: lighten($ui_rstudio_dialog_background, 5%); +$ui_rstudio_dialog_select_foreground: $ui_rstudio_dialog_foreground; +$ui_paren_0: $blue; +$ui_paren_1: $gold; +$ui_paren_2: $red; +$ui_paren_3: $purple; +$ui_paren_4: $green; +$ui_paren_5: $orange; +$ui_paren_6: $teal; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; +@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; From d84fe0d119c3a7a67535a2c5037d77cd88afa8fa Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Tue, 22 Dec 2020 16:07:06 -0500 Subject: [PATCH 10/21] Fix paths and add template make script --- inst/templates/ayu-dark.R | 4 ++-- inst/templates/ayu-dark.scss | 14 +++++++------- inst/templates/ayu-light.R | 4 ++-- inst/templates/ayu-light.scss | 14 +++++++------- inst/templates/ayu-mirage.scss | 14 +++++++------- inst/templates/dracula.scss | 14 +++++++------- inst/templates/make.R | 8 ++++++++ inst/templates/material-darker.scss | 14 +++++++------- inst/templates/material-lighter.scss | 14 +++++++------- inst/templates/material-ocean.scss | 14 +++++++------- inst/templates/material-palenight.scss | 14 +++++++------- inst/templates/material.scss | 14 +++++++------- 12 files changed, 75 insertions(+), 67 deletions(-) create mode 100644 inst/templates/make.R diff --git a/inst/templates/ayu-dark.R b/inst/templates/ayu-dark.R index 2d59c21..a7e276a 100644 --- a/inst/templates/ayu-dark.R +++ b/inst/templates/ayu-dark.R @@ -23,7 +23,7 @@ rstheme( orange02 = "#FFB454", orange03 = "#FF8F40", orange04 = "#E6B673", - orange05 = "#F29668", + orange05 = "#F29668", pink = "#F07178" ), ui_background = "$base01", @@ -88,4 +88,4 @@ rstheme( border-color: $base00 !important; } ' -) \ No newline at end of file +) diff --git a/inst/templates/ayu-dark.scss b/inst/templates/ayu-dark.scss index 388e29d..492db21 100644 --- a/inst/templates/ayu-dark.scss +++ b/inst/templates/ayu-dark.scss @@ -89,9 +89,9 @@ $rmd_chunk_header: $yellow; $rmd_chunk_header_background: $code_function_background; $rmd_href: $pink; $rmd_href_background: $code_reserved_background; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "rstudio/_rstudio-dark.scss"; +@import "rstudio/_rstudio-dark-flatter.scss"; +@import "rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $teal inset; @@ -138,7 +138,7 @@ $ui_paren_3: $yellow; $ui_paren_4: $blue; $ui_paren_5: $green; $ui_paren_6: violet; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "rstudio/_command-palette.scss"; +@import "rstudio/_large-tabs.scss"; +@import "rstudio/_dialog-options.scss"; +@import "rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/ayu-light.R b/inst/templates/ayu-light.R index 5b06a8e..7822d67 100644 --- a/inst/templates/ayu-light.R +++ b/inst/templates/ayu-light.R @@ -22,7 +22,7 @@ rstheme( orange02 = "#F2AE49", orange03 = "#FA8D3E", orange04 = "#E6BA7E", - orange05 = "#ED9366", + orange05 = "#ED9366", pink = "#F07171" ), ui_background = "$base01", @@ -88,4 +88,4 @@ rstheme( border-color: $base00 !important; } ' -) \ No newline at end of file +) diff --git a/inst/templates/ayu-light.scss b/inst/templates/ayu-light.scss index c396c66..6f93c25 100644 --- a/inst/templates/ayu-light.scss +++ b/inst/templates/ayu-light.scss @@ -88,9 +88,9 @@ $rmd_chunk_header: $green; $rmd_chunk_header_background: $code_function_background; $rmd_href: $pink; $rmd_href_background: $code_reserved_background; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-light.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-light-flatter.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "rstudio/_rstudio-light.scss"; +@import "rstudio/_rstudio-light-flatter.scss"; +@import "rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $teal inset; @@ -137,7 +137,7 @@ $ui_paren_3: $purple; $ui_paren_4: $blue; $ui_paren_5: $green; $ui_paren_6: violet; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "rstudio/_command-palette.scss"; +@import "rstudio/_large-tabs.scss"; +@import "rstudio/_dialog-options.scss"; +@import "rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/ayu-mirage.scss b/inst/templates/ayu-mirage.scss index 028c5b9..18dbfcf 100644 --- a/inst/templates/ayu-mirage.scss +++ b/inst/templates/ayu-mirage.scss @@ -88,9 +88,9 @@ $rmd_chunk_header: $green; $rmd_chunk_header_background: $code_function_background; $rmd_href: $pink; $rmd_href_background: $code_reserved_background; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "rstudio/_rstudio-dark.scss"; +@import "rstudio/_rstudio-dark-flatter.scss"; +@import "rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $teal inset; @@ -137,7 +137,7 @@ $ui_paren_3: $purple; $ui_paren_4: $blue; $ui_paren_5: $green; $ui_paren_6: violet; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "rstudio/_command-palette.scss"; +@import "rstudio/_large-tabs.scss"; +@import "rstudio/_dialog-options.scss"; +@import "rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/dracula.scss b/inst/templates/dracula.scss index a1ac8ae..261f1ab8 100644 --- a/inst/templates/dracula.scss +++ b/inst/templates/dracula.scss @@ -82,9 +82,9 @@ $rmd_chunk_header: $orange; $rmd_chunk_header_background: $code_function_background; $rmd_href: $cyan; $rmd_href_background: $code_reserved_background; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "rstudio/_rstudio-dark.scss"; +@import "rstudio/_rstudio-dark-flatter.scss"; +@import "rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $pink inset; @@ -131,7 +131,7 @@ $ui_paren_3: $yellow; $ui_paren_4: $red; $ui_paren_5: $green; $ui_paren_6: violet; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "rstudio/_command-palette.scss"; +@import "rstudio/_large-tabs.scss"; +@import "rstudio/_dialog-options.scss"; +@import "rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/make.R b/inst/templates/make.R new file mode 100644 index 0000000..e3f2d67 --- /dev/null +++ b/inst/templates/make.R @@ -0,0 +1,8 @@ +devtools::load_all() + +r_files <- fs::dir_ls("inst/templates/", regexp = "R$") + +purrr::walk(r_files, source) + +make_rsthemes() +install_rsthemes() diff --git a/inst/templates/material-darker.scss b/inst/templates/material-darker.scss index 861f23f..aa77cdd 100644 --- a/inst/templates/material-darker.scss +++ b/inst/templates/material-darker.scss @@ -86,9 +86,9 @@ $rmd_chunk_header: $teal; $rmd_chunk_header_background: $code_function_background; $rmd_href: $red; $rmd_href_background: $code_reserved_background; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "rstudio/_rstudio-dark.scss"; +@import "rstudio/_rstudio-dark-flatter.scss"; +@import "rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $orange inset; @@ -135,7 +135,7 @@ $ui_paren_3: $purple; $ui_paren_4: $green; $ui_paren_5: $orange; $ui_paren_6: $teal; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "rstudio/_command-palette.scss"; +@import "rstudio/_large-tabs.scss"; +@import "rstudio/_dialog-options.scss"; +@import "rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/material-lighter.scss b/inst/templates/material-lighter.scss index 422bd94..e3d750e 100644 --- a/inst/templates/material-lighter.scss +++ b/inst/templates/material-lighter.scss @@ -87,9 +87,9 @@ $rmd_chunk_header: $teal; $rmd_chunk_header_background: $code_function_background; $rmd_href: $red; $rmd_href_background: $code_reserved_background; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-light.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-light-flatter.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "rstudio/_rstudio-light.scss"; +@import "rstudio/_rstudio-light-flatter.scss"; +@import "rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $sky inset; @@ -136,7 +136,7 @@ $ui_paren_3: $purple; $ui_paren_4: $green; $ui_paren_5: $orange; $ui_paren_6: $teal; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "rstudio/_command-palette.scss"; +@import "rstudio/_large-tabs.scss"; +@import "rstudio/_dialog-options.scss"; +@import "rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/material-ocean.scss b/inst/templates/material-ocean.scss index 0ef8cfd..5f6e5b6 100644 --- a/inst/templates/material-ocean.scss +++ b/inst/templates/material-ocean.scss @@ -85,9 +85,9 @@ $rmd_chunk_header: $teal; $rmd_chunk_header_background: $code_function_background; $rmd_href: $red; $rmd_href_background: $code_reserved_background; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "rstudio/_rstudio-dark.scss"; +@import "rstudio/_rstudio-dark-flatter.scss"; +@import "rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $aqua inset; @@ -134,7 +134,7 @@ $ui_paren_3: $purple; $ui_paren_4: $green; $ui_paren_5: $orange; $ui_paren_6: $teal; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "rstudio/_command-palette.scss"; +@import "rstudio/_large-tabs.scss"; +@import "rstudio/_dialog-options.scss"; +@import "rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/material-palenight.scss b/inst/templates/material-palenight.scss index 9fc3fd0..800ea35 100644 --- a/inst/templates/material-palenight.scss +++ b/inst/templates/material-palenight.scss @@ -85,9 +85,9 @@ $rmd_chunk_header: $teal; $rmd_chunk_header_background: $code_function_background; $rmd_href: $red; $rmd_href_background: $code_reserved_background; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "rstudio/_rstudio-dark.scss"; +@import "rstudio/_rstudio-dark-flatter.scss"; +@import "rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $purple inset; @@ -134,7 +134,7 @@ $ui_paren_3: $purple; $ui_paren_4: $green; $ui_paren_5: $orange; $ui_paren_6: $teal; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "rstudio/_command-palette.scss"; +@import "rstudio/_large-tabs.scss"; +@import "rstudio/_dialog-options.scss"; +@import "rstudio/_rainbow-parens.scss"; diff --git a/inst/templates/material.scss b/inst/templates/material.scss index 1ce7357..4c17e4c 100644 --- a/inst/templates/material.scss +++ b/inst/templates/material.scss @@ -86,9 +86,9 @@ $rmd_chunk_header: $teal; $rmd_chunk_header_background: $code_function_background; $rmd_href: $red; $rmd_href_background: $code_reserved_background; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rstudio-dark-flatter.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_terminal.scss"; +@import "rstudio/_rstudio-dark.scss"; +@import "rstudio/_rstudio-dark-flatter.scss"; +@import "rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { box-shadow: 0 -2px 0 $teal inset; @@ -135,7 +135,7 @@ $ui_paren_3: $purple; $ui_paren_4: $green; $ui_paren_5: $orange; $ui_paren_6: $teal; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_command-palette.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_large-tabs.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_dialog-options.scss"; -@import "../../../../../../../../Library/Frameworks/R.framework/Versions/3.6/Resources/library/rsthemes/templates/rstudio/_rainbow-parens.scss"; +@import "rstudio/_command-palette.scss"; +@import "rstudio/_large-tabs.scss"; +@import "rstudio/_dialog-options.scss"; +@import "rstudio/_rainbow-parens.scss"; From 2a29f65cf338734326973715939bf7bbfef5f4e9 Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Wed, 6 Jan 2021 22:18:50 -0500 Subject: [PATCH 11/21] Refactor material theme into one R script --- R/create.R | 2 + inst/templates/material-darker.R | 88 ---------- inst/templates/material-lighter.R | 89 ---------- inst/templates/material-ocean.R | 86 --------- inst/templates/material-palenight.R | 86 --------- inst/templates/material.R | 263 ++++++++++++++++++++-------- 6 files changed, 196 insertions(+), 418 deletions(-) delete mode 100644 inst/templates/material-darker.R delete mode 100644 inst/templates/material-lighter.R delete mode 100644 inst/templates/material-ocean.R delete mode 100644 inst/templates/material-palenight.R diff --git a/R/create.R b/R/create.R index 14de4fb..efcd5c7 100644 --- a/R/create.R +++ b/R/create.R @@ -190,6 +190,8 @@ rstheme <- function( fn_args_not_theme <- grep("^theme_", names(formals()), value = TRUE) fn_args_not_theme <- c(fn_args_not_theme, "...") theme_variables <- call_values[setdiff(names(call_values), fn_args_not_theme)] + # force evaluatation of all theme_variables now + theme_variables <- lapply(theme_variables, eval, envir = new.env()) path_rel_theme <- function(path) { if (!theme_as_sass || is.null(theme_path)) return(path) diff --git a/inst/templates/material-darker.R b/inst/templates/material-darker.R deleted file mode 100644 index 31375da..0000000 --- a/inst/templates/material-darker.R +++ /dev/null @@ -1,88 +0,0 @@ -rstheme( - "Material Darker", - theme_dark = TRUE, - theme_flat = TRUE, - theme_path = here::here("inst/templates/material-darker.scss"), - theme_apply = TRUE, - theme_as_sass = TRUE, - theme_palette = list( - base00 = "#1B1B1B", - base01 = "#222222", - base02 = "#232530", - base03 = "#616161", - base04 = "#EAFFFF", - base05 = "#ffffff", - base06 = "#848484", - purple = "#C792E9", - blue = "#81AAFF", - sky = "#88DDFE", - aqua = "#84ffff", - teal = "#81D4CC", - green = "#C3E88D", - gold = "#FDCA68", - orange = "#F88C6C", - red = "#F07178" - ), - ui_background = "$base01", - ui_foreground = "$base06", - code_string = "$green", - code_function = "$blue", - code_value = "$orange", - code_comment = "$base03", - code_variable = "$gold", - code_message = "$sky", - code_reserved = "$purple", - code_operator = "$sky", - code_bracket = "$sky", - code_namespace = "$red", - code_identifier = "$base05", - ui_rstudio_background = "$base00", - ui_rstudio_foreground = "$base04", - ui_rstudio_toolbar_foreground = "$base03", - ui_rstudio_tabs_active_background = "$base00", - ui_rstudio_tabs_active_foreground = "$base05", - ui_rstudio_tabs_inactive_background = "$base00", - ui_rstudio_tabs_inactive_foreground = "$base06", - ui_rstudio_job_progress_bar = "$orange", - ui_selection = "mix($base04, $base01, 10%)", - ui_console_selection = "$base00", - ui_line_active = "$base00", - ui_line_active_selection = "$base02", - ui_margin_line = "$base02", - rmd_chunk_background = "$base00", - ui_cursor = "$gold", - ui_gutter_foreground = "mix($base03, $base01, 50%)", - ui_debug_background = "$base02", - rmd_chunk_header = "$teal", - rmd_heading_foreground = "$gold", - rmd_href = "$red", - ui_completions_background = "$base01", - ui_completions_border = "$base00", - ui_completions_foreground = "$base05", - ui_completions_selected_foreground = "$base05", - rstheme_command_palette(), - rstheme_large_tabs(), - rstheme_dialog_options( - heading_foreground = "$orange", - help_foreground = "$base05", - selected_foreground = "$base05", - foreground = "$base06", - input_foreground = "$gold", - button_hover_foreground = "$base05" - ), - rstheme_rainbow_parentheses( - "$blue", "$gold", "$red", "$purple", "$green", "$orange", "$teal" - ), - '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { - .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { - box-shadow: 0 -2px 0 $orange inset; - border-radius: 0 !important; - } - } - ', - '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { - background-color: $base00 !important; - border-color: $base00 !important; - } - ' -) \ No newline at end of file diff --git a/inst/templates/material-lighter.R b/inst/templates/material-lighter.R deleted file mode 100644 index 99729f0..0000000 --- a/inst/templates/material-lighter.R +++ /dev/null @@ -1,89 +0,0 @@ -rstheme( - "Material Lighter", - theme_dark = FALSE, - theme_flat = TRUE, - theme_path = here::here("inst/templates/material-lighter.scss"), - theme_apply = TRUE, - theme_as_sass = TRUE, - theme_palette = list( - base00 = "#F3F4F5", - base01 = "#FFFFFF", - base02 = "#232530", - base03 = "#4D707B", - base04 = "#EAFFFF", - base05 = "#000000", - base06 = "#8BA4AF", - base07 = "#DAF3F0", - purple = "#AA2DE2", - blue = "#5A82BC", - sky = "#88DDFE", - aqua = "#84ffff", - teal = "#00B0B7", - green = "#87BA48", - gold = "#EE8F00", - orange = "#FF6337", - red = "#F91A27" - ), - ui_background = "$base01", - ui_foreground = "$base06", - code_string = "$green", - code_function = "$blue", - code_value = "$orange", - code_comment = "$base03", - code_variable = "$gold", - code_message = "$sky", - code_reserved = "$purple", - code_operator = "$teal", - code_bracket = "$teal", - code_namespace = "$red", - code_identifier = "$base05", - ui_rstudio_background = "$base00", - ui_rstudio_foreground = "$base04", - ui_rstudio_toolbar_foreground = "$base03", - ui_rstudio_tabs_active_background = "$base00", - ui_rstudio_tabs_active_foreground = "$base05", - ui_rstudio_tabs_inactive_background = "$base00", - ui_rstudio_tabs_inactive_foreground = "$base06", - ui_rstudio_job_progress_bar = "$sky", - ui_selection = "$base07", - ui_console_selection = "$base07", - ui_line_active = "$base00", - ui_line_active_selection = "$base07", - ui_margin_line = "$base02", - rmd_chunk_background = "$base00", - ui_cursor = "$gold", - ui_gutter_foreground = "mix($base03, $base01, 50%)", - ui_debug_background = "$base02", - rmd_chunk_header = "$teal", - rmd_heading_foreground = "$gold", - rmd_href = "$red", - ui_completions_background = "$base01", - ui_completions_border = "$base00", - ui_completions_foreground = "$base05", - ui_completions_selected_foreground = "$base05", - rstheme_command_palette(), - rstheme_large_tabs(), - rstheme_dialog_options( - heading_foreground = "$sky", - help_foreground = "$base05", - selected_foreground = "$base05", - foreground = "$base06", - input_foreground = "$gold", - button_hover_foreground = "$base05" - ), - rstheme_rainbow_parentheses( - "$blue", "$gold", "$red", "$purple", "$green", "$orange", "$teal" - ), - '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { - .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { - box-shadow: 0 -2px 0 $sky inset; - border-radius: 0 !important; - } - } - ', - '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { - background-color: $base00 !important; - border-color: $base00 !important; - } - ' -) \ No newline at end of file diff --git a/inst/templates/material-ocean.R b/inst/templates/material-ocean.R deleted file mode 100644 index 36987f5..0000000 --- a/inst/templates/material-ocean.R +++ /dev/null @@ -1,86 +0,0 @@ -rstheme( - "Material Ocean", - theme_dark = TRUE, - theme_flat = TRUE, - theme_path = here::here("inst/templates/material-ocean.scss"), - theme_apply = TRUE, - theme_as_sass = TRUE, - theme_palette = list( - base00 = "#090D14", - base01 = "#0F121C", - base02 = "#232530", - base03 = "#6C6F93", - base04 = "#A5ABD0", - base05 = "#ffffff", - purple = "#C792E9", - blue = "#81AAFF", - sky = "#88DDFE", - aqua = "#84ffff", - teal = "#81D4CC", - green = "#C3E88D", - gold = "#FDCA68", - orange = "#F88C6C", - red = "#F07178" - ), - ui_background = "$base01", - ui_foreground = "$base04", - code_string = "$green", - code_function = "$blue", - code_value = "$orange", - code_comment = "$base03", - code_variable = "$gold", - code_message = "$sky", - code_reserved = "$purple", - code_operator = "$sky", - code_bracket = "$sky", - code_namespace = "$red", - code_identifier = "$base04", - ui_rstudio_background = "$base00", - ui_rstudio_foreground = "$base04", - ui_rstudio_toolbar_foreground = "$base03", - ui_rstudio_tabs_active_background = "$base00", - ui_rstudio_tabs_active_foreground = "$base05", - ui_rstudio_tabs_inactive_background = "$base00", - ui_rstudio_tabs_inactive_foreground = "$base04", - ui_rstudio_job_progress_bar = "$aqua", - ui_selection = "mix($base04, $base01, 10%)", - ui_console_selection = "$base00", - ui_line_active = "$base00", - ui_line_active_selection = "$base02", - ui_margin_line = "$base02", - rmd_chunk_background = "$base00", - ui_cursor = "$gold", - ui_gutter_foreground = "mix($base03, $base01, 50%)", - ui_debug_background = "$base02", - rmd_chunk_header = "$teal", - rmd_heading_foreground = "$gold", - rmd_href = "$red", - ui_completions_background = "$base01", - ui_completions_border = "$base00", - ui_completions_foreground = "$base05", - ui_completions_selected_foreground = "$base05", - rstheme_command_palette(), - rstheme_large_tabs(), - rstheme_dialog_options( - heading_foreground = "$aqua", - help_foreground = "$base05", - selected_foreground = "$base05", - input_foreground = "$gold", - button_hover_foreground = "$base05" - ), - rstheme_rainbow_parentheses( - "$blue", "$gold", "$red", "$purple", "$green", "$orange", "$teal" - ), - '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { - .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { - box-shadow: 0 -2px 0 $aqua inset; - border-radius: 0 !important; - } - } - ', - '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { - background-color: $base00 !important; - border-color: $base00 !important; - } - ' -) \ No newline at end of file diff --git a/inst/templates/material-palenight.R b/inst/templates/material-palenight.R deleted file mode 100644 index a1e6bbf..0000000 --- a/inst/templates/material-palenight.R +++ /dev/null @@ -1,86 +0,0 @@ -rstheme( - "Material Palenight", - theme_dark = TRUE, - theme_flat = TRUE, - theme_path = here::here("inst/templates/material-palenight.scss"), - theme_apply = TRUE, - theme_as_sass = TRUE, - theme_palette = list( - base00 = "#222736", - base01 = "#282E3F", - base02 = "#232530", - base03 = "#6C6F93", - base04 = "#A5ABD0", - base05 = "#ffffff", - purple = "#C792E9", - blue = "#81AAFF", - sky = "#88DDFE", - aqua = "#84ffff", - teal = "#81D4CC", - green = "#C3E88D", - gold = "#FDCA68", - orange = "#F88C6C", - red = "#F07178" - ), - ui_background = "$base01", - ui_foreground = "$base04", - code_string = "$green", - code_function = "$blue", - code_value = "$orange", - code_comment = "$base03", - code_variable = "$gold", - code_message = "$sky", - code_reserved = "$purple", - code_operator = "$sky", - code_bracket = "$sky", - code_namespace = "$red", - code_identifier = "$base04", - ui_rstudio_background = "$base00", - ui_rstudio_foreground = "$base04", - ui_rstudio_toolbar_foreground = "$base03", - ui_rstudio_tabs_active_background = "$base00", - ui_rstudio_tabs_active_foreground = "$base05", - ui_rstudio_tabs_inactive_background = "$base00", - ui_rstudio_tabs_inactive_foreground = "$base04", - ui_rstudio_job_progress_bar = "$blue", - ui_selection = "mix($base04, $base01, 10%)", - ui_console_selection = "$base00", - ui_line_active = "$base00", - ui_line_active_selection = "$base02", - ui_margin_line = "$base02", - rmd_chunk_background = "$base00", - ui_cursor = "$gold", - ui_gutter_foreground = "mix($base03, $base01, 50%)", - ui_debug_background = "$base02", - rmd_chunk_header = "$teal", - rmd_heading_foreground = "$gold", - rmd_href = "$red", - ui_completions_background = "$base01", - ui_completions_border = "$base00", - ui_completions_foreground = "$base05", - ui_completions_selected_foreground = "$base05", - rstheme_command_palette(), - rstheme_large_tabs(), - rstheme_dialog_options( - heading_foreground = "$purple", - help_foreground = "$base05", - selected_foreground = "$base05", - input_foreground = "$gold", - button_hover_foreground = "$base05" - ), - rstheme_rainbow_parentheses( - "$blue", "$gold", "$red", "$purple", "$green", "$orange", "$teal" - ), - '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { - .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { - box-shadow: 0 -2px 0 $purple inset; - border-radius: 0 !important; - } - } - ', - '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { - background-color: $base00 !important; - border-color: $base00 !important; - } - ' -) \ No newline at end of file diff --git a/inst/templates/material.R b/inst/templates/material.R index 229d238..421eb2b 100644 --- a/inst/templates/material.R +++ b/inst/templates/material.R @@ -1,18 +1,5 @@ -rstheme( - "Material", - theme_dark = TRUE, - theme_flat = TRUE, - theme_path = here::here("inst/templates/material.scss"), - theme_apply = TRUE, - theme_as_sass = TRUE, - theme_palette = list( - base00 = "#162327", - base01 = "#233338", - base02 = "#232530", - base03 = "#4D707B", - base04 = "#EAFFFF", - base05 = "#ffffff", - base06 = "#577C88", +material_accents <- list( + base = list( purple = "#C792E9", blue = "#81AAFF", sky = "#88DDFE", @@ -23,66 +10,204 @@ rstheme( orange = "#F88C6C", red = "#F07178" ), - ui_background = "$base01", - ui_foreground = "$base06", - code_string = "$green", - code_function = "$blue", - code_value = "$orange", - code_comment = "$base03", - code_variable = "$gold", - code_message = "$sky", - code_reserved = "$purple", - code_operator = "$sky", - code_bracket = "$sky", - code_namespace = "$red", - code_identifier = "$base05", - ui_rstudio_background = "$base00", - ui_rstudio_foreground = "$base04", - ui_rstudio_toolbar_foreground = "$base03", - ui_rstudio_tabs_active_background = "$base00", - ui_rstudio_tabs_active_foreground = "$base05", - ui_rstudio_tabs_inactive_background = "$base00", - ui_rstudio_tabs_inactive_foreground = "$base06", - ui_rstudio_job_progress_bar = "$teal", - ui_selection = "mix($base04, $base01, 10%)", - ui_console_selection = "$base00", - ui_line_active = "$base00", - ui_line_active_selection = "$base02", - ui_margin_line = "$base02", - rmd_chunk_background = "$base00", - ui_cursor = "$gold", - ui_gutter_foreground = "mix($base03, $base01, 50%)", - ui_debug_background = "$base02", - rmd_chunk_header = "$teal", - rmd_heading_foreground = "$gold", - rmd_href = "$red", - ui_completions_background = "$base01", - ui_completions_border = "$base00", - ui_completions_foreground = "$base05", - ui_completions_selected_foreground = "$base05", - rstheme_command_palette(), - rstheme_large_tabs(), - rstheme_dialog_options( - heading_foreground = "$teal", - help_foreground = "$base05", - selected_foreground = "$base05", - foreground = "$base06", - input_foreground = "$gold", - button_hover_foreground = "$base05" + lighter = list( + purple = "#AA2DE2", + blue = "#5A82BC", + sky = "#88DDFE", + aqua = "#84ffff", + teal = "#00B0B7", + green = "#87BA48", + gold = "#EE8F00", + orange = "#FF6337", + red = "#F91A27" + ) +) + +material_base <- list( + base = list( + base00 = "#162327", + base01 = "#233338", + base02 = "#232530", + base03 = "#4D707B", + base04 = "#EAFFFF", + base05 = "#ffffff", + base06 = "#577C88" + ), + darker = list( + base00 = "#1B1B1B", + base01 = "#222222", + base02 = "#232530", + base03 = "#616161", + base04 = "#EAFFFF", + base05 = "#ffffff", + base06 = "#848484" + ), + lighter = list( + base00 = "#F3F4F5", + base01 = "#FFFFFF", + base02 = "#232530", + base03 = "#4D707B", + base04 = "#EAFFFF", + base05 = "#000000", + base06 = "#8BA4AF", + base07 = "#DAF3F0" ), - rstheme_rainbow_parentheses( - "$blue", "$gold", "$red", "$purple", "$green", "$orange", "$teal" + ocean = list( + base00 = "#090D14", + base01 = "#0F121C", + base02 = "#232530", + base03 = "#6C6F93", + base04 = "#A5ABD0", + base05 = "#ffffff" ), - '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { + palenight = list( + base00 = "#222736", + base01 = "#282E3F", + base02 = "#232530", + base03 = "#6C6F93", + base04 = "#A5ABD0", + base05 = "#ffffff" + ) +) + +material_rstheme <- function( + style = NULL, + base = material_base$base, + accents = material_accents$base, + dialog_foreground = "$base06", + dialog_heading_foreground = "$teal", + ... +) { + name <- paste0("Material", if (!is.null(style)) " ", style) + path <- paste0("material", if (!is.null(style)) "-", tolower(style), ".scss") + theme_args <- list( + theme_name = name, + theme_dark = !identical(style, "Lighter"), + theme_flat = TRUE, + theme_path = here::here("inst", "templates", path), + theme_apply = TRUE, + theme_as_sass = TRUE, + theme_palette = c(base, accents), + ui_background = "$base01", + ui_foreground = "$base06", + code_string = "$green", + code_function = "$blue", + code_value = "$orange", + code_comment = "$base03", + code_variable = "$gold", + code_message = "$sky", + code_reserved = "$purple", + code_operator = "$sky", + code_bracket = "$sky", + code_namespace = "$red", + code_identifier = "$base05", + ui_rstudio_background = "$base00", + ui_rstudio_foreground = "$base04", + ui_rstudio_toolbar_foreground = "$base03", + ui_rstudio_tabs_active_background = "$base00", + ui_rstudio_tabs_active_foreground = "$base05", + ui_rstudio_tabs_inactive_background = "$base00", + ui_rstudio_tabs_inactive_foreground = "$base06", + ui_rstudio_job_progress_bar = "$teal", + ui_completions_background = "$base01", + ui_completions_border = "$base00", + ui_completions_foreground = "$base05", + ui_completions_selected_foreground = "$base05", + ui_console_selection = "$base00", + ui_selection = "mix($base04, $base01, 10%)", + ui_line_active = "$base00", + ui_line_active_selection = "$base02", + ui_margin_line = "$base02", + ui_cursor = "$gold", + ui_gutter_foreground = "mix($base03, $base01, 50%)", + ui_debug_background = "$base02", + rmd_chunk_background = "$base00", + rmd_chunk_header = "$teal", + rmd_heading_foreground = "$gold", + rmd_href = "$red", + rstheme_command_palette(), + rstheme_large_tabs(), + rstheme_dialog_options( + foreground = dialog_foreground, + heading_foreground = dialog_heading_foreground, + help_foreground = "$base05", + selected_foreground = "$base05", + input_foreground = "$gold", + button_hover_foreground = "$base05" + ), + rstheme_rainbow_parentheses( + "$blue", + "$gold", + "$red", + "$purple", + "$green", + "$orange", + "$teal" + ), + sprintf(".rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { - box-shadow: 0 -2px 0 $teal inset; + box-shadow: 0 -2px 0 %s inset; border-radius: 0 !important; } } - ', - '.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { + ", dialog_heading_foreground), + ".rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { background-color: $base00 !important; border-color: $base00 !important; } - ' -) \ No newline at end of file + " + ) + + theme_args <- modifyList(theme_args, list(...)) + do.call(rstheme, theme_args) +} + +# Base +material_rstheme() + +material_rstheme( + "Darker", + material_base$darker, + dialog_heading_foreground = "$orange", + ui_rstudio_job_progress_bar = "$orange" +) + +material_rstheme( + "Lighter", + material_base$lighter, + material_accents$lighter, + dialog_heading_foreground = "$sky", + code_operator = "$teal", + code_bracket = "$teal", + ui_rstudio_job_progress_bar = "$sky", + ui_selection = "$base07", + ui_line_active_selection = "$base07", + ui_console_selection = "$base07" +) + +material_rstheme( + "Ocean", + material_base$ocean, + material_accents$base, + dialog_foreground = "$ui_rstudio_foreground", + dialog_heading_foreground = "$aqua", + ui_rstudio_job_progress_bar = "$aqua", + ui_foreground = "$base04", + ui_rstudio_tabs_inactive_foreground = "$base04", + code_identifier = "$base04" +) + +material_rstheme( + "Palenight", + material_base$palenight, + material_accents$base, + ui_rstudio_job_progress_bar = "$blue", + dialog_foreground = "$ui_rstudio_foreground", + dialog_heading_foreground = "$purple", + ui_foreground = "$base04", + ui_rstudio_tabs_inactive_foreground = "$base04", + code_identifier = "$base04" +) + +make_rsthemes() +hotload_rstheme("inst/themes/material.rstheme") From bfb051156984d7d8c2f55a60ab045aecaab1a523 Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Thu, 7 Jan 2021 09:27:07 -0500 Subject: [PATCH 12/21] Update material css to remove border from panes --- inst/templates/material-darker.scss | 11 ++++++----- inst/templates/material-lighter.scss | 11 ++++++----- inst/templates/material-ocean.scss | 11 ++++++----- inst/templates/material-palenight.scss | 11 ++++++----- inst/templates/material.R | 11 ++++++----- inst/templates/material.scss | 11 ++++++----- 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/inst/templates/material-darker.scss b/inst/templates/material-darker.scss index aa77cdd..19c689b 100644 --- a/inst/templates/material-darker.scss +++ b/inst/templates/material-darker.scss @@ -96,11 +96,12 @@ $rmd_href_background: $code_reserved_background; } } -.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { - background-color: $base00 !important; - border-color: $base00 !important; - } - +/* remove border from panes */ + .rstudio-themes-flat + :-webkit-any(.windowframe, .rstheme_minimizedWindowObject) + > div:last-child { + border-color: $ui_rstudio_background !important; + } $ui_command_palette_background: $ui_background; $ui_command_palette_search_background: $ui_command_palette_background; $ui_command_palette_border: $ui_command_palette_background; diff --git a/inst/templates/material-lighter.scss b/inst/templates/material-lighter.scss index e3d750e..e7cbdf1 100644 --- a/inst/templates/material-lighter.scss +++ b/inst/templates/material-lighter.scss @@ -97,11 +97,12 @@ $rmd_href_background: $code_reserved_background; } } -.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { - background-color: $base00 !important; - border-color: $base00 !important; - } - +/* remove border from panes */ + .rstudio-themes-flat + :-webkit-any(.windowframe, .rstheme_minimizedWindowObject) + > div:last-child { + border-color: $ui_rstudio_background !important; + } $ui_command_palette_background: $ui_background; $ui_command_palette_search_background: $ui_command_palette_background; $ui_command_palette_border: $ui_command_palette_background; diff --git a/inst/templates/material-ocean.scss b/inst/templates/material-ocean.scss index 5f6e5b6..a0131ce 100644 --- a/inst/templates/material-ocean.scss +++ b/inst/templates/material-ocean.scss @@ -95,11 +95,12 @@ $rmd_href_background: $code_reserved_background; } } -.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { - background-color: $base00 !important; - border-color: $base00 !important; - } - +/* remove border from panes */ + .rstudio-themes-flat + :-webkit-any(.windowframe, .rstheme_minimizedWindowObject) + > div:last-child { + border-color: $ui_rstudio_background !important; + } $ui_command_palette_background: $ui_background; $ui_command_palette_search_background: $ui_command_palette_background; $ui_command_palette_border: $ui_command_palette_background; diff --git a/inst/templates/material-palenight.scss b/inst/templates/material-palenight.scss index 800ea35..5bc32a5 100644 --- a/inst/templates/material-palenight.scss +++ b/inst/templates/material-palenight.scss @@ -95,11 +95,12 @@ $rmd_href_background: $code_reserved_background; } } -.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { - background-color: $base00 !important; - border-color: $base00 !important; - } - +/* remove border from panes */ + .rstudio-themes-flat + :-webkit-any(.windowframe, .rstheme_minimizedWindowObject) + > div:last-child { + border-color: $ui_rstudio_background !important; + } $ui_command_palette_background: $ui_background; $ui_command_palette_search_background: $ui_command_palette_background; $ui_command_palette_border: $ui_command_palette_background; diff --git a/inst/templates/material.R b/inst/templates/material.R index 421eb2b..0c30b73 100644 --- a/inst/templates/material.R +++ b/inst/templates/material.R @@ -151,11 +151,12 @@ material_rstheme <- function( } } ", dialog_heading_foreground), - ".rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { - background-color: $base00 !important; - border-color: $base00 !important; - } - " + "/* remove border from panes */ + .rstudio-themes-flat + :-webkit-any(.windowframe, .rstheme_minimizedWindowObject) + > div:last-child { + border-color: $ui_rstudio_background !important; + }" ) theme_args <- modifyList(theme_args, list(...)) diff --git a/inst/templates/material.scss b/inst/templates/material.scss index 4c17e4c..db3c6a8 100644 --- a/inst/templates/material.scss +++ b/inst/templates/material.scss @@ -96,11 +96,12 @@ $rmd_href_background: $code_reserved_background; } } -.rstudio-themes-dark .dataGridHeader, .rstudio-themes-dark tr[__gwt_header_row] > :-webkit-any(td, th), .rstudio-themes-dark .dataTables_info { - background-color: $base00 !important; - border-color: $base00 !important; - } - +/* remove border from panes */ + .rstudio-themes-flat + :-webkit-any(.windowframe, .rstheme_minimizedWindowObject) + > div:last-child { + border-color: $ui_rstudio_background !important; + } $ui_command_palette_background: $ui_background; $ui_command_palette_search_background: $ui_command_palette_background; $ui_command_palette_border: $ui_command_palette_background; From 0e25d9e5863da5e4ff844555caa6cc06fca51481 Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Sat, 9 Jan 2021 22:43:17 -0500 Subject: [PATCH 13/21] Fix selected menu item background in new R Markdown dialog --- inst/templates/rstudio/_dialog-options.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/inst/templates/rstudio/_dialog-options.scss b/inst/templates/rstudio/_dialog-options.scss index 3d6f3fe..11f03b0 100644 --- a/inst/templates/rstudio/_dialog-options.scss +++ b/inst/templates/rstudio/_dialog-options.scss @@ -49,7 +49,8 @@ $ui_rstudio_dialog_select_foreground: $ui_rstudio_dialog_foreground !default; } } - .dialogContent label.gwt-Label { + .dialogContent label.gwt-Label, + .dialogContent .gwt-RadioButton ~ * { color: $ui_rstudio_dialog_help_foreground !important; } @@ -101,6 +102,8 @@ $ui_rstudio_dialog_select_foreground: $ui_rstudio_dialog_foreground !default; color: $ui_rstudio_dialog_foreground !important; } + [role="listbox"] [role="option"][aria-selected="true"], + [role="listbox"] [role="option"][aria-selected="true"] .gwt-Label, [id^="rstudio_label"][aria-selected="true"], [id^="rstudio_label"][aria-selected="true"] td, .gwt-TabLayoutPanelTab-selected { From 036b3e32d5318fe308446cd66788295ddeee994e Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Sat, 9 Jan 2021 22:46:59 -0500 Subject: [PATCH 14/21] Use exact material themes colors and flatten to match vscode https://github.com/material-theme/vsc-community-material-theme/raw/develop/themes/Community-Material-Theme-Default.json --- inst/templates/material.R | 68 ++++++++++++++++++------------------ inst/templates/material.scss | 55 +++++++++++++++-------------- 2 files changed, 62 insertions(+), 61 deletions(-) diff --git a/inst/templates/material.R b/inst/templates/material.R index 0c30b73..b281977 100644 --- a/inst/templates/material.R +++ b/inst/templates/material.R @@ -1,13 +1,13 @@ material_accents <- list( base = list( - purple = "#C792E9", + purple = "#C792EA", blue = "#81AAFF", - sky = "#88DDFE", - aqua = "#84ffff", - teal = "#81D4CC", + sky = "#89DDFF", + aqua = "#84FFFF", + teal = "#80CBC4", green = "#C3E88D", - gold = "#FDCA68", - orange = "#F88C6C", + gold = "#FFCB6B", + orange = "#F78C6C", red = "#F07178" ), lighter = list( @@ -25,13 +25,13 @@ material_accents <- list( material_base <- list( base = list( - base00 = "#162327", - base01 = "#233338", - base02 = "#232530", - base03 = "#4D707B", - base04 = "#EAFFFF", - base05 = "#ffffff", - base06 = "#577C88" + base00 = "#263238", + base01 = "#303C41", + base02 = "#37474F", + base03 = "#546E7A", + base04 = "#607A86", + base05 = "#B2CCD6", + base06 = "#EEFFFF" ), darker = list( base00 = "#1B1B1B", @@ -58,7 +58,8 @@ material_base <- list( base02 = "#232530", base03 = "#6C6F93", base04 = "#A5ABD0", - base05 = "#ffffff" + base05 = "#ffffff", + base06 = "#ffffff" ), palenight = list( base00 = "#222736", @@ -66,7 +67,8 @@ material_base <- list( base02 = "#232530", base03 = "#6C6F93", base04 = "#A5ABD0", - base05 = "#ffffff" + base05 = "#ffffff", + base06 = "#ffffff" ) ) @@ -74,7 +76,7 @@ material_rstheme <- function( style = NULL, base = material_base$base, accents = material_accents$base, - dialog_foreground = "$base06", + dialog_foreground = "$ui_foreground", dialog_heading_foreground = "$teal", ... ) { @@ -88,38 +90,38 @@ material_rstheme <- function( theme_apply = TRUE, theme_as_sass = TRUE, theme_palette = c(base, accents), - ui_background = "$base01", + ui_background = "$base00", ui_foreground = "$base06", code_string = "$green", code_function = "$blue", code_value = "$orange", - code_comment = "$base03", + code_comment = "$base04", code_variable = "$gold", - code_message = "$sky", + code_message = "$aqua", code_reserved = "$purple", code_operator = "$sky", - code_bracket = "$sky", + code_bracket = "$teal", code_namespace = "$red", - code_identifier = "$base05", + code_identifier = "$base06", ui_rstudio_background = "$base00", - ui_rstudio_foreground = "$base04", + ui_rstudio_foreground = "$base06", ui_rstudio_toolbar_foreground = "$base03", ui_rstudio_tabs_active_background = "$base00", - ui_rstudio_tabs_active_foreground = "$base05", + ui_rstudio_tabs_active_foreground = "$base06", ui_rstudio_tabs_inactive_background = "$base00", - ui_rstudio_tabs_inactive_foreground = "$base06", + ui_rstudio_tabs_inactive_foreground = "$base04", ui_rstudio_job_progress_bar = "$teal", ui_completions_background = "$base01", ui_completions_border = "$base00", - ui_completions_foreground = "$base05", - ui_completions_selected_foreground = "$base05", + ui_completions_foreground = "$base06", + ui_completions_selected_foreground = "$base06", ui_console_selection = "$base00", ui_selection = "mix($base04, $base01, 10%)", - ui_line_active = "$base00", + ui_line_active = "darken($base00, 5%)", ui_line_active_selection = "$base02", - ui_margin_line = "$base02", + ui_margin_line = "$base01", ui_cursor = "$gold", - ui_gutter_foreground = "mix($base03, $base01, 50%)", + ui_gutter_foreground = "$base03", ui_debug_background = "$base02", rmd_chunk_background = "$base00", rmd_chunk_header = "$teal", @@ -156,7 +158,8 @@ material_rstheme <- function( :-webkit-any(.windowframe, .rstheme_minimizedWindowObject) > div:last-child { border-color: $ui_rstudio_background !important; - }" + } + " ) theme_args <- modifyList(theme_args, list(...)) @@ -169,7 +172,7 @@ material_rstheme() material_rstheme( "Darker", material_base$darker, - dialog_heading_foreground = "$orange", + dialog_heading_foreground = "$aqua", ui_rstudio_job_progress_bar = "$orange" ) @@ -209,6 +212,3 @@ material_rstheme( ui_rstudio_tabs_inactive_foreground = "$base04", code_identifier = "$base04" ) - -make_rsthemes() -hotload_rstheme("inst/themes/material.rstheme") diff --git a/inst/templates/material.scss b/inst/templates/material.scss index db3c6a8..e236071 100644 --- a/inst/templates/material.scss +++ b/inst/templates/material.scss @@ -1,37 +1,37 @@ /* rs-theme-name: Material {rsthemes} */ /* rs-theme-is-dark: TRUE */ -$base00: #162327; -$base01: #233338; -$base02: #232530; -$base03: #4D707B; -$base04: #EAFFFF; -$base05: #ffffff; -$base06: #577C88; -$purple: #C792E9; +$base00: #263238; +$base01: #303C41; +$base02: #37474F; +$base03: #546E7A; +$base04: #607A86; +$base05: #B2CCD6; +$base06: #EEFFFF; +$purple: #C792EA; $blue: #81AAFF; -$sky: #88DDFE; -$aqua: #84ffff; -$teal: #81D4CC; +$sky: #89DDFF; +$aqua: #84FFFF; +$teal: #80CBC4; $green: #C3E88D; -$gold: #FDCA68; -$orange: #F88C6C; +$gold: #FFCB6B; +$orange: #F78C6C; $red: #F07178; -$ui_background: $base01; +$ui_background: $base00; $ui_foreground: $base06; $code_string: $green; $code_function: $blue; $code_value: $orange; $code_variable: $gold; -$code_message: $sky; +$code_message: $aqua; $ui_rstudio_background: $base00; -$ui_rstudio_foreground: $base04; +$ui_rstudio_foreground: $base06; $ui_rstudio_border: $ui_background; $rmd_chunk_background: $base00; $ui_rstudio_tabs_inactive_background: $base00; -$ui_rstudio_tabs_inactive_foreground: $base06; +$ui_rstudio_tabs_inactive_foreground: $base04; $ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; $ui_rstudio_tabs_active_background: $base00; -$ui_rstudio_tabs_active_foreground: $base05; +$ui_rstudio_tabs_active_foreground: $base06; $ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; $ui_rstudio_toolbar_foreground: $base03; $ui_rstudio_search: $ui_rstudio_toolbar_background; @@ -39,34 +39,34 @@ $ui_rstudio_scrollbar_background: $ui_background; $ui_rstudio_scrollbar_handle: $rmd_chunk_background; $ui_cursor: $gold; $ui_cursor_normal_mode: $ui_cursor; -$ui_gutter_foreground: mix($base03, $base01, 50%); +$ui_gutter_foreground: $base03; $ui_gutter_background: $ui_background; -$ui_line_active: $base00; +$ui_line_active: darken($base00, 5%); $ui_selection: mix($base04, $base01, 10%); $ui_line_active_selection: $base02; $ui_line_active_gutter: $ui_background; $ui_bracket: transparentize($ui_cursor, 0.6); $ui_invisible: transparentize($ui_foreground, 0.7); $ui_indent_guide: $ui_invisible; -$ui_margin_line: $base02; +$ui_margin_line: $base01; $ui_debug_background: $base02; $ui_fold_arrows_foreground: $ui_cursor; $ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); $ui_line_find: $ui_selection; $ui_console_selection: $base00; $ui_completions_background: $base01; -$ui_completions_foreground: $base05; +$ui_completions_foreground: $base06; $ui_completions_border: $base00; $ui_completions_selected_background: $ui_line_active_selection; -$ui_completions_selected_foreground: $base05; +$ui_completions_selected_foreground: $base06; $ui_rstudio_job_progress_bar: $teal; -$code_comment: $base03; +$code_comment: $base04; $code_namespace_font_style: italic; $code_reserved: $purple; $code_operator: $sky; -$code_bracket: $sky; +$code_bracket: $teal; $code_namespace: $red; -$code_identifier: $base05; +$code_identifier: $base06; $code_string_background: inherit; $code_function_background: inherit; $code_value_background: inherit; @@ -102,6 +102,7 @@ $rmd_href_background: $code_reserved_background; > div:last-child { border-color: $ui_rstudio_background !important; } + $ui_command_palette_background: $ui_background; $ui_command_palette_search_background: $ui_command_palette_background; $ui_command_palette_border: $ui_command_palette_background; @@ -110,7 +111,7 @@ $ui_command_palette_item_color: $ui_foreground; $ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); $ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); $ui_rstudio_dialog_background: $ui_rstudio_background; -$ui_rstudio_dialog_foreground: $base06; +$ui_rstudio_dialog_foreground: $ui_foreground; $ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); $ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; $ui_rstudio_dialog_selected_foreground: $base05; From 351fc0195536a5960f9776955b93b16bb25c3a1d Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Sat, 9 Jan 2021 22:54:02 -0500 Subject: [PATCH 15/21] Update Material Darker themes to use exact colors https://github.com/material-theme/vsc-community-material-theme/raw/develop/themes/Community-Material-Theme-Darker.json --- inst/templates/material-darker.scss | 59 +++++++++++++++-------------- inst/templates/material.R | 14 +++---- 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/inst/templates/material-darker.scss b/inst/templates/material-darker.scss index 19c689b..2a6bc06 100644 --- a/inst/templates/material-darker.scss +++ b/inst/templates/material-darker.scss @@ -1,37 +1,37 @@ /* rs-theme-name: Material Darker {rsthemes} */ /* rs-theme-is-dark: TRUE */ -$base00: #1B1B1B; -$base01: #222222; -$base02: #232530; -$base03: #616161; -$base04: #EAFFFF; -$base05: #ffffff; -$base06: #848484; -$purple: #C792E9; +$base00: #212121; +$base01: #2b2b2b; +$base02: #424242; +$base03: #545454; +$base04: #616161; +$base05: #65737E; +$base06: #EEFFFF; +$purple: #C792EA; $blue: #81AAFF; -$sky: #88DDFE; -$aqua: #84ffff; -$teal: #81D4CC; +$sky: #89DDFF; +$aqua: #84FFFF; +$teal: #80CBC4; $green: #C3E88D; -$gold: #FDCA68; -$orange: #F88C6C; +$gold: #FFCB6B; +$orange: #F78C6C; $red: #F07178; -$ui_background: $base01; +$ui_background: $base00; $ui_foreground: $base06; $code_string: $green; $code_function: $blue; $code_value: $orange; $code_variable: $gold; -$code_message: $sky; +$code_message: $aqua; $ui_rstudio_background: $base00; -$ui_rstudio_foreground: $base04; +$ui_rstudio_foreground: $base06; $ui_rstudio_border: $ui_background; $rmd_chunk_background: $base00; $ui_rstudio_tabs_inactive_background: $base00; -$ui_rstudio_tabs_inactive_foreground: $base06; +$ui_rstudio_tabs_inactive_foreground: $base04; $ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; $ui_rstudio_tabs_active_background: $base00; -$ui_rstudio_tabs_active_foreground: $base05; +$ui_rstudio_tabs_active_foreground: $base06; $ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; $ui_rstudio_toolbar_foreground: $base03; $ui_rstudio_search: $ui_rstudio_toolbar_background; @@ -39,34 +39,34 @@ $ui_rstudio_scrollbar_background: $ui_background; $ui_rstudio_scrollbar_handle: $rmd_chunk_background; $ui_cursor: $gold; $ui_cursor_normal_mode: $ui_cursor; -$ui_gutter_foreground: mix($base03, $base01, 50%); +$ui_gutter_foreground: $base03; $ui_gutter_background: $ui_background; -$ui_line_active: $base00; +$ui_line_active: darken($base00, 5%); $ui_selection: mix($base04, $base01, 10%); $ui_line_active_selection: $base02; $ui_line_active_gutter: $ui_background; $ui_bracket: transparentize($ui_cursor, 0.6); $ui_invisible: transparentize($ui_foreground, 0.7); $ui_indent_guide: $ui_invisible; -$ui_margin_line: $base02; +$ui_margin_line: $base01; $ui_debug_background: $base02; $ui_fold_arrows_foreground: $ui_cursor; $ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); $ui_line_find: $ui_selection; $ui_console_selection: $base00; $ui_completions_background: $base01; -$ui_completions_foreground: $base05; +$ui_completions_foreground: $base06; $ui_completions_border: $base00; $ui_completions_selected_background: $ui_line_active_selection; -$ui_completions_selected_foreground: $base05; +$ui_completions_selected_foreground: $base06; $ui_rstudio_job_progress_bar: $orange; -$code_comment: $base03; +$code_comment: $base04; $code_namespace_font_style: italic; $code_reserved: $purple; $code_operator: $sky; -$code_bracket: $sky; +$code_bracket: $teal; $code_namespace: $red; -$code_identifier: $base05; +$code_identifier: $base06; $code_string_background: inherit; $code_function_background: inherit; $code_value_background: inherit; @@ -91,7 +91,7 @@ $rmd_href_background: $code_reserved_background; @import "rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { - box-shadow: 0 -2px 0 $orange inset; + box-shadow: 0 -2px 0 $aqua inset; border-radius: 0 !important; } } @@ -102,6 +102,7 @@ $rmd_href_background: $code_reserved_background; > div:last-child { border-color: $ui_rstudio_background !important; } + $ui_command_palette_background: $ui_background; $ui_command_palette_search_background: $ui_command_palette_background; $ui_command_palette_border: $ui_command_palette_background; @@ -110,11 +111,11 @@ $ui_command_palette_item_color: $ui_foreground; $ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); $ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); $ui_rstudio_dialog_background: $ui_rstudio_background; -$ui_rstudio_dialog_foreground: $base06; +$ui_rstudio_dialog_foreground: $ui_foreground; $ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); $ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; $ui_rstudio_dialog_selected_foreground: $base05; -$ui_rstudio_dialog_heading_foreground: $orange; +$ui_rstudio_dialog_heading_foreground: $aqua; $ui_rstudio_dialog_help_foreground: $base05; $ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; $ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; diff --git a/inst/templates/material.R b/inst/templates/material.R index b281977..0f7590c 100644 --- a/inst/templates/material.R +++ b/inst/templates/material.R @@ -34,13 +34,13 @@ material_base <- list( base06 = "#EEFFFF" ), darker = list( - base00 = "#1B1B1B", - base01 = "#222222", - base02 = "#232530", - base03 = "#616161", - base04 = "#EAFFFF", - base05 = "#ffffff", - base06 = "#848484" + base00 = "#212121", + base01 = "#2b2b2b", + base02 = "#424242", + base03 = "#545454", + base04 = "#616161", + base05 = "#65737E", + base06 = "#EEFFFF" ), lighter = list( base00 = "#F3F4F5", From 2cfb0586752dd86b6b37e8b6c2713668cac809d1 Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Sat, 9 Jan 2021 23:18:48 -0500 Subject: [PATCH 16/21] Darken Rmd code chunk background slightly --- inst/templates/material-darker.scss | 2 +- inst/templates/material.R | 2 +- inst/templates/material.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inst/templates/material-darker.scss b/inst/templates/material-darker.scss index 2a6bc06..48b3a45 100644 --- a/inst/templates/material-darker.scss +++ b/inst/templates/material-darker.scss @@ -26,7 +26,7 @@ $code_message: $aqua; $ui_rstudio_background: $base00; $ui_rstudio_foreground: $base06; $ui_rstudio_border: $ui_background; -$rmd_chunk_background: $base00; +$rmd_chunk_background: darken($base00, 2%); $ui_rstudio_tabs_inactive_background: $base00; $ui_rstudio_tabs_inactive_foreground: $base04; $ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; diff --git a/inst/templates/material.R b/inst/templates/material.R index 0f7590c..dceade1 100644 --- a/inst/templates/material.R +++ b/inst/templates/material.R @@ -123,7 +123,7 @@ material_rstheme <- function( ui_cursor = "$gold", ui_gutter_foreground = "$base03", ui_debug_background = "$base02", - rmd_chunk_background = "$base00", + rmd_chunk_background = "darken($base00, 2%)", rmd_chunk_header = "$teal", rmd_heading_foreground = "$gold", rmd_href = "$red", diff --git a/inst/templates/material.scss b/inst/templates/material.scss index e236071..1ab3cb0 100644 --- a/inst/templates/material.scss +++ b/inst/templates/material.scss @@ -26,7 +26,7 @@ $code_message: $aqua; $ui_rstudio_background: $base00; $ui_rstudio_foreground: $base06; $ui_rstudio_border: $ui_background; -$rmd_chunk_background: $base00; +$rmd_chunk_background: darken($base00, 2%); $ui_rstudio_tabs_inactive_background: $base00; $ui_rstudio_tabs_inactive_foreground: $base04; $ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; From afc4f21df93ee687c8a9f8538bc00a3ec872e8df Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Sat, 9 Jan 2021 23:19:34 -0500 Subject: [PATCH 17/21] Update Material lighter to match official colors https://github.com/material-theme/vsc-community-material-theme/raw/develop/themes/Community-Material-Theme-Lighter.json --- inst/templates/material-lighter.scss | 71 ++++++++++++++-------------- inst/templates/material.R | 40 +++++++--------- 2 files changed, 54 insertions(+), 57 deletions(-) diff --git a/inst/templates/material-lighter.scss b/inst/templates/material-lighter.scss index e7cbdf1..a315461 100644 --- a/inst/templates/material-lighter.scss +++ b/inst/templates/material-lighter.scss @@ -1,38 +1,38 @@ /* rs-theme-name: Material Lighter {rsthemes} */ /* rs-theme-is-dark: FALSE */ -$base00: #F3F4F5; -$base01: #FFFFFF; -$base02: #232530; -$base03: #4D707B; -$base04: #EAFFFF; -$base05: #000000; -$base06: #8BA4AF; +$base00: #FAFAFA; +$base01: #E7EAEC; +$base02: #CFD8DC; +$base03: #B0BEC5; +$base04: #90A4AE; +$base05: #7E939E; +$base06: #272727; $base07: #DAF3F0; -$purple: #AA2DE2; -$blue: #5A82BC; -$sky: #88DDFE; -$aqua: #84ffff; -$teal: #00B0B7; -$green: #87BA48; -$gold: #EE8F00; -$orange: #FF6337; -$red: #F91A27; -$ui_background: $base01; +$purple: #7C4DFF; +$blue: #6182b8; +$sky: #80CBC4; +$teal: #39ADB5; +$green: #91B859; +$gold: #FFB62C; +$orange: #F76D47; +$red: #E53935; +$pink: #FF5370; +$ui_background: $base00; $ui_foreground: $base06; $code_string: $green; $code_function: $blue; $code_value: $orange; $code_variable: $gold; -$code_message: $sky; +$code_message: $pink; $ui_rstudio_background: $base00; -$ui_rstudio_foreground: $base04; +$ui_rstudio_foreground: $base06; $ui_rstudio_border: $ui_background; -$rmd_chunk_background: $base00; +$rmd_chunk_background: darken($base00, 2%); $ui_rstudio_tabs_inactive_background: $base00; -$ui_rstudio_tabs_inactive_foreground: $base06; +$ui_rstudio_tabs_inactive_foreground: $base04; $ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; $ui_rstudio_tabs_active_background: $base00; -$ui_rstudio_tabs_active_foreground: $base05; +$ui_rstudio_tabs_active_foreground: $base06; $ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; $ui_rstudio_toolbar_foreground: $base03; $ui_rstudio_search: $ui_rstudio_toolbar_background; @@ -40,34 +40,34 @@ $ui_rstudio_scrollbar_background: $ui_background; $ui_rstudio_scrollbar_handle: $rmd_chunk_background; $ui_cursor: $gold; $ui_cursor_normal_mode: $ui_cursor; -$ui_gutter_foreground: mix($base03, $base01, 50%); +$ui_gutter_foreground: $base03; $ui_gutter_background: $ui_background; -$ui_line_active: $base00; -$ui_selection: $base07; -$ui_line_active_selection: $base07; +$ui_line_active: darken($base00, 5%); +$ui_selection: mix($base04, $base01, 10%); +$ui_line_active_selection: $base02; $ui_line_active_gutter: $ui_background; $ui_bracket: transparentize($ui_cursor, 0.6); $ui_invisible: transparentize($ui_foreground, 0.7); $ui_indent_guide: $ui_invisible; -$ui_margin_line: $base02; +$ui_margin_line: $base01; $ui_debug_background: $base02; $ui_fold_arrows_foreground: $ui_cursor; $ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); $ui_line_find: $ui_selection; -$ui_console_selection: $base07; +$ui_console_selection: $base00; $ui_completions_background: $base01; -$ui_completions_foreground: $base05; +$ui_completions_foreground: $base06; $ui_completions_border: $base00; $ui_completions_selected_background: $ui_line_active_selection; -$ui_completions_selected_foreground: $base05; -$ui_rstudio_job_progress_bar: $sky; -$code_comment: $base03; +$ui_completions_selected_foreground: $base06; +$ui_rstudio_job_progress_bar: $teal; +$code_comment: $base04; $code_namespace_font_style: italic; $code_reserved: $purple; -$code_operator: $teal; +$code_operator: $base05; $code_bracket: $teal; $code_namespace: $red; -$code_identifier: $base05; +$code_identifier: $base06; $code_string_background: inherit; $code_function_background: inherit; $code_value_background: inherit; @@ -103,6 +103,7 @@ $rmd_href_background: $code_reserved_background; > div:last-child { border-color: $ui_rstudio_background !important; } + $ui_command_palette_background: $ui_background; $ui_command_palette_search_background: $ui_command_palette_background; $ui_command_palette_border: $ui_command_palette_background; @@ -111,7 +112,7 @@ $ui_command_palette_item_color: $ui_foreground; $ui_command_palette_item_hover_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 5%), darken($ui_command_palette_item_background, 5%)); $ui_command_palette_item_selected_background: if($ui_rstudio_is_dark, lighten($ui_command_palette_item_background, 10%), darken($ui_command_palette_item_background, 10%)); $ui_rstudio_dialog_background: $ui_rstudio_background; -$ui_rstudio_dialog_foreground: $base06; +$ui_rstudio_dialog_foreground: $ui_foreground; $ui_rstudio_dialog_border: if($ui_rstudio_is_dark, lighten($ui_rstudio_dialog_background, 5%), darken($ui_rstudio_dialog_background, 5%)); $ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; $ui_rstudio_dialog_selected_foreground: $base05; diff --git a/inst/templates/material.R b/inst/templates/material.R index dceade1..2b8089c 100644 --- a/inst/templates/material.R +++ b/inst/templates/material.R @@ -11,15 +11,15 @@ material_accents <- list( red = "#F07178" ), lighter = list( - purple = "#AA2DE2", - blue = "#5A82BC", - sky = "#88DDFE", - aqua = "#84ffff", - teal = "#00B0B7", - green = "#87BA48", - gold = "#EE8F00", - orange = "#FF6337", - red = "#F91A27" + purple = "#7C4DFF", + blue = "#6182b8", + sky = "#80CBC4", + teal = "#39ADB5", + green = "#91B859", + gold = "#FFB62C", + orange = "#F76D47", + red = "#E53935", + pink = "#FF5370" ) ) @@ -43,13 +43,13 @@ material_base <- list( base06 = "#EEFFFF" ), lighter = list( - base00 = "#F3F4F5", - base01 = "#FFFFFF", - base02 = "#232530", - base03 = "#4D707B", - base04 = "#EAFFFF", - base05 = "#000000", - base06 = "#8BA4AF", + base00 = "#FAFAFA", + base01 = "#E7EAEC", + base02 = "#CFD8DC", + base03 = "#B0BEC5", + base04 = "#90A4AE", + base05 = "#7E939E", + base06 = "#272727", base07 = "#DAF3F0" ), ocean = list( @@ -181,12 +181,8 @@ material_rstheme( material_base$lighter, material_accents$lighter, dialog_heading_foreground = "$sky", - code_operator = "$teal", - code_bracket = "$teal", - ui_rstudio_job_progress_bar = "$sky", - ui_selection = "$base07", - ui_line_active_selection = "$base07", - ui_console_selection = "$base07" + code_message = "$pink", + code_operator = "$base05" ) material_rstheme( From 7cb1f3f1678a72cfa968aed62867d50718e8c42e Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Sat, 9 Jan 2021 23:21:37 -0500 Subject: [PATCH 18/21] Update Material Ocean colors to match community theme palette https://github.com/material-theme/vsc-community-material-theme/raw/develop/themes/Community-Material-Theme-Ocean.json --- inst/templates/material-ocean.scss | 56 ++++++++++++++++-------------- inst/templates/material.R | 19 +++++----- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/inst/templates/material-ocean.scss b/inst/templates/material-ocean.scss index a0131ce..c5bb04a 100644 --- a/inst/templates/material-ocean.scss +++ b/inst/templates/material-ocean.scss @@ -1,36 +1,37 @@ /* rs-theme-name: Material Ocean {rsthemes} */ /* rs-theme-is-dark: TRUE */ -$base00: #090D14; -$base01: #0F121C; -$base02: #232530; -$base03: #6C6F93; -$base04: #A5ABD0; -$base05: #ffffff; -$purple: #C792E9; +$base00: #0F111A; +$base01: #1A1C25; +$base02: #3B3F51; +$base03: #464B5D; +$base04: #4B526D; +$base05: #8F93A2; +$base06: #ffffff; +$purple: #C792EA; $blue: #81AAFF; -$sky: #88DDFE; -$aqua: #84ffff; -$teal: #81D4CC; +$sky: #89DDFF; +$aqua: #84FFFF; +$teal: #80CBC4; $green: #C3E88D; -$gold: #FDCA68; -$orange: #F88C6C; +$gold: #FFCB6B; +$orange: #F78C6C; $red: #F07178; -$ui_background: $base01; -$ui_foreground: $base04; +$ui_background: $base00; +$ui_foreground: $base05; $code_string: $green; $code_function: $blue; $code_value: $orange; $code_variable: $gold; -$code_message: $sky; +$code_message: $aqua; $ui_rstudio_background: $base00; -$ui_rstudio_foreground: $base04; +$ui_rstudio_foreground: $base06; $ui_rstudio_border: $ui_background; -$rmd_chunk_background: $base00; +$rmd_chunk_background: darken($base00, 2%); $ui_rstudio_tabs_inactive_background: $base00; $ui_rstudio_tabs_inactive_foreground: $base04; $ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; $ui_rstudio_tabs_active_background: $base00; -$ui_rstudio_tabs_active_foreground: $base05; +$ui_rstudio_tabs_active_foreground: $base06; $ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; $ui_rstudio_toolbar_foreground: $base03; $ui_rstudio_search: $ui_rstudio_toolbar_background; @@ -38,34 +39,34 @@ $ui_rstudio_scrollbar_background: $ui_background; $ui_rstudio_scrollbar_handle: $rmd_chunk_background; $ui_cursor: $gold; $ui_cursor_normal_mode: $ui_cursor; -$ui_gutter_foreground: mix($base03, $base01, 50%); +$ui_gutter_foreground: $base03; $ui_gutter_background: $ui_background; -$ui_line_active: $base00; +$ui_line_active: darken($base00, 5%); $ui_selection: mix($base04, $base01, 10%); $ui_line_active_selection: $base02; $ui_line_active_gutter: $ui_background; $ui_bracket: transparentize($ui_cursor, 0.6); $ui_invisible: transparentize($ui_foreground, 0.7); $ui_indent_guide: $ui_invisible; -$ui_margin_line: $base02; +$ui_margin_line: $base01; $ui_debug_background: $base02; $ui_fold_arrows_foreground: $ui_cursor; $ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); $ui_line_find: $ui_selection; $ui_console_selection: $base00; $ui_completions_background: $base01; -$ui_completions_foreground: $base05; +$ui_completions_foreground: $base06; $ui_completions_border: $base00; $ui_completions_selected_background: $ui_line_active_selection; -$ui_completions_selected_foreground: $base05; -$ui_rstudio_job_progress_bar: $aqua; -$code_comment: $base03; +$ui_completions_selected_foreground: $base06; +$ui_rstudio_job_progress_bar: $purple; +$code_comment: $base04; $code_namespace_font_style: italic; $code_reserved: $purple; $code_operator: $sky; -$code_bracket: $sky; +$code_bracket: $teal; $code_namespace: $red; -$code_identifier: $base04; +$code_identifier: $base06; $code_string_background: inherit; $code_function_background: inherit; $code_value_background: inherit; @@ -101,6 +102,7 @@ $rmd_href_background: $code_reserved_background; > div:last-child { border-color: $ui_rstudio_background !important; } + $ui_command_palette_background: $ui_background; $ui_command_palette_search_background: $ui_command_palette_background; $ui_command_palette_border: $ui_command_palette_background; diff --git a/inst/templates/material.R b/inst/templates/material.R index 2b8089c..17f0aeb 100644 --- a/inst/templates/material.R +++ b/inst/templates/material.R @@ -53,12 +53,12 @@ material_base <- list( base07 = "#DAF3F0" ), ocean = list( - base00 = "#090D14", - base01 = "#0F121C", - base02 = "#232530", - base03 = "#6C6F93", - base04 = "#A5ABD0", - base05 = "#ffffff", + base00 = "#0F111A", + base01 = "#1A1C25", + base02 = "#3B3F51", + base03 = "#464B5D", + base04 = "#4B526D", + base05 = "#8F93A2", base06 = "#ffffff" ), palenight = list( @@ -191,10 +191,9 @@ material_rstheme( material_accents$base, dialog_foreground = "$ui_rstudio_foreground", dialog_heading_foreground = "$aqua", - ui_rstudio_job_progress_bar = "$aqua", - ui_foreground = "$base04", - ui_rstudio_tabs_inactive_foreground = "$base04", - code_identifier = "$base04" + ui_foreground = "$base05", + ui_rstudio_job_progress_bar = "$purple" + # ui_rstudio_tabs_inactive_foreground = "$base04" ) material_rstheme( From cc5f478a7cfab9e00ffdfb5e02e6698d8cf39a7d Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Sat, 9 Jan 2021 23:26:00 -0500 Subject: [PATCH 19/21] Update Material Palenight colors to match community theme https://github.com/material-theme/vsc-community-material-theme/raw/develop/themes/Community-Material-Theme-Palenight.json --- inst/templates/material-palenight.scss | 54 +++++++++++++------------- inst/templates/material.R | 27 +++++++------ 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/inst/templates/material-palenight.scss b/inst/templates/material-palenight.scss index 5bc32a5..cffe03f 100644 --- a/inst/templates/material-palenight.scss +++ b/inst/templates/material-palenight.scss @@ -1,36 +1,37 @@ /* rs-theme-name: Material Palenight {rsthemes} */ /* rs-theme-is-dark: TRUE */ -$base00: #222736; -$base01: #282E3F; -$base02: #232530; -$base03: #6C6F93; -$base04: #A5ABD0; -$base05: #ffffff; -$purple: #C792E9; +$base00: #292D3E; +$base01: #333747; +$base02: #3A3F58; +$base03: #4E5579; +$base04: #676E95; +$base05: #A6ACCD; +$base06: #FFFFFF; +$purple: #C792EA; $blue: #81AAFF; -$sky: #88DDFE; -$aqua: #84ffff; -$teal: #81D4CC; +$sky: #89DDFF; +$aqua: #84FFFF; +$teal: #80CBC4; $green: #C3E88D; -$gold: #FDCA68; -$orange: #F88C6C; +$gold: #FFCB6B; +$orange: #F78C6C; $red: #F07178; -$ui_background: $base01; -$ui_foreground: $base04; +$ui_background: $base00; +$ui_foreground: $base06; $code_string: $green; $code_function: $blue; $code_value: $orange; $code_variable: $gold; -$code_message: $sky; +$code_message: $aqua; $ui_rstudio_background: $base00; -$ui_rstudio_foreground: $base04; +$ui_rstudio_foreground: $base06; $ui_rstudio_border: $ui_background; -$rmd_chunk_background: $base00; +$rmd_chunk_background: darken($base00, 2%); $ui_rstudio_tabs_inactive_background: $base00; $ui_rstudio_tabs_inactive_foreground: $base04; $ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; $ui_rstudio_tabs_active_background: $base00; -$ui_rstudio_tabs_active_foreground: $base05; +$ui_rstudio_tabs_active_foreground: $base06; $ui_rstudio_toolbar_background: $ui_rstudio_tabs_active_background; $ui_rstudio_toolbar_foreground: $base03; $ui_rstudio_search: $ui_rstudio_toolbar_background; @@ -38,34 +39,34 @@ $ui_rstudio_scrollbar_background: $ui_background; $ui_rstudio_scrollbar_handle: $rmd_chunk_background; $ui_cursor: $gold; $ui_cursor_normal_mode: $ui_cursor; -$ui_gutter_foreground: mix($base03, $base01, 50%); +$ui_gutter_foreground: $base03; $ui_gutter_background: $ui_background; -$ui_line_active: $base00; +$ui_line_active: darken($base00, 5%); $ui_selection: mix($base04, $base01, 10%); $ui_line_active_selection: $base02; $ui_line_active_gutter: $ui_background; $ui_bracket: transparentize($ui_cursor, 0.6); $ui_invisible: transparentize($ui_foreground, 0.7); $ui_indent_guide: $ui_invisible; -$ui_margin_line: $base02; +$ui_margin_line: $base01; $ui_debug_background: $base02; $ui_fold_arrows_foreground: $ui_cursor; $ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); $ui_line_find: $ui_selection; $ui_console_selection: $base00; $ui_completions_background: $base01; -$ui_completions_foreground: $base05; +$ui_completions_foreground: $base06; $ui_completions_border: $base00; $ui_completions_selected_background: $ui_line_active_selection; -$ui_completions_selected_foreground: $base05; +$ui_completions_selected_foreground: $base06; $ui_rstudio_job_progress_bar: $blue; -$code_comment: $base03; +$code_comment: $base04; $code_namespace_font_style: italic; $code_reserved: $purple; $code_operator: $sky; -$code_bracket: $sky; +$code_bracket: $teal; $code_namespace: $red; -$code_identifier: $base04; +$code_identifier: $base06; $code_string_background: inherit; $code_function_background: inherit; $code_value_background: inherit; @@ -101,6 +102,7 @@ $rmd_href_background: $code_reserved_background; > div:last-child { border-color: $ui_rstudio_background !important; } + $ui_command_palette_background: $ui_background; $ui_command_palette_search_background: $ui_command_palette_background; $ui_command_palette_border: $ui_command_palette_background; diff --git a/inst/templates/material.R b/inst/templates/material.R index 17f0aeb..430f723 100644 --- a/inst/templates/material.R +++ b/inst/templates/material.R @@ -62,13 +62,13 @@ material_base <- list( base06 = "#ffffff" ), palenight = list( - base00 = "#222736", - base01 = "#282E3F", - base02 = "#232530", - base03 = "#6C6F93", - base04 = "#A5ABD0", - base05 = "#ffffff", - base06 = "#ffffff" + base00 = "#292D3E", + base01 = "#333747", + base02 = "#3A3F58", + base03 = "#4E5579", + base04 = "#676E95", + base05 = "#A6ACCD", + base06 = "#FFFFFF" ) ) @@ -193,17 +193,20 @@ material_rstheme( dialog_heading_foreground = "$aqua", ui_foreground = "$base05", ui_rstudio_job_progress_bar = "$purple" - # ui_rstudio_tabs_inactive_foreground = "$base04" ) material_rstheme( "Palenight", material_base$palenight, material_accents$base, - ui_rstudio_job_progress_bar = "$blue", dialog_foreground = "$ui_rstudio_foreground", dialog_heading_foreground = "$purple", - ui_foreground = "$base04", - ui_rstudio_tabs_inactive_foreground = "$base04", - code_identifier = "$base04" + ui_rstudio_job_progress_bar = "$blue" ) + +# make_rsthemes() +# hotload_rstheme("inst/themes/material.rstheme") +# hotload_rstheme("inst/themes/material-darker.rstheme") +# hotload_rstheme("inst/themes/material-lighter.rstheme") +# hotload_rstheme("inst/themes/material-ocean.rstheme") +# hotload_rstheme("inst/themes/material-palenight.rstheme") From 825284270e59c674314e077c68c71a95ed9fa502 Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Sun, 10 Jan 2021 14:51:16 -0500 Subject: [PATCH 20/21] Fix console selection highlight color --- inst/templates/material-darker.scss | 2 +- inst/templates/material-lighter.scss | 2 +- inst/templates/material-ocean.scss | 2 +- inst/templates/material-palenight.scss | 2 +- inst/templates/material.R | 2 +- inst/templates/material.scss | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/inst/templates/material-darker.scss b/inst/templates/material-darker.scss index 48b3a45..7b8a87e 100644 --- a/inst/templates/material-darker.scss +++ b/inst/templates/material-darker.scss @@ -53,7 +53,7 @@ $ui_debug_background: $base02; $ui_fold_arrows_foreground: $ui_cursor; $ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); $ui_line_find: $ui_selection; -$ui_console_selection: $base00; +$ui_console_selection: $ui_selection; $ui_completions_background: $base01; $ui_completions_foreground: $base06; $ui_completions_border: $base00; diff --git a/inst/templates/material-lighter.scss b/inst/templates/material-lighter.scss index a315461..0eadddf 100644 --- a/inst/templates/material-lighter.scss +++ b/inst/templates/material-lighter.scss @@ -54,7 +54,7 @@ $ui_debug_background: $base02; $ui_fold_arrows_foreground: $ui_cursor; $ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); $ui_line_find: $ui_selection; -$ui_console_selection: $base00; +$ui_console_selection: $ui_selection; $ui_completions_background: $base01; $ui_completions_foreground: $base06; $ui_completions_border: $base00; diff --git a/inst/templates/material-ocean.scss b/inst/templates/material-ocean.scss index c5bb04a..ff206de 100644 --- a/inst/templates/material-ocean.scss +++ b/inst/templates/material-ocean.scss @@ -53,7 +53,7 @@ $ui_debug_background: $base02; $ui_fold_arrows_foreground: $ui_cursor; $ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); $ui_line_find: $ui_selection; -$ui_console_selection: $base00; +$ui_console_selection: $ui_selection; $ui_completions_background: $base01; $ui_completions_foreground: $base06; $ui_completions_border: $base00; diff --git a/inst/templates/material-palenight.scss b/inst/templates/material-palenight.scss index cffe03f..580e713 100644 --- a/inst/templates/material-palenight.scss +++ b/inst/templates/material-palenight.scss @@ -53,7 +53,7 @@ $ui_debug_background: $base02; $ui_fold_arrows_foreground: $ui_cursor; $ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); $ui_line_find: $ui_selection; -$ui_console_selection: $base00; +$ui_console_selection: $ui_selection; $ui_completions_background: $base01; $ui_completions_foreground: $base06; $ui_completions_border: $base00; diff --git a/inst/templates/material.R b/inst/templates/material.R index 430f723..2ef2828 100644 --- a/inst/templates/material.R +++ b/inst/templates/material.R @@ -115,7 +115,7 @@ material_rstheme <- function( ui_completions_border = "$base00", ui_completions_foreground = "$base06", ui_completions_selected_foreground = "$base06", - ui_console_selection = "$base00", + ui_console_selection = "$ui_selection", ui_selection = "mix($base04, $base01, 10%)", ui_line_active = "darken($base00, 5%)", ui_line_active_selection = "$base02", diff --git a/inst/templates/material.scss b/inst/templates/material.scss index 1ab3cb0..1367e94 100644 --- a/inst/templates/material.scss +++ b/inst/templates/material.scss @@ -53,7 +53,7 @@ $ui_debug_background: $base02; $ui_fold_arrows_foreground: $ui_cursor; $ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); $ui_line_find: $ui_selection; -$ui_console_selection: $base00; +$ui_console_selection: $ui_selection; $ui_completions_background: $base01; $ui_completions_foreground: $base06; $ui_completions_border: $base00; From a9dfddef33b54b426c15e56876c475d87b3d283e Mon Sep 17 00:00:00 2001 From: Garrick Aden-Buie Date: Sun, 10 Jan 2021 15:11:35 -0500 Subject: [PATCH 21/21] Tweak Ayu Light colors --- inst/templates/ayu-light.R | 27 ++++++++++++++++----------- inst/templates/ayu-light.scss | 26 +++++++++++++------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/inst/templates/ayu-light.R b/inst/templates/ayu-light.R index 7822d67..2583dde 100644 --- a/inst/templates/ayu-light.R +++ b/inst/templates/ayu-light.R @@ -14,7 +14,7 @@ rstheme( base05 = "#575F66", base06 = "#ABB0B6", base07 = "#8A919966", - purple = "#A37ACC", + purple = "#9e75c7", blue = "#399EE6", teal = "#4CBF99", green = "#86B300", @@ -25,7 +25,7 @@ rstheme( orange05 = "#ED9366", pink = "#F07171" ), - ui_background = "$base01", + ui_background = "$base00", ui_foreground = "$base05", code_string = "$green", code_function = "$orange02", @@ -34,7 +34,7 @@ rstheme( code_variable = "$blue", code_message = "$teal", code_reserved = "$orange03", - code_operator = "$orange01", + code_operator = "$orange02", code_bracket = "$base05", code_namespace = "$pink", code_identifier = "$base05", @@ -49,17 +49,17 @@ rstheme( ui_console_selection = "$base04", ui_line_active = "$base00", ui_line_active_selection = "$base03", - ui_margin_line = "$base03", - rmd_chunk_background = "$base00", + ui_margin_line = "$base01", + rmd_chunk_background = "$base01", ui_cursor = "$orange01", ui_gutter_foreground = "$base07", ui_debug_background = "$base03", - rmd_chunk_header = "$green", + rmd_chunk_header = "$purple", rmd_heading_foreground = "$green", - rmd_href = "$pink", + rmd_href = "$blue", ui_completions_background = "$base00", ui_completions_border = "$base00", - ui_completions_foreground = "$base03", + ui_completions_foreground = "$base05", ui_completions_selected_foreground = "$base03", rstheme_command_palette(), rstheme_large_tabs(), @@ -70,15 +70,17 @@ rstheme( input_background = "$base01", select_foreground = "$base06", select_background = "$base01", - button_hover_background = "$base01", - button_hover_foreground = "$base05" + button_background = "$orange02", + button_foreground = "$base01", + button_hover_background = "$orange04", + button_hover_foreground = "$base00" ), rstheme_rainbow_parentheses( "$teal", "$pink", "$base05", "$purple", "$blue", "$green" ), '.rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { - box-shadow: 0 -2px 0 $teal inset; + box-shadow: 0 -2px 0 $orange01 inset; border-radius: 0 !important; } } @@ -89,3 +91,6 @@ rstheme( } ' ) + +# make_rsthemes() +# hotload_rstheme("inst/themes/ayu-light.rstheme") diff --git a/inst/templates/ayu-light.scss b/inst/templates/ayu-light.scss index 6f93c25..0ab5928 100644 --- a/inst/templates/ayu-light.scss +++ b/inst/templates/ayu-light.scss @@ -8,7 +8,7 @@ $base04: #D1E4F4; $base05: #575F66; $base06: #ABB0B6; $base07: #8A919966; -$purple: #A37ACC; +$purple: #9e75c7; $blue: #399EE6; $teal: #4CBF99; $green: #86B300; @@ -18,7 +18,7 @@ $orange03: #FA8D3E; $orange04: #E6BA7E; $orange05: #ED9366; $pink: #F07171; -$ui_background: $base01; +$ui_background: $base00; $ui_foreground: $base05; $code_string: $green; $code_function: $orange02; @@ -28,7 +28,7 @@ $code_message: $teal; $ui_rstudio_background: $base00; $ui_rstudio_foreground: $base02; $ui_rstudio_border: $ui_background; -$rmd_chunk_background: $base00; +$rmd_chunk_background: $base01; $ui_rstudio_tabs_inactive_background: $base00; $ui_rstudio_tabs_inactive_foreground: transparentize($ui_foreground, 0.4); $ui_rstudio_tabs_inactive_hover_background: $ui_rstudio_tabs_inactive_background; @@ -50,14 +50,14 @@ $ui_line_active_gutter: $ui_background; $ui_bracket: transparentize($ui_cursor, 0.6); $ui_invisible: transparentize($ui_foreground, 0.7); $ui_indent_guide: $ui_invisible; -$ui_margin_line: $base03; +$ui_margin_line: $base01; $ui_debug_background: $base03; $ui_fold_arrows_foreground: $ui_cursor; $ui_fold_arrows_background: transparentize($ui_fold_arrows_foreground, 0.5); $ui_line_find: $ui_selection; $ui_console_selection: $base04; $ui_completions_background: $base00; -$ui_completions_foreground: $base03; +$ui_completions_foreground: $base05; $ui_completions_border: $base00; $ui_completions_selected_background: $ui_line_active_selection; $ui_completions_selected_foreground: $base03; @@ -65,7 +65,7 @@ $ui_rstudio_job_progress_bar: $teal; $code_comment: $base06; $code_namespace_font_style: italic; $code_reserved: $orange03; -$code_operator: $orange01; +$code_operator: $orange02; $code_bracket: $base05; $code_namespace: $pink; $code_identifier: $base05; @@ -84,16 +84,16 @@ $code_other: $code_string; $rmd_heading_weight: 600; $rmd_heading_foreground: $green; $rmd_heading_background: $code_string_background; -$rmd_chunk_header: $green; +$rmd_chunk_header: $purple; $rmd_chunk_header_background: $code_function_background; -$rmd_href: $pink; +$rmd_href: $blue; $rmd_href_background: $code_reserved_background; @import "rstudio/_rstudio-light.scss"; @import "rstudio/_rstudio-light-flatter.scss"; @import "rstudio/_terminal.scss"; .rstudio-themes-flat .gwt-TabLayoutPanelTab-selected { .gwt-TabLayoutPanelTabInner .rstheme_tabLayoutCenter { - box-shadow: 0 -2px 0 $teal inset; + box-shadow: 0 -2px 0 $orange01 inset; border-radius: 0 !important; } } @@ -117,11 +117,11 @@ $ui_rstudio_dialog_selected_background: $ui_rstudio_dialog_border; $ui_rstudio_dialog_selected_foreground: $base05; $ui_rstudio_dialog_heading_foreground: $code_function; $ui_rstudio_dialog_help_foreground: $base05; -$ui_rstudio_dialog_button_foreground: $ui_rstudio_dialog_foreground; -$ui_rstudio_dialog_button_background: $ui_rstudio_dialog_background; +$ui_rstudio_dialog_button_foreground: $base01; +$ui_rstudio_dialog_button_background: $orange02; $ui_rstudio_dialog_button_border: $ui_rstudio_dialog_border; -$ui_rstudio_dialog_button_hover_foreground: $base05; -$ui_rstudio_dialog_button_hover_background: $base01; +$ui_rstudio_dialog_button_hover_foreground: $base00; +$ui_rstudio_dialog_button_hover_background: $orange04; $ui_rstudio_dialog_button_hover_border: $ui_rstudio_dialog_border; $ui_rstudio_dialog_input_foreground: $code_value; $ui_rstudio_dialog_input_background: $base01;