Skip to content

Commit 4208055

Browse files
authored
chore: tup-677 css/django/vite interoperability (#197)
* chore: tup-677 no commented @import statements * refactor: tup-677 no absolute /static paths in css Testing: 1. Verify Frontera fonts still load. * docs: collectstatic " --ignore assets/*/font*.css" This need for this is to avoid an error introuduced by tup-677. ```log Post-processing 'ui/assets/generics/fonts.css' failed! … ValueError: The file 'ui/assets/generics/fonts/BentonSans-Regular.otf' could not be found with <django.contrib.staticfiles.storage.ManifestStaticFilesStorage object at 0x7ffffc9b5280>. ``` * Revert "docs: collectstatic " --ignore assets/*/font*.css"" This reverts commit 6cf9e6f. * fix(utrc): WP-135 support deploy with CMS v3.12
1 parent 2a5e612 commit 4208055

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

frontera_cms/static/frontera_cms/css/src/_migrations/v1_v2/frontera.css

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,28 @@ SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/frontera.scss
1212
/* FAQ: Though CMS default font is `Benton Sans`, old content uses these */
1313
@font-face {
1414
font-family: BentonSansBold;
15-
src: url("/static/frontera_cms/fonts/archive/BentonSans-Bold.otf");
15+
src: url("../../../../fonts/archive/BentonSans-Bold.otf");
1616
}
1717

1818
@font-face {
1919
font-family: BentonSansMedium;
20-
src: url("/static/frontera_cms/fonts/archive/BentonSans-Medium.otf");
20+
src: url("../../../../fonts/archive/BentonSans-Medium.otf");
2121
}
2222

2323
@font-face {
2424
font-family: BentonSansItalic;
25-
src: url("/static/frontera_cms/fonts/archive/BentonSans-MediumItalic.otf");
25+
src: url("../../../../fonts/archive/BentonSans-MediumItalic.otf");
2626
}
2727

2828
/* … */
2929

3030
/* HELP: Wesley assumes that old content uses these… but where? */
3131
@font-face {
3232
font-family: 'icon-worksregular';
33-
src: url('/static/frontera_cms/fonts/archive/icon-works-webfont.eot');
34-
src: url('/static/frontera_cms/fonts/archive/icon-works-webfont.eot?#iefix') format('embedded-opentype'),
35-
url('/static/frontera_cms/fonts/archive/icon-works-webfont.woff') format('woff'),
36-
url('/static/frontera_cms/fonts/archive/icon-works-webfont.svg#icon-worksregular') format('svg');
33+
src: url('../../../../fonts/archive/icon-works-webfont.eot');
34+
src: url('../../../../fonts/archive/icon-works-webfont.eot?#iefix') format('embedded-opentype'),
35+
url('../../../../fonts/archive/icon-works-webfont.woff') format('woff'),
36+
url('../../../../fonts/archive/icon-works-webfont.svg#icon-worksregular') format('svg');
3737
font-weight: normal;
3838
font-style: normal;
3939
}

utrc-cms/templates/home.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{% extends "utrc_cms/templates/home.html" %}

utrc_cms/settings_custom.py

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
('fullwidth.html', 'Full Width'),
1313

1414
('utrc_cms/templates/home.html', 'Home'),
15+
('utrc-cms/templates/home.html', 'DEPRECATED Home'),
1516

1617
('guide.html', 'Guide'),
1718
('guides/getting_started.html', 'Guide: Getting Started'),

utrc_cms/static/utrc_cms/css/src/_imports/trumps/s-home.css

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
/* TACC TRUMPS: Home (Page) */
2-
/* FAQ: All Core-Styles settings are available via Core-CMS v3.9 site.css */
3-
/* @import url("@tacc/core-styles/src/lib/_imports/settings/border.css"); */
42
/* FAQ: These Core-Styles are unchanged from v0.12 (Core-CMS v3.9) to v2.7 */
53
@import url("@tacc/core-styles/src/lib/_imports/tools/x-overlay.css");
64
/* NOTE: We had loaded media-queries.css from Core-CMS:/taccsite_cms,

0 commit comments

Comments
 (0)