Skip to content

Commit e56871c

Browse files
[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.
1 parent 61dbaa2 commit e56871c

File tree

2 files changed

+29
-0
lines changed

2 files changed

+29
-0
lines changed

web_company_color/models/ir_qweb.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,30 @@ def _generate_asset_links_cache(
3030
res += [asset.get_company_color_asset_node()]
3131
return res
3232

33+
def _generate_asset_links(
34+
self,
35+
bundle,
36+
css=True,
37+
js=True,
38+
debug_assets=False,
39+
assets_params=None,
40+
rtl=False,
41+
):
42+
res = super()._generate_asset_links(
43+
bundle,
44+
css=css,
45+
js=js,
46+
debug_assets=debug_assets,
47+
assets_params=assets_params,
48+
rtl=rtl,
49+
)
50+
if bundle == "web_company_color.company_color_assets":
51+
asset = AssetsBundleCompanyColor(
52+
bundle, [], env=self.env, css=True, js=True
53+
)
54+
res += [asset.get_company_color_asset_node()]
55+
return res
56+
3357
def _get_asset_content(self, bundle, assets_params=None):
3458
"""Handle 'special' web_company_color bundle"""
3559
if bundle == "web_company_color.company_color_assets":

web_company_color/models/res_company.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ class ResCompany(models.Model):
120120
background-color: %(color_navbar_bg_hover)s !important;
121121
}
122122
}
123+
.dropdown-item{
124+
color: %(color_submenu_text)s !important;
125+
}
123126
"""
124127

125128
company_colors = fields.Serialized()
@@ -137,6 +140,7 @@ class ResCompany(models.Model):
137140
color_link_text_hover = fields.Char(
138141
"Link Text Color Hover", sparse="company_colors"
139142
)
143+
color_submenu_text = fields.Char("Submenu Text Color", sparse="company_colors")
140144
scss_modif_timestamp = fields.Char("SCSS Modif. Timestamp")
141145

142146
@api.model_create_multi
@@ -213,6 +217,7 @@ def _scss_get_sanitized_values(self):
213217
"color_link_text": values.get("color_link_text") or "#71639e",
214218
"color_link_text_hover": values.get("color_link_text_hover")
215219
or "darken(#71639e, 10%)",
220+
"color_submenu_text": values.get("color_link_text") or "#374151",
216221
}
217222
)
218223
return values

0 commit comments

Comments
 (0)