Mercurial > kallithea
changeset 7471:11affd72f64c
front-end: Drop lessc --relative-urls
The Fontello font paths in kallithea/public/fontello/css/kallithea.css were
adjusted by the relative urls option - instead we now hack the source.
The Bootstrap Glyph icons are not used - set their name to make it clear they
intentionally not are used.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 11 Dec 2018 01:40:17 +0100 |
parents | f78aa989c9ff |
children | 9004225eb812 |
files | kallithea/bin/kallithea_cli_front_end.py kallithea/public/fontello/css/kallithea.css kallithea/public/less/kallithea-variables.less |
diffstat | 3 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/bin/kallithea_cli_front_end.py Tue Dec 11 00:25:21 2018 +0100 +++ b/kallithea/bin/kallithea_cli_front_end.py Tue Dec 11 01:40:17 2018 +0100 @@ -59,7 +59,7 @@ lesscpath = os.path.join(front_end_dir, 'node_modules', '.bin', 'lessc') lesspath = os.path.join(public_dir, 'less', 'main.less') csspath = os.path.join(public_dir, 'css', 'style.css') - subprocess.check_call([lesscpath, '--relative-urls', '--source-map', + subprocess.check_call([lesscpath, '--source-map', '--source-map-less-inline', lesspath, csspath], cwd=front_end_dir)
--- a/kallithea/public/fontello/css/kallithea.css Tue Dec 11 00:25:21 2018 +0100 +++ b/kallithea/public/fontello/css/kallithea.css Tue Dec 11 01:40:17 2018 +0100 @@ -2,12 +2,14 @@ @font-face { font-family: 'kallithea'; - src: url('../font/kallithea.eot?96450582'); - src: url('../font/kallithea.eot?96450582#iefix') format('embedded-opentype'), - url('../font/kallithea.woff2?96450582') format('woff2'), - url('../font/kallithea.woff?96450582') format('woff'), - url('../font/kallithea.ttf?96450582') format('truetype'), - url('../font/kallithea.svg?96450582#kallithea') format('svg'); + /* NOTE: relative font paths have been adjusted to compensate for where the */ + /* content of this CSS file ends up being used */ + src: url('../fontello/font/kallithea.eot?96450582'); + src: url('../fontello/font/kallithea.eot?96450582#iefix') format('embedded-opentype'), + url('../fontello/font/kallithea.woff2?96450582') format('woff2'), + url('../fontello/font/kallithea.woff?96450582') format('woff'), + url('../fontello/font/kallithea.ttf?96450582') format('truetype'), + url('../fontello/font/kallithea.svg?96450582#kallithea') format('svg'); font-weight: normal; font-style: normal; } @@ -17,7 +19,7 @@ @media screen and (-webkit-min-device-pixel-ratio:0) { @font-face { font-family: 'kallithea'; - src: url('../font/kallithea.svg?96450582#kallithea') format('svg'); + src: url('../fontello/font/kallithea.svg?96450582#kallithea') format('svg'); } } */
--- a/kallithea/public/less/kallithea-variables.less Tue Dec 11 00:25:21 2018 +0100 +++ b/kallithea/public/less/kallithea-variables.less Tue Dec 11 01:40:17 2018 +0100 @@ -41,6 +41,8 @@ @panel-primary-border: @panel-primary-heading-bg; @headings-font-weight: 700; @table-cell-padding: 2px 4px; +@icon-font-path: ; /* no glyphicons */ +@icon-font-name: none; /* custom variables */ @highlight-color: #FAFFA6;