Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TUP-271: Use Core-Styles from TUP-UI #495

Merged
merged 16 commits into from
Jun 28, 2022
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ Sign your commits ([see this link](https://help.github.com/en/github/authenticat
[Core Portal Deployments]: https://github.com/TACC/Core-Portal-Deployments
[Camino]: https://github.com/TACC/Camino
[Core CMS]: https://github.com/TACC/Core-CMS
[Core Styles]: https://github.com/TACC/Core-Styles
[Core Styles]: https://github.com/TACC/tup-ui/tree/main/libs/core-styles
[Core CMS Resources]: https://github.com/TACC/Core-CMS-Resources
[Core Portal]: https://github.com/TACC/Core-Portal
[1]: https://docs.docker.com/get-docker/
Expand Down
16 changes: 8 additions & 8 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.5.1",
"@tacc/core-styles": "^0.6.0-beta",
"minimist": "^1.2.6"
},
"repository": "[email protected]:TACC/Core-CMS.git",
Expand Down
4 changes: 2 additions & 2 deletions taccsite_cms/static/site_cms/css/.postcssrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins:
# is relative to only one of these directories in this order.
path:
- 'taccsite_cms/static/site_cms/css/src' # Core-CMS CSS source files
- 'node_modules/@tacc/core-styles/source' # Core-Styles CSS source files
- 'node_modules/@tacc/core-styles/src/lib' # Core-Styles CSS source files
postcss-env-function:
importFrom:
- 'node_modules/@tacc/core-styles/source/_themes/default.json'
- 'node_modules/@tacc/core-styles/src/lib/_themes/default.json'
2 changes: 1 addition & 1 deletion taccsite_cms/static/site_cms/css/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ See [repo `README.md` at "Static Files"](/README.md#static-files).

[Core CMS]: https://github.com/TACC/Core-CMS
[Core CMS Resources]: https://github.com/TACC/Core-CMS-Resources
[Core Styles]: https://github.com/TACC/Core-Styles
[Core Styles]: https://github.com/TACC/tup-ui/tree/main/libs/core-styles
2 changes: 1 addition & 1 deletion taccsite_cms/static/site_cms/css/src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ _This directory exists in `static/` __only__ because it is customary, using Djan

<!-- Link Aliases -->

[Core Styles]: https://github.com/TACC/Core-Styles
[Core Styles]: https://github.com/TACC/tup-ui/tree/main/libs/core-styles
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Reference:

Styleguide Components.DjangoCMS.Blog.App
*/
@import url("@tacc/core-styles/source/_imports/components/bootstrap.pagination.css");
@import url("@tacc/core-styles/src/lib/_imports/components/bootstrap.pagination.css");

@import url("./django.cms.blog.app.page.css");
@import url("./django.cms.blog.app.item.css");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Reference:

Styleguide Components.DjangoCMS.Blog.App.Item
*/
@import url("@tacc/core-styles/source/_imports/tools/x-article-link.css");
@import url("@tacc/core-styles/source/_imports/tools/x-truncate.css");
@import url("@tacc/core-styles/src/lib/_imports/tools/x-article-link.css");
@import url("@tacc/core-styles/src/lib/_imports/tools/x-truncate.css");

@import url("_imports/tools/selectors.css");

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url("@tacc/core-styles/source/_imports/settings/color.css");
@import url("@tacc/core-styles/src/lib/_imports/settings/color.css");

:root {
/* CAVEAT: A standard accent color definition is pending more designs */
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url("@tacc/core-styles/source/_imports/settings/font.css");
@import url("@tacc/core-styles/src/lib/_imports/settings/font.css");

:root {
--global-font-family--sans: "Benton Sans", "Roboto", sans-serif;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import url("@tacc/core-styles/source/_imports/settings/space.css");
@import url("@tacc/core-styles/src/lib/_imports/settings/space.css");

:root {
--global-space--hr-margin: 30px; /* constant unit allows consistency */
Expand Down