From 7830fe9fa3ab2d0c781ad4d85e4a20df15013170 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:08:04 -0500 Subject: [PATCH] fix(tapis): core-cms v3 ui migration (#191) --- .../taccsite_cms/templates/assets_custom.html | 22 ++++++++++ .../tapisproject_cms/css/migrate.to-v3.css | 41 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 tapisproject_cms/src/taccsite_cms/templates/assets_custom.html create mode 100644 tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/css/migrate.to-v3.css diff --git a/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html b/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html new file mode 100644 index 00000000..2ccaacb6 --- /dev/null +++ b/tapisproject_cms/src/taccsite_cms/templates/assets_custom.html @@ -0,0 +1,22 @@ +{# This template overwrites the original from TACC/Core-CMS #} +{# NOTE: This should extend taccsite_cms via taccsite_custom, not overwrite #} +{# FAQ: To extend, via app template inheritance, see TACC/Core-CMS#492 #} + + + +{# COPIED FROM CORE #} +{# https://github.com/TACC/Core-CMS/blob/c8844e1/taccsite_cms/templates/assets_custom.html #} + +{% load static %} + + +{% with settings.FAVICON as favicon %} + +{% endwith %} + + + +{# NEW CODE #} + + + diff --git a/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/css/migrate.to-v3.css b/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/css/migrate.to-v3.css new file mode 100644 index 00000000..637e63fa --- /dev/null +++ b/tapisproject_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/css/migrate.to-v3.css @@ -0,0 +1,41 @@ +/* TAPIS upgrade to v3.11.4 revealed UI bugs. + The typical v1_v2 migration did not help; + the result was very different from prod. + So just fix major discrepencies found in: + https://confluence.tacc.utexas.edu/x/_YqkEQ */ + + + +/* BOOTSTRAP */ + +/* To override TACC :root color with Bootstrap color only where necessary */ +a { + --global-color-link-on-light--normal: #007bff; +} +a:hover { + --global-color-link-on-light--normal: #0056b3; +} + +/* To restore font size of buttons (whose text appeared smaller than before) */ +/* https://tapis-project.org/documentation/ */ +.btn { + font-size: 16px; /* Bootstrap: 1rem (browser default 16px) | TACC: html 10px. */ +} + +/* To restore darker text */ +body { + color: #212529; /* Bootstrap: #212529 | TACC: var(--global-color-primary--x-dark) */ +} + +/* To restore table styles */ +table { + border-collapse: collapse; /* Bootstrap: collapse | TACC: separate */ +} +:is(td,th) { + color: usnet; /* Bootstrap: none (inherit) | TACC: var(--global-color-primary--dark) */ +} +/* FAQ: Did not restore, because it makes table easier to scan *//* +tr:nth-child(2n) :is(th,td) { + background: unset; /* Bootstrap: none (inherit) | TACC: var(--global-color-primary--x-light) *\/ +} +*/