Merge branch 'main' into task/GH-101-header-redesign

TACC · Sep 23, 2021 · b786c3c · b786c3c
2 parents 2e4c19f + 6ec262d
commit b786c3c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/conf/css/.postcssrc.yml b/conf/css/.postcssrc.yml
@@ -13,6 +13,7 @@ plugins:
   postcss-preset-env:
     # SEE: https://github.com/csstools/postcss-preset-env#features
     stage: false
+    # SEE: https://github.com/csstools/postcss-preset-env/blob/master/src/lib/plugins-by-id.js#L35
     features:
       custom-media-queries: true
       media-query-ranges: true

diff --git a/taccsite_custom b/taccsite_custom
+2 −0		a2cps-cms/templates/fullwidth.html
+2 −0		a2cps-cms/templates/standard.html
+2 −0		frontera-cms/templates/home.html
+2 −0		protx-cms/templates/fullwidth.html
+2 −0		protx-cms/templates/standard.html
+2 −19		utrc-cms/settings_custom.py
+1 −0		utrc-cms/static/utrc-cms/img/org_logos/utrc-horizontal-logo-white-simple.svg
+2 −0		utrc-cms/templates/fullwidth.html
+2 −0		utrc-cms/templates/standard.html