[FIX] base: SCSS don't compile Bootstrap 5
- Fixes the RegEx that insert our internal structure path for some assets like image font... BS5 uses inline SVG and the function `escape-svg` to escape some characters in HTML. But we can't add the path as the image is inline. - Don't include Bootstrap in LESS assets; Since Bootstrap 4 (and also in 5) there are no more LESS files for Bootstrap. So, there is no reason to include the path when we compile LESS assets. Task ID: 2766483 Part-of: odoo/odoo#95450
This commit is contained in:
@@ -876,7 +876,7 @@ class JavascriptAsset(WebAsset):
|
||||
|
||||
class StylesheetAsset(WebAsset):
|
||||
rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", re.U)
|
||||
rx_url = re.compile(r"""url\s*\(\s*('|"|)(?!'|"|/|https?://|data:)""", re.U)
|
||||
rx_url = re.compile(r"""(?<!")url\s*\(\s*('|"|)(?!'|"|/|https?://|data:|#{str)""", re.U)
|
||||
rx_sourceMap = re.compile(r'(/\*# sourceMappingURL=.*)', re.U)
|
||||
rx_charset = re.compile(r'(@charset "[^"]+";)', re.U)
|
||||
|
||||
@@ -1062,5 +1062,4 @@ class LessStylesheetAsset(PreprocessedCSS):
|
||||
lessc = misc.find_in_path('lessc')
|
||||
except IOError:
|
||||
lessc = 'lessc'
|
||||
lesspath = get_resource_path('web', 'static', 'lib', 'bootstrap', 'less')
|
||||
return [lessc, '-', '--no-js', '--no-color', '--include-path=%s' % lesspath]
|
||||
return [lessc, '-', '--no-js', '--no-color']
|
||||
|
||||
Reference in New Issue
Block a user