[IMP] web_company_color: apply colors in debug assets and edit menu colors

Allow each company's colors to be visible when running in debug assets mode. Fix the menu colors so they don't look like hyperlinks.
pull/3049/head
ThiagoMForgeFlow 2025-01-08 10:52:29 +01:00
parent 61dbaa29b6
commit e56871c3d1
2 changed files with 29 additions and 0 deletions

View File

@ -30,6 +30,30 @@ class QWeb(models.AbstractModel):
res += [asset.get_company_color_asset_node()] res += [asset.get_company_color_asset_node()]
return res return res
def _generate_asset_links(
self,
bundle,
css=True,
js=True,
debug_assets=False,
assets_params=None,
rtl=False,
):
res = super()._generate_asset_links(
bundle,
css=css,
js=js,
debug_assets=debug_assets,
assets_params=assets_params,
rtl=rtl,
)
if bundle == "web_company_color.company_color_assets":
asset = AssetsBundleCompanyColor(
bundle, [], env=self.env, css=True, js=True
)
res += [asset.get_company_color_asset_node()]
return res
def _get_asset_content(self, bundle, assets_params=None): def _get_asset_content(self, bundle, assets_params=None):
"""Handle 'special' web_company_color bundle""" """Handle 'special' web_company_color bundle"""
if bundle == "web_company_color.company_color_assets": if bundle == "web_company_color.company_color_assets":

View File

@ -120,6 +120,9 @@ class ResCompany(models.Model):
background-color: %(color_navbar_bg_hover)s !important; background-color: %(color_navbar_bg_hover)s !important;
} }
} }
.dropdown-item{
color: %(color_submenu_text)s !important;
}
""" """
company_colors = fields.Serialized() company_colors = fields.Serialized()
@ -137,6 +140,7 @@ class ResCompany(models.Model):
color_link_text_hover = fields.Char( color_link_text_hover = fields.Char(
"Link Text Color Hover", sparse="company_colors" "Link Text Color Hover", sparse="company_colors"
) )
color_submenu_text = fields.Char("Submenu Text Color", sparse="company_colors")
scss_modif_timestamp = fields.Char("SCSS Modif. Timestamp") scss_modif_timestamp = fields.Char("SCSS Modif. Timestamp")
@api.model_create_multi @api.model_create_multi
@ -213,6 +217,7 @@ class ResCompany(models.Model):
"color_link_text": values.get("color_link_text") or "#71639e", "color_link_text": values.get("color_link_text") or "#71639e",
"color_link_text_hover": values.get("color_link_text_hover") "color_link_text_hover": values.get("color_link_text_hover")
or "darken(#71639e, 10%)", or "darken(#71639e, 10%)",
"color_submenu_text": values.get("color_link_text") or "#374151",
} }
) )
return values return values