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

fix: cmd-84 cleanup tup-534 table css ⚠️ #302

Draft
wants to merge 44 commits into
base: feat/cmd-111-new-mobile-table-ui
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
2329dc9
task/tup-534 Adds in media query for tables
R-Tomas-Gonzalez Nov 28, 2023
976eaf9
adds in data attributes to each col. Isn't right just yet.
R-Tomas-Gonzalez Nov 29, 2023
790f4c9
removes number from data-col attributes. ie. data-col-(number).
R-Tomas-Gonzalez Nov 29, 2023
ed2863e
Task/tup 534 auto get correct data col value (#277)
wesleyboar Nov 30, 2023
1218ad6
added in all styles. Need to check on borders. worked on fractal.
R-Tomas-Gonzalez Nov 30, 2023
b4f953a
made changes for nested tables
R-Tomas-Gonzalez Nov 30, 2023
47466c5
Adjusted borders (at least for now) on all tables.
R-Tomas-Gonzalez Dec 1, 2023
0cdebfa
Merge branch 'main' into task/tup-534
R-Tomas-Gonzalez Dec 1, 2023
b440a77
includes all basic adjustments
R-Tomas-Gonzalez Dec 7, 2023
396b40d
removes border-top:none. Temporarily removes table truncation.
R-Tomas-Gonzalez Dec 8, 2023
87ea7e0
tier one. adjusting and cleaning up all borders.
R-Tomas-Gonzalez Dec 11, 2023
4a2cf01
tier 2. Nested Tablesssss.
R-Tomas-Gonzalez Dec 11, 2023
f33bcf2
tier 3. Table cleanup after subsequent meeting with design
R-Tomas-Gonzalez Dec 12, 2023
8bdc030
making review changes
R-Tomas-Gonzalez Dec 13, 2023
90e0273
reverting weird formatting changes
R-Tomas-Gonzalez Dec 13, 2023
e902afd
updating to match more reviews
R-Tomas-Gonzalez Dec 13, 2023
b5a5dd1
Merge branch 'main' into task/tup-534
R-Tomas-Gonzalez Dec 13, 2023
d29f662
docs: revert mismatched comment
wesleyboar Dec 14, 2023
0a9b0b6
Removal of trump tables. Removal of truncated css.
R-Tomas-Gonzalez Dec 14, 2023
5006151
Merge branch 'main' into task/tup-534
R-Tomas-Gonzalez Dec 14, 2023
714c95b
fix: restore s-paragraph-table (removed in 0a9b0b6)
wesleyboar Dec 15, 2023
cdca812
Merge branch 'main' into task/tup-534
wesleyboar Jan 8, 2024
6a8033e
update with main
R-Tomas-Gonzalez Jan 17, 2024
4305afa
nested table color change
R-Tomas-Gonzalez Jan 17, 2024
19149e2
add in styles to match design
R-Tomas-Gonzalez Jan 18, 2024
985cb63
style: remove excess spaces
wesleyboar Jan 19, 2024
8176020
chore: remove outdated style
wesleyboar Jan 20, 2024
d8a1ad6
chore: remove another outdated style
wesleyboar Jan 20, 2024
acef9c3
feat: do not use `:has(…)`
wesleyboar Jan 22, 2024
8700d34
feat: complex `.has-table` → simple `:has(table)`
wesleyboar Jan 22, 2024
672fe5f
fix: restore erroneously deleted code
wesleyboar Jan 22, 2024
74f6077
fix: remove unused styles
wesleyboar Jan 23, 2024
2884947
Merge branch 'task/tup-534' into task/tup-534--cleanup
wesleyboar Jan 23, 2024
a67442c
docs: remove outdated comment
wesleyboar Jan 23, 2024
a10fb9f
fix: move style from table--basic to …--nested - 1
wesleyboar Jan 23, 2024
5d504b6
fix: move style from table--basic to …--nested - 2
wesleyboar Jan 23, 2024
4229479
chore: remove commented markup
wesleyboar Jan 23, 2024
c6f8af3
feat: delete last vestigal `has-table` (.hbs, .md)
wesleyboar Jan 23, 2024
cea2fb8
docs: remove outdated comments
wesleyboar Jan 23, 2024
73c68dd
style: return comment to line of relevant code
wesleyboar Jan 23, 2024
5635e69
fix: move `.nested-table` usage - 1
wesleyboar Jan 23, 2024
408259a
feat: add and use nested table custom selectors
wesleyboar Jan 25, 2024
3db5ddd
chore: remove comment that seems outdated
wesleyboar Jan 25, 2024
ac113c1
feat: use custom-media
wesleyboar Jan 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion dist/core-styles.base.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-styles.cms.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-styles.docs.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-styles.portal.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/elements/table--basic.css

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

3 changes: 2 additions & 1 deletion dist/elements/table--nested.css

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

2 changes: 1 addition & 1 deletion dist/elements/table.cms.css

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

3 changes: 2 additions & 1 deletion dist/elements/table.css

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

2 changes: 1 addition & 1 deletion dist/objects/o-fixed-header-table.css

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

8 changes: 8 additions & 0 deletions fractal.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,14 @@ engine.handlebars.registerHelper('eq', function(a, b) {
engine.handlebars.registerHelper('has', function(array, item) {
return array.includes(item);
});
engine.handlebars.registerHelper('getColFromRow', function(row, val, cols) {
if ( ! cols ) return '';

const index = Object.entries(row).findIndex(el => el[1] === val);
const col = cols[index];

return col;
});

// Export
module.exports = fractal;
1 change: 0 additions & 1 deletion src/lib/_imports/core-styles.cms.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,3 @@
@import url("./trumps/s-drop-cap.css");
@import url("./trumps/s-footer.css");
@import url("./trumps/s-footer--thick.css");
@import url("./trumps/s-truncated-table.css");
5 changes: 4 additions & 1 deletion src/lib/_imports/core-styles.docs.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@

/* ELEMENTS */
@import url("./elements/root--docs.css");
@import url("./elements/html-elements.cms.css");
/* Commenting for come back Nov.29, 2023. Wes to double check work and side-effects. */
/* Issue, because tables docs imports html-elements, this pushes over
uls in td elements for tables, and overrides padding-inline-start: 0 */
/* @import url("./elements/html-elements.cms.css"); */
@import url("./elements/html-elements.docs.css");
@import url("./elements/headings--docs.css");
@import url("./elements/monospace.css");
Expand Down
2 changes: 0 additions & 2 deletions src/lib/_imports/core-styles.portal.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
/* ELEMENTS */
@import url("./elements/root--portal.css");
@import url("./elements/sticky-footer.css");
@import url("./elements/table.portal.css");

/* OBJECTS */
@import url("./objects/o-flex-item-table-wrap.css");
Expand All @@ -34,4 +33,3 @@
@import url("./trumps/s-footer.css");
@import url("./trumps/s-footer--thin.css");
@import url("./trumps/s-form-page.css");
@import url("./trumps/s-truncated-table.css");