fix: resolve rebase conflicts and fix package name

This commit is contained in:
Lionel DARNIS 2026-07-22 15:21:58 +02:00
parent e6173b93ca
commit d1849f639b
5 changed files with 24 additions and 27 deletions

View file

@ -1381,8 +1381,6 @@ impl Decorations<CosmicStackInternal, Message> for DefaultDecorations {
snap: true,
icon_color: Some(cosmic_theme.background(false).on.into()),
text_color: Some(cosmic_theme.background(false).on.into()),
icon_color: Some(cosmic_theme.background(false).on.into()),
text_color: Some(cosmic_theme.background(false).on.into()),
background: Some(Background::Color(background.into())),
border: Border {
radius,

View file

@ -66,9 +66,6 @@ impl From<TabBackgroundTheme> for theme::Container<'_> {
background: Some(Background::Color(
theme.cosmic().primary(false).component.selected.into(),
)),
background: Some(Background::Color(
theme.cosmic().primary(false).component.selected.into(),
)),
border: Border {
radius: 0.0.into(),
width: 0.0,
@ -85,9 +82,6 @@ impl From<TabBackgroundTheme> for theme::Container<'_> {
background: Some(Background::Color(
theme.cosmic().primary(false).component.base.into(),
)),
background: Some(Background::Color(
theme.cosmic().primary(false).component.base.into(),
)),
border: Border {
radius: 0.0.into(),
width: 0.0,

View file

@ -832,7 +832,6 @@ impl Program for CosmicWindowInternal {
fn background_color(&self, theme: &cosmic::Theme) -> Color {
if self.window.is_maximized(false) {
theme.cosmic().background(false).base.into()
theme.cosmic().background(false).base.into()
} else {
Color::TRANSPARENT
}