diff options
29 files changed, 2463 insertions, 1656 deletions
diff --git a/doc/default_theme.rasi b/doc/default_theme.rasi index 8ee95e2b..d34581e4 100644 --- a/doc/default_theme.rasi +++ b/doc/default_theme.rasi @@ -40,9 +40,9 @@ #message { border: 1px dash 0px 0px ; border-color: @separatorcolor; - padding: 2px 0px 0px ; + padding: 1px ; } -#message.normal { +#textbox { text-color: @foreground; } #listview { diff --git a/doc/old-theme-convert-output.rasi b/doc/old-theme-convert-output.rasi index 9f7dbf12..20a0303b 100644 --- a/doc/old-theme-convert-output.rasi +++ b/doc/old-theme-convert-output.rasi @@ -41,9 +41,9 @@ #message { border: 2px 0px 0px ; border-color: @separatorcolor; - padding: 2px 0px 0px ; + padding: 1px ; } -#message.normal { +#textbox { text-color: @foreground; } #listview { diff --git a/include/default-theme.h b/include/default-theme.h index 7876b9a8..bcc3fd49 100644 --- a/include/default-theme.h +++ b/include/default-theme.h @@ -73,7 +73,7 @@ const char *default_theme = " padding: 2px 0px 0px ;" " border-color: @separatorcolor;" "}" - "#message normal {" + "#textbox {" " text-color: @foreground;" "}" "#listview {" diff --git a/source/theme.c b/source/theme.c index 9081fcbd..b0e0dc61 100644 --- a/source/theme.c +++ b/source/theme.c @@ -856,11 +856,7 @@ void rofi_theme_convert_old ( void ) } /* Line Padding */ { - char *str = g_strdup_printf ( "#element { padding: %dpx;}", config.line_padding ); - rofi_theme_parse_string ( str ); - g_free ( str ); - // inputbar - str = g_strdup_printf ( "#inputbar { padding: %dpx;}", config.line_padding ); + char *str = g_strdup_printf ( "#element, inputbar, message { padding: %dpx;}", config.line_padding ); rofi_theme_parse_string ( str ); g_free ( str ); } diff --git a/themes/Adapta-Nokto.rasi b/themes/Adapta-Nokto.rasi index 0738fb5d..11ad6a68 100644 --- a/themes/Adapta-Nokto.rasi +++ b/themes/Adapta-Nokto.rasi @@ -1,89 +1,127 @@ -//! ------------------------------------------------------------------------------ -//! ROFI Color theme -//! Based on Adapta-Nokto GTK theme (https://github.com/adapta-project/adapta-gtk-theme) -//! User: PyGeek03 -//! Copyright: PyGeek03 -//! ------------------------------------------------------------------------------ * { - spacing: 2; - background: #00000000; + selected-normal-foreground: rgba ( 250, 251, 252, 100 % ); + foreground: rgba ( 250, 251, 252, 100 % ); + normal-foreground: @foreground; + alternate-normal-background: rgba ( 69, 90, 100, 100 % ); + red: rgba ( 220, 50, 47, 100 % ); + selected-urgent-foreground: rgba ( 253, 246, 227, 100 % ); + blue: rgba ( 38, 139, 210, 100 % ); + urgent-foreground: rgba ( 255, 82, 82, 100 % ); + alternate-urgent-background: rgba ( 69, 90, 100, 100 % ); + active-foreground: rgba ( 0, 188, 212, 100 % ); + lightbg: rgba ( 238, 232, 213, 100 % ); + selected-active-foreground: rgba ( 253, 246, 227, 100 % ); + alternate-active-background: rgba ( 69, 90, 100, 100 % ); + background: rgba ( 58, 76, 84, 100 % ); + bordercolor: rgba ( 42, 55, 62, 100 % ); + alternate-normal-foreground: @foreground; + normal-background: rgba ( 69, 90, 100, 100 % ); + lightfg: rgba ( 88, 104, 117, 100 % ); + selected-normal-background: rgba ( 0, 188, 212, 100 % ); + border-color: @foreground; + spacing: 2; + separatorcolor: rgba ( 195, 198, 200, 100 % ); + urgent-background: rgba ( 69, 90, 100, 100 % ); + selected-urgent-background: rgba ( 255, 82, 82, 100 % ); + alternate-urgent-foreground: @urgent-foreground; + background-color: rgba ( 0, 0, 0, 0 % ); + alternate-active-foreground: @active-foreground; + active-background: rgba ( 69, 90, 100, 100 % ); + selected-active-background: rgba ( 0, 150, 136, 100 % ); } #window { - border: 2; - foreground: #C3C6C8FF; - padding: 5; - background: #3A4C54FF; + background-color: @background; + border: 1; + padding: 5; } -#window.mainbox { +#mainbox { border: 0; padding: 0; } -#window.mainbox.message.box { - border: 2px 0px 0px ; - padding: 2px 0px 0px ; +#message { + border: 1px dash 0px 0px ; + border-color: @separatorcolor; + padding: 1px ; } -#window.mainbox.message.normal { - foreground: #FAFBFCFF; - background: #455A64FF; +#textbox { + text-color: @foreground; } -#window.mainbox.listview { - fixed-height: 1; - border: 2px 0px 0px ; - columns: 1; +#listview { + fixed-height: 0; + border: 2px dash 0px 0px ; + border-color: @separatorcolor; + spacing: 2px ; + scrollbar: true; padding: 2px 0px 0px ; } -#window.mainbox.listview.element { - border: 0; -} -#window.mainbox.listview.element.normal.normal { - foreground: #FAFBFCFF; - background: #455A64FF; -} -#window.mainbox.listview.element.normal.urgent { - foreground: #FF5252FF; - background: #455A64FF; -} -#window.mainbox.listview.element.normal.active { - foreground: #00BCD4FF; - background: #455A64FF; -} -#window.mainbox.listview.element.selected.normal { - foreground: #FAFBFCFF; - background: #00BCD4FF; -} -#window.mainbox.listview.element.selected.urgent { - foreground: #FDF6E3FF; - background: #FF5252FF; -} -#window.mainbox.listview.element.selected.active { - foreground: #FDF6E3FF; - background: #009688FF; -} -#window.mainbox.listview.element.alternate.normal { - foreground: #FAFBFCFF; - background: #455A64FF; -} -#window.mainbox.listview.element.alternate.urgent { - foreground: #FF5252FF; - background: #455A64FF; -} -#window.mainbox.listview.element.alternate.active { - foreground: #00BCD4FF; - background: #455A64FF; -} -#window.mainbox.listview.scrollbar { +#element { border: 0; - padding: 0; -} -#window.mainbox.sidebar.box { - border: 2px 0px 0px ; -} -#window.mainbox.inputbar { - spacing: 0; -} -#window.mainbox.inputbar.box { -} -#window.mainbox.inputbar.normal { - foreground: #FAFBFCFF; - background: #455A64FF; + padding: 1px ; +} +#element.normal.normal { + background-color: @normal-background; + text-color: @normal-foreground; +} +#element.normal.urgent { + background-color: @urgent-background; + text-color: @urgent-foreground; +} +#element.normal.active { + background-color: @active-background; + text-color: @active-foreground; +} +#element.selected.normal { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; +} +#element.selected.urgent { + background-color: @selected-urgent-background; + text-color: @selected-urgent-foreground; +} +#element.selected.active { + background-color: @selected-active-background; + text-color: @selected-active-foreground; +} +#element.alternate.normal { + background-color: @alternate-normal-background; + text-color: @alternate-normal-foreground; +} +#element.alternate.urgent { + background-color: @alternate-urgent-background; + text-color: @alternate-urgent-foreground; +} +#element.alternate.active { + background-color: @alternate-active-background; + text-color: @alternate-active-foreground; +} +#scrollbar { + width: 4px ; + border: 0; + handle-width: 8px ; + padding: 0; +} +#sidebar { + border: 2px dash 0px 0px ; + border-color: @separatorcolor; +} +#button.selected { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; +} +#inputbar { + spacing: 0; + text-color: @normal-foreground; + padding: 1px ; +} +#case-indicator { + spacing: 0; + text-color: @normal-foreground; +} +#entry { + spacing: 0; + text-color: @normal-foreground; +} +#prompt { + spacing: 0; + text-color: @normal-foreground; } diff --git a/themes/Arc.rasi b/themes/Arc.rasi index dfdbd476..7ff3f40c 100644 --- a/themes/Arc.rasi +++ b/themes/Arc.rasi @@ -1,89 +1,127 @@ -//! ------------------------------------------------------------------------------ -//! ROFI Color theme -//! User: Sergio Morales -//! Copyright: Sergio Morales -//! ------------------------------------------------------------------------------ -//! Use extended color scheme * { - spacing: 2; - background: #00000000; + selected-normal-foreground: rgba ( 255, 255, 255, 100 % ); + foreground: rgba ( 82, 93, 118, 100 % ); + normal-foreground: @foreground; + alternate-normal-background: rgba ( 245, 245, 245, 100 % ); + red: rgba ( 220, 50, 47, 100 % ); + selected-urgent-foreground: rgba ( 220, 50, 47, 100 % ); + blue: rgba ( 38, 139, 210, 100 % ); + urgent-foreground: rgba ( 220, 50, 47, 100 % ); + alternate-urgent-background: rgba ( 245, 245, 245, 100 % ); + active-foreground: rgba ( 194, 202, 208, 100 % ); + lightbg: rgba ( 238, 232, 213, 100 % ); + selected-active-foreground: rgba ( 194, 202, 208, 100 % ); + alternate-active-background: rgba ( 245, 245, 245, 100 % ); + background: rgba ( 255, 255, 255, 100 % ); + bordercolor: rgba ( 245, 245, 245, 100 % ); + alternate-normal-foreground: @foreground; + normal-background: rgba ( 255, 255, 255, 100 % ); + lightfg: rgba ( 88, 104, 117, 100 % ); + selected-normal-background: rgba ( 82, 148, 226, 100 % ); + border-color: @foreground; + spacing: 2; + separatorcolor: @foreground; + urgent-background: rgba ( 255, 255, 255, 100 % ); + selected-urgent-background: rgba ( 82, 148, 226, 100 % ); + alternate-urgent-foreground: @urgent-foreground; + background-color: rgba ( 0, 0, 0, 0 % ); + alternate-active-foreground: @active-foreground; + active-background: rgba ( 255, 255, 255, 100 % ); + selected-active-background: rgba ( 82, 148, 226, 100 % ); } #window { - border: 2; - foreground: #F5F5F5FF; - padding: 5; - background: #FFFFFFFF; + background-color: @background; + border: 1; + padding: 5; } -#window.mainbox { +#mainbox { border: 0; padding: 0; } -#window.mainbox.message.box { - border: 2px 0px 0px ; - padding: 2px 0px 0px ; +#message { + border: 2px 0px 0px ; + border-color: @separatorcolor; + padding: 1px ; } -#window.mainbox.message.normal { - foreground: #525D76FF; - background: #FFFFFFFF; +#textbox { + text-color: @foreground; } -#window.mainbox.listview { - fixed-height: 1; +#listview { + fixed-height: 0; border: 2px 0px 0px ; - columns: 1; + border-color: @separatorcolor; + spacing: 2px ; + scrollbar: true; padding: 2px 0px 0px ; } -#window.mainbox.listview.element { - border: 0; +#element { + border: 0; + padding: 1px ; } -#window.mainbox.listview.element.normal.normal { - foreground: #525D76FF; - background: #FFFFFFFF; +#element.normal.normal { + background-color: @normal-background; + text-color: @normal-foreground; } -#window.mainbox.listview.element.normal.urgent { - foreground: #DC322FFF; - background: #FFFFFFFF; +#element.normal.urgent { + background-color: @urgent-background; + text-color: @urgent-foreground; } -#window.mainbox.listview.element.normal.active { - foreground: #C2CAD0FF; - background: #FFFFFFFF; +#element.normal.active { + background-color: @active-background; + text-color: @active-foreground; } -#window.mainbox.listview.element.selected.normal { - foreground: #FFFFFFFF; - background: #5294E2FF; +#element.selected.normal { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; } -#window.mainbox.listview.element.selected.urgent { - foreground: #DC322FFF; - background: #5294E2FF; +#element.selected.urgent { + background-color: @selected-urgent-background; + text-color: @selected-urgent-foreground; } -#window.mainbox.listview.element.selected.active { - foreground: #C2CAD0FF; - background: #5294E2FF; +#element.selected.active { + background-color: @selected-active-background; + text-color: @selected-active-foreground; } -#window.mainbox.listview.element.alternate.normal { - foreground: #525D76FF; - background: #F5F5F5FF; +#element.alternate.normal { + background-color: @alternate-normal-background; + text-color: @alternate-normal-foreground; } -#window.mainbox.listview.element.alternate.urgent { - foreground: #DC322FFF; - background: #F5F5F5FF; +#element.alternate.urgent { + background-color: @alternate-urgent-background; + text-color: @alternate-urgent-foreground; } -#window.mainbox.listview.element.alternate.active { - foreground: #C2CAD0FF; - background: #F5F5F5FF; +#element.alternate.active { + background-color: @alternate-active-background; + text-color: @alternate-active-foreground; } -#window.mainbox.listview.scrollbar { - border: 0; - padding: 0; +#scrollbar { + width: 4px ; + border: 0; + handle-width: 8px ; + padding: 0; +} +#sidebar { + border: 2px 0px 0px ; + border-color: @separatorcolor; +} +#button.selected { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; } -#window.mainbox.sidebar.box { - border: 2px 0px 0px ; +#inputbar { + spacing: 0; + text-color: @normal-foreground; + padding: 1px ; } -#window.mainbox.inputbar { - spacing: 0; +#case-indicator { + spacing: 0; + text-color: @normal-foreground; } -#window.mainbox.inputbar.box { +#entry { + spacing: 0; + text-color: @normal-foreground; } -#window.mainbox.inputbar.normal { - foreground: #525D76FF; - background: #FFFFFFFF; +#prompt { + spacing: 0; + text-color: @normal-foreground; } diff --git a/themes/DarkBlue.rasi b/themes/DarkBlue.rasi index f7f0357b..308225ec 100644 --- a/themes/DarkBlue.rasi +++ b/themes/DarkBlue.rasi @@ -1,94 +1,127 @@ -//! ------------------------------------------------------------------------------ -//! ROFI Color theme -//! User: qball -//! Copyright: Dave Davenport -//! ------------------------------------------------------------------------------ -//! "Color scheme for normal row" Set from: File * { - spacing: 2; - background: #00000000; + selected-normal-foreground: rgba ( 2, 20, 63, 100 % ); + foreground: rgba ( 219, 223, 188, 100 % ); + normal-foreground: @foreground; + alternate-normal-background: rgba ( 0, 0, 0, 0 % ); + red: rgba ( 220, 50, 47, 100 % ); + selected-urgent-foreground: rgba ( 2, 20, 63, 100 % ); + blue: rgba ( 38, 139, 210, 100 % ); + urgent-foreground: rgba ( 255, 129, 255, 100 % ); + alternate-urgent-background: rgba ( 0, 0, 0, 0 % ); + active-foreground: rgba ( 138, 196, 255, 100 % ); + lightbg: rgba ( 238, 232, 213, 100 % ); + selected-active-foreground: rgba ( 2, 20, 63, 100 % ); + alternate-active-background: rgba ( 0, 0, 0, 0 % ); + background: rgba ( 0, 0, 33, 87 % ); + bordercolor: rgba ( 219, 223, 188, 100 % ); + alternate-normal-foreground: @foreground; + normal-background: rgba ( 0, 0, 208, 0 % ); + lightfg: rgba ( 88, 104, 117, 100 % ); + selected-normal-background: rgba ( 219, 223, 188, 100 % ); + border-color: @foreground; + spacing: 2; + separatorcolor: rgba ( 219, 223, 188, 100 % ); + urgent-background: rgba ( 0, 0, 208, 0 % ); + selected-urgent-background: rgba ( 255, 129, 127, 100 % ); + alternate-urgent-foreground: @urgent-foreground; + background-color: rgba ( 0, 0, 0, 0 % ); + alternate-active-foreground: @active-foreground; + active-background: rgba ( 0, 0, 208, 0 % ); + selected-active-background: rgba ( 138, 196, 255, 100 % ); } #window { - border: 2; - foreground: #DBDFBCFF; - padding: 5; - background: #000021DD; + background-color: @background; + border: 1; + padding: 5; } -#window.mainbox { +#mainbox { border: 0; padding: 0; } -#window.mainbox.message.box { - border: 2px 0px 0px ; - padding: 2px 0px 0px ; +#message { + border: 2px 0px 0px ; + border-color: @separatorcolor; + padding: 1px ; } -#window.mainbox.message.normal { - foreground: #DBDFBCFF; - background: #00000000; +#textbox { + text-color: @foreground; } -#window.mainbox.listview { - fixed-height: 1; +#listview { + fixed-height: 0; border: 2px 0px 0px ; - columns: 1; + border-color: @separatorcolor; + spacing: 2px ; + scrollbar: true; padding: 2px 0px 0px ; } -#window.mainbox.listview.element { - border: 0; +#element { + border: 0; + padding: 1px ; } -#window.mainbox.listview.element.normal.normal { - foreground: #DBDFBCFF; - background: #00000000; +#element.normal.normal { + background-color: @normal-background; + text-color: @normal-foreground; } -#window.mainbox.listview.element.normal.urgent { - foreground: #FF81FFFF; - background: #00000000; +#element.normal.urgent { + background-color: @urgent-background; + text-color: @urgent-foreground; } -#window.mainbox.listview.element.normal.active { - foreground: #8AC4FFFF; - background: #00000000; +#element.normal.active { + background-color: @active-background; + text-color: @active-foreground; } -#window.mainbox.listview.element.selected.normal { - foreground: #02143FFF; - background: #DBDFBCFF; +#element.selected.normal { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; } -#window.mainbox.listview.element.selected.urgent { - foreground: #02143FFF; - background: #FF817FFF; +#element.selected.urgent { + background-color: @selected-urgent-background; + text-color: @selected-urgent-foreground; } -#window.mainbox.listview.element.selected.active { - foreground: #02143FFF; - background: #8AC4FFFF; +#element.selected.active { + background-color: @selected-active-background; + text-color: @selected-active-foreground; } -#window.mainbox.listview.element.alternate.normal { - foreground: #DBDFBCFF; - background: #00000000; +#element.alternate.normal { + background-color: @alternate-normal-background; + text-color: @alternate-normal-foreground; } -#window.mainbox.listview.element.alternate.urgent { - foreground: #FF81FFFF; - background: #00000000; +#element.alternate.urgent { + background-color: @alternate-urgent-background; + text-color: @alternate-urgent-foreground; } -#window.mainbox.listview.element.alternate.active { - foreground: #8AC4FFFF; - background: #00000000; +#element.alternate.active { + background-color: @alternate-active-background; + text-color: @alternate-active-foreground; } -#window.mainbox.listview.scrollbar { - border: 0; - padding: 0; +#scrollbar { + width: 4px ; + border: 0; + handle-width: 8px ; + padding: 0; +} +#sidebar { + border: 2px 0px 0px ; + border-color: @separatorcolor; } -#window.mainbox.sidebar.box { - border: 2px 0px 0px ; +#button.selected { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; } -#window.mainbox.sidebar.button selected{ - border: 2px 0px 0px ; - foreground: #02143FFF; - background: #DBDFBCFF; +#inputbar { + spacing: 0; + text-color: @normal-foreground; + padding: 1px ; } -#window.mainbox.inputbar { - spacing: 0; +#case-indicator { + spacing: 0; + text-color: @normal-foreground; } -#window.mainbox.inputbar.box { +#entry { + spacing: 0; + text-color: @normal-foreground; } -#window.mainbox.inputbar.normal { - foreground: #DBDFBCFF; - background: #00000000; +#prompt { + spacing: 0; + text-color: @normal-foreground; } diff --git a/themes/Indego.rasi b/themes/Indego.rasi index 04cec9c5..713399f8 100644 --- a/themes/Indego.rasi +++ b/themes/Indego.rasi @@ -1,89 +1,127 @@ -//! ------------------------------------------------------------------------------ -//! ROFI Color theme -//! User: qball -//! Copyright: Dave Davenport -//! ------------------------------------------------------------------------------ -//! "Color scheme for normal row" Set from: File * { - spacing: 2; - background: #00000000; + selected-normal-foreground: rgba ( 232, 234, 246, 100 % ); + foreground: rgba ( 232, 234, 246, 100 % ); + normal-foreground: @foreground; + alternate-normal-background: rgba ( 40, 53, 147, 100 % ); + red: rgba ( 220, 50, 47, 100 % ); + selected-urgent-foreground: rgba ( 183, 28, 28, 100 % ); + blue: rgba ( 38, 139, 210, 100 % ); + urgent-foreground: rgba ( 255, 205, 210, 100 % ); + alternate-urgent-background: rgba ( 183, 28, 28, 100 % ); + active-foreground: rgba ( 178, 235, 242, 100 % ); + lightbg: rgba ( 238, 232, 213, 100 % ); + selected-active-foreground: rgba ( 0, 96, 100, 100 % ); + alternate-active-background: rgba ( 0, 96, 100, 100 % ); + background: rgba ( 26, 35, 126, 100 % ); + bordercolor: rgba ( 232, 234, 246, 100 % ); + alternate-normal-foreground: @foreground; + normal-background: rgba ( 152, 108, 128, 3 % ); + lightfg: rgba ( 88, 104, 117, 100 % ); + selected-normal-background: rgba ( 63, 81, 181, 100 % ); + border-color: @foreground; + spacing: 2; + separatorcolor: rgba ( 232, 234, 246, 100 % ); + urgent-background: rgba ( 223, 110, 0, 6 % ); + selected-urgent-background: rgba ( 255, 205, 210, 100 % ); + alternate-urgent-foreground: @urgent-foreground; + background-color: rgba ( 0, 0, 0, 0 % ); + alternate-active-foreground: @active-foreground; + active-background: rgba ( 223, 110, 0, 6 % ); + selected-active-background: rgba ( 178, 235, 242, 100 % ); } #window { - border: 2; - foreground: #E8EAF6FF; - padding: 5; - background: #1A237EFF; + background-color: @background; + border: 1; + padding: 5; } -#window.mainbox { +#mainbox { border: 0; padding: 0; } -#window.mainbox.message.box { - border: 2px 0px 0px ; - padding: 2px 0px 0px ; +#message { + border: 2px 0px 0px ; + border-color: @separatorcolor; + padding: 1px ; } -#window.mainbox.message.normal { - foreground: #E8EAF6FF; - background: #7986CB00; +#textbox { + text-color: @foreground; } -#window.mainbox.listview { - fixed-height: 1; +#listview { + fixed-height: 0; border: 2px 0px 0px ; - columns: 1; + border-color: @separatorcolor; + spacing: 2px ; + scrollbar: true; padding: 2px 0px 0px ; } -#window.mainbox.listview.element { - border: 0; +#element { + border: 0; + padding: 1px ; } -#window.mainbox.listview.element.normal.normal { - foreground: #E8EAF6FF; - background: #7986CB00; +#element.normal.normal { + background-color: @normal-background; + text-color: @normal-foreground; } -#window.mainbox.listview.element.normal.urgent { - foreground: #FFCDD2FF; - background: #FDF6E300; +#element.normal.urgent { + background-color: @urgent-background; + text-color: @urgent-foreground; } -#window.mainbox.listview.element.normal.active { - foreground: #B2EBF2FF; - background: #FDF6E300; +#element.normal.active { + background-color: @active-background; + text-color: @active-foreground; } -#window.mainbox.listview.element.selected.normal { - foreground: #E8EAF6FF; - background: #3F51B5FF; +#element.selected.normal { + background-color: @selected-normal-background; + text-color: @selected-normal-foreground; } -#window.mainbox.listview.element.selected.urgent { - foreground: #B71C1CFF; - background: #FFCDD2FF; +#element.selected.urgent { + background-color: @selected-urgent-background; + text-color: @selected-urgent-foreground; } -#window.mainbox.listview.element.selected.active { - foreground: #006064FF; - background: #B2EBF2FF; +#element.selected.active { + background-color: @selected-active-background; + text-color: @selected-active-foreground; } -#window.mainbox.listview.element.alternate.normal { - foregr |