Skip to content

Commit

Permalink
fix(tapis): core-cms v3 ui migration (#191)
Browse files Browse the repository at this point in the history
  • Loading branch information
wesleyboar committed Aug 15, 2023
1 parent 1d4c600 commit 7830fe9
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 0 deletions.
22 changes: 22 additions & 0 deletions tapisproject_cms/src/taccsite_cms/templates/assets_custom.html
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' %}">
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) *\/
}
*/

0 comments on commit 7830fe9

Please sign in to comment.