Skip to content

Commit

Permalink
Merge branch 'main' into site/frontera/main
Browse files Browse the repository at this point in the history
  • Loading branch information
wesleyboar committed Aug 4, 2021
2 parents c9bd8e2 + 0c8ded4 commit a4f3aab
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Styleguide Tools.ExtendsAndMixins.Truncate

.x-truncate--one-line, /* DEPRECATED */
%x-truncate--one-line, {
text-overflow: ellipsis;
text-overflow: var(--text-overflow, ellipsis);

overflow: hidden;
white-space: nowrap;
Expand Down
2 changes: 2 additions & 0 deletions taccsite_cms/static/site_cms/css/src/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
@import url("_imports/objects/o-site.css");

/* COMPONENTS */
/* GH-302: HELP: How should all of these become individually built files? */
/* GH-302: FAQ: Individually built stylesheets could be loaded explicitely. */
@import url("_imports/components/c-article-list.css");
@import url("_imports/components/c-article-preview.css");
@import url("_imports/components/c-date.css");
Expand Down

0 comments on commit a4f3aab

Please sign in to comment.