Skip to content

Commit

Permalink
After/tup 271 fp 1665 excess space above footer (#506)
Browse files Browse the repository at this point in the history
* fix: load fa icons even if no portal (#504)

We do not want FA icons, but there is at least one usage.

Usage: Frontera homepage, "(→) See All News"

* feat(css): drop .o-site for simple sticky footer trick

1. Do not use o-site class in markup and do not import o-site styles.
2. Install core-styles that makes footer sticky in a simpler way.

For: https://jira.tacc.utexas.edu/browse/FP-1665

* fix(css, submod): migration, no add footer margin

FP-1665 will fix end-of-page padding fro old and new sites.

Thus, no need for old solution, which would add excess space.

For: https://jira.tacc.utexas.edu/browse/FP-1665

* fix(core-styles): load latest for fp-1665

For: https://jira.tacc.utexas.edu/browse/FP-1665

* chore(core-styles): v0.6.0-beta.3 (via gitpkg)

Install @tacc/v0.6.0-beta.3 via https://gitpkg.now.sh to test FP-1665.

For: https://jira.tacc.utexas.edu/browse/FP-1665

* fix(core-styles): v0.6.0-beta.3 (via gitpkg) new

* fix(core-styles): v0.6.0-beta.3 (via gitpkg), 3rd

* fix(core-styles): v0.6.0-beta.3 (via npm)

* chore(submod): merged TACC/Core-CMS-Resources#147

TACC/Core-CMS-Resources#147

For: #506
  • Loading branch information
wesleyboar authored Jul 6, 2022
1 parent f5d6cdb commit 28cbee6
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 21 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"npm": "^8.5.5"
},
"devDependencies": {
"@tacc/core-styles": "^0.6.0-beta.2",
"@tacc/core-styles": "^0.6.0-beta.3",
"minimist": "^1.2.6"
},
"repository": "[email protected]:TACC/Core-CMS.git",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,3 @@ body {
/* min-height: 100%; */
/* position: relative; */
}

/* … */

footer {
/* … */
margin-top: 1em;
}
1 change: 0 additions & 1 deletion taccsite_cms/static/site_cms/css/src/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
@import url("_imports/objects/o-grid.css");
@import url("_imports/objects/o-offset-content.css");
@import url("_imports/objects/o-section.css");
@import url("_imports/objects/o-site.css");

/* COMPONENTS */
@import url("_imports/components/c-card.css");
Expand Down
8 changes: 4 additions & 4 deletions taccsite_cms/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@
{% render_block "css" %}
</head>

<body class="o-site {% block page_type_class %}{% endblock page_type_class %}">
<body class="{% block page_type_class %}{% endblock page_type_class %}">
{% cms_toolbar %}

<header class="o-site__head">
<header>
{% include "header.html" %}
</header>

<main id="cms-content" class="o-site__body">
<main id="cms-content">
{% block content %}

{# To allow extra Container in page structure by hiding extra padding #}
Expand All @@ -70,7 +70,7 @@
{% endblock content %}
</main>

<footer class="c-footer s-footer o-site__foot">
<footer class="c-footer s-footer">
{% block footer %}

{% static_placeholder "footer-content" or %}
Expand Down

0 comments on commit 28cbee6

Please sign in to comment.