Skip to content

feat: added table styling #129

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

Merged
merged 6 commits into from
Feb 10, 2025
Merged

feat: added table styling #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c92c2ce
feat: added table styling
lamATnginx Feb 5, 2025
2b58be7
added new shortcode for supporting narrow and wide tables
lamATnginx Feb 6, 2025
62473f5
removed JS to resize wide tables + removed unneeded shortcode and mov…
lamATnginx Feb 6, 2025
354af3d
added hugo code to default a table size if not given in params
lamATnginx Feb 6, 2025
68ad05f
fix wide tables not expanding fully
lamATnginx Feb 7, 2025
65716af
adding consistent styling to existing hr tags in table
lamATnginx Feb 7, 2025
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
156 changes: 94 additions & 62 deletions assets/css/v2/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
--color-footer: #1D1D1D;
--color-footer-text: #E2E2E2;
--color-product-title: #8D8D8D;
--color-table-divider: #CCCCCC;

--sidebar-margin: 24px;
--sidebar-line-box-side-length: 8px;
Expand All @@ -27,6 +28,13 @@
--sidebar-width: 24rem;
--sidebar-line-width: 11.5px;
--side-gutter-width: 20rem;
--table-top-bottom-spacing: 3rem;
--table-row-space-between: 1.5rem;
--table-min-column-spacing-narrow: 1.5rem;
--table-min-column-spacing-wide: 0.75rem;
--table-header-bottom-spacing: 1rem;
--table-line-extension: 1rem;
--table-line-height: 1px;
--text-content-width-iphone-13: 30rem;
--text-content-width-mbp-14: 40rem;
--text-content-width-mbp-16: 50rem;
Expand Down Expand Up @@ -188,11 +196,6 @@ nav {
min-width: 100%;
}

.main-layout {
display: grid;
grid-template-columns: 1fr;
}

.sidebar-layout {
display: flex;
flex-direction: column;
Expand All @@ -205,58 +208,6 @@ nav {
}
}

.text-content {
grid-column-start: 1;
}

@media (min-width: 1512px) { /* Macbook Pro 14 */
.main-layout {
display: grid;
grid-template-columns: var(--sidebar-width) 1fr;
column-gap: var(--component-gap);
}

.content-layout {
display: grid;
grid-template-columns: var(--text-content-width-mbp-14) var(--side-gutter-width);
column-gap: var(--component-gap);
}

.content-layout .side-gutter {
grid-column-start: 2;
}

.base-layout {
display: grid;
grid-template-rows: repeat(2, auto);
column-gap: var(--component-gap);
}

.breadcrumb-layout {
display: grid;
grid-template-columns: var(--sidebar-width) 1fr;
column-gap: var(--component-gap);
align-items: center;
margin: 0 2rem;
}
}

@media (min-width: 1728px) { /* Macbook Pro 16 */
.content-layout {
display: grid;
grid-template-columns: var(--text-content-width-mbp-16) var(--side-gutter-width);
column-gap: var(--component-gap);
}
}

@media (min-width: 2560px) { /* 4k Desktop */
.content-layout {
display: grid;
grid-template-columns: var(--text-content-width-4k-display) var(--side-gutter-width);
column-gap: var(--component-gap);
}
}

#searchbox {
width: 24rem;
display:none;
Expand Down Expand Up @@ -286,14 +237,21 @@ nav {
flex-direction: column;
}

.content-layout {
.text-content {
grid-column-start: 1;
display: grid;
grid-template-columns: var(--text-content-width-iphone-13) var(--side-gutter-width);
column-gap: var(--component-gap);
}

.text-content {
grid-column-start: 1;
.text-content > :not(.wide) {
grid-column: 1;
}

.text-content .wide {
grid-column: 1 / -1;
}

.text-content table {
width: 100%;
}

@media (min-width: 1512px) { /* Macbook Pro 14 */
Expand All @@ -310,6 +268,11 @@ nav {
align-items: center;
}

.text-content {
grid-template-columns: var(--text-content-width-mbp-14) var(--side-gutter-width);
column-gap: var(--component-gap);
}

.main-layout {
display: grid;
grid-template-columns: var(--sidebar-width) 1fr;
Expand All @@ -333,6 +296,11 @@ nav {
grid-template-columns: var(--text-content-width-mbp-16) var(--side-gutter-width);
column-gap: var(--component-gap);
}

.text-content {
grid-template-columns: var(--text-content-width-mbp-16) var(--side-gutter-width);
column-gap: var(--component-gap);
}
}

@media (min-width: 2560px) { /* 4k Desktop */
Expand All @@ -341,6 +309,11 @@ nav {
grid-template-columns: var(--text-content-width-4k-display) var(--side-gutter-width);
column-gap: var(--component-gap);
}

.text-content {
grid-template-columns: var(--text-content-width-4k-display) var(--side-gutter-width);
column-gap: var(--component-gap);
}
}

.main {
Expand Down Expand Up @@ -672,6 +645,65 @@ h2 {
margin: 3rem 0 1rem 0;
}

/* tables */
table {
td {
padding: var(--table-row-space-between) 0;
}

th {
font-weight: bold;
text-align: start;
vertical-align: top;
padding-bottom: var(--table-header-bottom-spacing);
}

tr {
position: relative;
}

tr::after {
content: '';
position: absolute;
border-bottom: var(--table-line-height) solid var(--color-table-divider);
bottom: 0;
left: calc(-1 * var(--table-line-extension));
width: calc(100% + (2 * var(--table-line-extension)));
}
}

.narrow table {
min-width: 100%;
margin: var(--table-top-bottom-spacing) 0;
border-collapse: collapse;
}

.wide table {
margin: var(--table-top-bottom-spacing) 0;
border-collapse: collapse;
}

.narrow table th,
.narrow table td {
padding-left: var(--table-min-column-spacing-narrow);
}

.wide table th,
.wide table td {
padding-left: var(--table-min-column-spacing-wide);
}

table th:first-child,
table td:first-child {
padding-left: 0;
}

table hr {
color: var(--color-table-divider);
border: none;
border-bottom: var(--table-line-height) solid var(--color-table-divider);
}

/* callouts */
blockquote {
border: 1px solid var(--color-foreground);
Expand Down
4 changes: 4 additions & 0 deletions layouts/_default/baseof.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@
}
});

document.querySelectorAll(".table-v1").forEach((table) => {
table.style.display = isNewTheme ? "none" : "";
});

const mfElements = ['[data-mf="true"]'];
mfElements.forEach((elementId) => {
document.querySelectorAll(elementId).forEach(
Expand Down
15 changes: 13 additions & 2 deletions layouts/shortcodes/bootstrap-table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
{{ $htmlTable := .Inner | markdownify }}
{{ $class := .Get 0 }}
{{ $old := "<table>" }}
{{ $new := printf "<table class=\"%s\">" $class }}
{{ $new := printf "<table class=\"%s %s\">" $class "table-v1" }}
{{ $htmlTable := replace $htmlTable $old $new }}
{{ $htmlTable | safeHTML }}
{{ $htmlTable | safeHTML }}

<!-- Add default option for table of "narrow" if one is not provided -->
{{ $narrowOption := "narrow" }}
{{ $wideOption := "wide" }}
{{ if and (not (strings.Contains $class $narrowOption)) (not (strings.Contains $class $wideOption)) }}
{{ $class = printf "%s %s" $class $narrowOption }}
{{ end }}

<div data-mf="true" style="display: none;" class="table-v2 {{ $class }}">
{{ .Inner | markdownify }}
</div>