Merge branch 'master' into johannes/nord-theme

This commit is contained in:
Johannes Marbach
2024-06-03 21:06:23 +02:00
159 changed files with 666 additions and 142 deletions

View File

@@ -632,8 +632,161 @@ static const bbx_theme pmos_dark = {
}
};
/* Nord themes (based on https://www.nordtheme.com/docs/colors-and-palettes) */
/* Adwaita dark (based on https://gitlab.gnome.org/GNOME/libadwaita) */
static const bbx_theme adwaita_dark = {
.name = "adwaita-dark",
.window = {
.bg_color = 0x151515
},
.header = {
.bg_color = 0x242424,
.border_width = 0,
.border_color = 0x242424,
.pad = 10,
.gap = 10
},
.keyboard = {
.bg_color = 0x242424,
.border_width = 2,
.border_color = 0x242424,
.pad = 20,
.gap = 10,
.keys = {
.border_width = 1,
.corner_radius = 5,
.key_char = {
.normal = {
.fg_color = 0xDEDDDA,
.bg_color = 0x464448,
.border_color = 0x464448
},
.pressed = {
.fg_color = 0xDEDDDA,
.bg_color = 0x747077,
.border_color = 0x747077
}
},
.key_non_char = {
.normal = {
.fg_color = 0xDEDDDA,
.bg_color = 0x3A3A3A,
.border_color = 0x3A3A3A
},
.pressed = {
.fg_color = 0xDEDDDA,
.bg_color = 0x666666,
.border_color = 0x666666
}
},
.key_mod_act = {
.normal = {
.fg_color = 0x1E1E1E,
.bg_color = 0x747077,
.border_color = 0x747077
},
.pressed = {
.fg_color = 0xDEDDDA,
.bg_color = 0x464448,
.border_color = 0x464448
}
},
.key_mod_inact = {
.normal = {
.fg_color = 0xDEDDDA,
.bg_color = 0x3A3A3A,
.border_color = 0x3A3A3A
},
.pressed = {
.fg_color = 0xDEDDDA,
.bg_color = 0x3A3A3A,
.border_color = 0x3A3A3A
}
}
}
},
.button = {
.border_width = 1,
.corner_radius = 5,
.pad = 8,
.normal = {
.fg_color = 0xDEDDDA,
.bg_color = 0x3A3A3A,
.border_color = 0x3A3A3A
},
.pressed = {
.fg_color = 0xDEDDDA,
.bg_color = 0x666666,
.border_color = 0x666666
}
},
.textarea = {
.fg_color = 0xDEDDDA,
.bg_color = 0x282828,
.border_width = 1,
.border_color = 0x1C71D8,
.corner_radius = 10,
.pad = 8,
.placeholder_color = 0x1C71D8,
.cursor = {
.width = 2,
.color = 0xDEDDDA,
.period = 700
}
},
.dropdown = {
.button = {
.border_width = 1,
.corner_radius = 5,
.pad = 8,
.normal = {
.fg_color = 0xDEDDDA,
.bg_color = 0x3A3A3A,
.border_color = 0x3A3A3A
},
.pressed = {
.fg_color = 0xDEDDDA,
.bg_color = 0x666666,
.border_color = 0x666666
}
},
.list = {
.fg_color = 0xDEDDDA,
.bg_color = 0x383838,
.selection_fg_color = 0xDEDDDA,
.selection_bg_color = 0x5E5E5E,
.border_width = 1,
.border_color = 0x383838,
.corner_radius = 5,
.pad = 8
}
},
.label = {
.fg_color = 0xDEDDDA,
},
.msgbox = {
.fg_color = 0xDEDDDA,
.bg_color = 0x383838,
.border_width = 1,
.border_color = 0x383838,
.corner_radius = 7,
.pad = 20,
.gap = 20,
.dimming = {
.color = 0x151515,
.opacity = 225
}
},
.bar = {
.border_width = 1,
.border_color = 0x1C71D8,
.corner_radius = 5,
.indicator = {
.bg_color = 0x1C71D8
}
}
};
/* Nord themes (based on https://www.nordtheme.com/docs/colors-and-palettes) */
#define NORD0 0x2e3440
#define NORD1 0x3b4252
#define NORD2 0x434c5e
@@ -962,14 +1115,15 @@ static const bbx_theme nord_dark = {
* Public interface
*/
const int bbx_themes_num_themes = 6;
const int bbx_themes_num_themes = 7;
const bbx_theme *bbx_themes_themes[] = {
&breezy_light,
&breezy_dark,
&pmos_light,
&pmos_dark,
&adwaita_dark,
&nord_light,
&nord_dark,
&nord_dark
};
bbx_themes_theme_id_t bbx_themes_find_theme_with_name(const char *name) {

View File

@@ -15,7 +15,10 @@ typedef enum {
BBX_THEMES_THEME_BREEZY_LIGHT = 0,
BBX_THEMES_THEME_BREEZY_DARK = 1,
BBX_THEMES_THEME_PMOS_LIGHT = 2,
BBX_THEMES_THEME_PMOS_DARK = 3
BBX_THEMES_THEME_PMOS_DARK = 3,
BBX_THEMES_THEME_ADWAITA_DARK = 4,
BBX_THEMES_THEME_NORD_LIGHT = 5,
BBX_THEMES_THEME_NORD_DARK = 6,
} bbx_themes_theme_id_t;
/* Themes */