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.

Sign up for GitHub

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

Jump to bottom

Task/fp 1378 consistent space above footer #480

Merged
merged 10 commits into from
May 4, 2022
Merged

Task/fp 1378 consistent space above footer #480

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6a67174
WIP: FP-1378: Consistent space beneath content
wesleyboar Nov 18, 2021
01679ac
Merge branch 'main' into task/FP-1378-consistent-space-above-footer
wesleyboar Jan 19, 2022
e14ae8b
Merge branch 'main' into task/FP-1378-consistent-space-above-footer
wesleyboar Mar 15, 2022
54a4f4b
FP-1378: Rename Ver, Match <main> Notes, Clean Up
wesleyboar Mar 15, 2022
ea0ae12
Merge branch 'main' into task/FP-1378-consistent-space-above-footer
wesleyboar Apr 24, 2022
f05be2b
chore(fp-1378): update submod
wesleyboar May 3, 2022
5f0974f
Merge branch 'main' into task/FP-1378-consistent-space-above-footer
wesleyboar May 3, 2022
95c2a24
chore(fp-1378): update submod
wesleyboar May 3, 2022
2f870da
Merge branch 'main' into task/FP-1378-consistent-space-above-footer
wesleyboar May 4, 2022
4f678a8
chore(fp-1378): merged submod & core-styles
wesleyboar May 4, 2022
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
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"npm": "8.5.5"
},
"devDependencies": {
"@tacc/core-styles": "git+https://[email protected]/TACC/Core-Styles.git",
"@tacc/core-styles": "git+https://[email protected]/TACC/Core-Styles.git#task/FP-1378-consistent-space-above-footer",
Copy link
Member Author

@wesleyboar wesleyboar May 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is not intended to be merged. After PR approval, I plan to revert this change (and rebuild package-lock.json) so the latest Core-Styles is loaded.

That branch is transient (deleted after merge of the related PR), so merging this change to main would soon result in npm install fail. What I should do, is pin to a specific version… but I am currently loading latest of Core-Styles, to facilitate rapid development. Core-Styles is versioned (releases), but I don't really have a process for Core-Styles, yet. How do I version what hasn't been merged?

"minimist": "^1.2.6",
"node-cmd": "^5.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion taccsite_custom
Open in desktop
Submodule taccsite_custom updated 1 files
+1 −1 texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css