-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(tapis): core-cms v3 ui migration (#191)
- Loading branch information
1 parent
1d4c600
commit 7830fe9
Showing
2 changed files
with
63 additions
and
0 deletions.
There are no files selected for viewing
22 changes: 22 additions & 0 deletions
22
tapisproject_cms/src/taccsite_cms/templates/assets_custom.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 %} | ||
|
||
<!-- Custom Site Assets: Favicon. --> | ||
{% with settings.FAVICON as favicon %} | ||
<link rel="icon" href="{% static favicon.img_file_src %}" type="image/x-icon" /> | ||
{% endwith %} | ||
|
||
|
||
|
||
{# NEW CODE #} | ||
|
||
<!-- To style old CMS content on new CMS --> | ||
<link rel="stylesheet" href="{% static 'tapisproject_cms/css/migrate.to-v3.css' %}"> |
41 changes: 41 additions & 0 deletions
41
...ct_cms/src/taccsite_custom/tapisproject_cms/static/tapisproject_cms/css/migrate.to-v3.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) *\/ | ||
} | ||
*/ |