From 3e7ed7a00834492d01555335f544354ec5cbde10 Mon Sep 17 00:00:00 2001
From: alexisben <alex@noesya.coop>
Date: Sat, 19 Nov 2022 16:04:39 +0100
Subject: [PATCH] configuration for table
---
assets/sass/_theme/_configuration.sass | 39 ++++++++++++-------
assets/sass/_theme/blocks/definitions.sass | 8 ++--
.../sass/_theme/design-system/breadcrumb.sass | 2 +-
assets/sass/_theme/design-system/table.sass | 15 ++++++-
.../partials/blocks/templates/datatable.html | 2 +-
5 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/assets/sass/_theme/_configuration.sass b/assets/sass/_theme/_configuration.sass
index 39fa8fbd..45f04eb6 100644
--- a/assets/sass/_theme/_configuration.sass
+++ b/assets/sass/_theme/_configuration.sass
@@ -155,6 +155,26 @@ $icons: map-merge($icons, ("twitter": "\e90d"))
// TODO: réécrire en sass les mixins bootstrap
$grid-breakpoints: (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px, xxl: 1440px) !default
+
+// System
+
+// Table of content
+$toc-color: $main-color !default
+$toc-active-color: $main-active-color !default // TODO : checker ce que ça fait
+$toc-font-family: $body-font-family !default
+$toc-font-size: $body-font-size !default
+$toc-font-size-md: $body-font-size-md !default
+$toc-title-font-size: $body-font-size !default
+$toc-title-font-size-md: $body-font-size-md !default
+$toc-line-height: $h4-line-height !default
+$toc-font-weight: normal !default
+
+// Table
+$table-head-font-size: $body-font-size !default
+$table-head-font-size-md: $body-font-size !default
+$table-body-font-size: $small-font-size !default
+$table-body-font-size-md: $small-font-size !default
+
// BLOCKS
// Block call to action
@@ -164,10 +184,10 @@ $block-call-to-action-button-background: invert($block-call-to-action-background
$block-call-to-action-button-color: invert($block-call-to-action-color) !default
// Block definitions
-$definition-border-color: $main-border-color !default
-$definition-border-color-hovered: color-contrast($definition-border-color, 100%) !default
-$definition-font-size: $body-font-size !default
-$definition-font-size-md: $body-font-size-md !default
+$block-definition-border-color: $main-border-color !default
+$block-block-definition-border-color-hovered: color-contrast($block-definition-border-color, 100%) !default
+$block-definition-font-size: $body-font-size !default
+$block-definition-font-size-md: $body-font-size-md !default
// Block pages
$block-pages-card-background: color-contrast($main-background-color, 10%) !default
@@ -216,17 +236,6 @@ $post-media-background: $article-media-background !default
$post-categories-color: color-contrast($main-color, 20%) !default
$post-time-color: color-contrast($main-color, 20%) !default
-// Table of content
-$toc-color: $main-color !default
-$toc-active-color: $main-active-color !default // TODO : checker ce que ça fait
-$toc-font-family: $body-font-family !default
-$toc-font-size: $body-font-size !default
-$toc-font-size-md: $body-font-size-md !default
-$toc-title-font-size: $body-font-size !default
-$toc-title-font-size-md: $body-font-size-md !default
-$toc-line-height: $h4-line-height !default
-$toc-font-weight: normal !default
-
// Person
$persons-avatar-background-color: $main-light-color !default
diff --git a/assets/sass/_theme/blocks/definitions.sass b/assets/sass/_theme/blocks/definitions.sass
index f0fde69e..cd51ed01 100644
--- a/assets/sass/_theme/blocks/definitions.sass
+++ b/assets/sass/_theme/blocks/definitions.sass
@@ -2,18 +2,18 @@
details
&:not([open]):hover
&::after
- border-bottom-color: $definition-border-color-hovered
+ border-bottom-color: $block-block-definition-border-color-hovered
summary,
p
- font-size: $definition-font-size
+ font-size: $block-definition-font-size
@include media-breakpoint-up(md)
- font-size: $definition-font-size-md
+ font-size: $block-definition-font-size-md
p
margin-block-start: 0
margin-block-end: $spacing1
&::after
content: ""
- border-bottom: 1px solid $definition-border-color
+ border-bottom: 1px solid $block-definition-border-color
display: block
transition: border-color 0.5s
@include in-page-without-sidebar
diff --git a/assets/sass/_theme/design-system/breadcrumb.sass b/assets/sass/_theme/design-system/breadcrumb.sass
index dcc743a0..a08fbc3f 100644
--- a/assets/sass/_theme/design-system/breadcrumb.sass
+++ b/assets/sass/_theme/design-system/breadcrumb.sass
@@ -4,7 +4,7 @@
flex-wrap: nowrap
overflow: auto
display: flex
- // padding-bottom: $spacing0
+ padding-bottom: $spacing0
li
flex-shrink: 0
white-space: nowrap
diff --git a/assets/sass/_theme/design-system/table.sass b/assets/sass/_theme/design-system/table.sass
index 35e5e6fb..83701b07 100644
--- a/assets/sass/_theme/design-system/table.sass
+++ b/assets/sass/_theme/design-system/table.sass
@@ -4,24 +4,37 @@ table
vertical-align: top
width: 100%
text-align: left
-
caption
padding: $spacing0 0
text-align: left
+ font-size: $small-font-size
th,
td
padding: $spacing0 0
thead
+ font-size: $table-head-font-size
+ @include media-breakpoint-up(md)
+ font-size: $table-head-font-size-md
th
text-align: left
+ + th
+ padding-left: $spacing1
tbody
+ font-size: $table-body-font-size
+ @include media-breakpoint-up(md)
+ font-size: $table-body-font-size-md
th,
td
border-bottom: 1px solid $main-border-color
+ + th, + td
+ padding-left: $spacing1
tr:first-child
th,
td
border-top: 1px solid $main-border-color
+
+.table-responsive
+ overflow-x: auto
\ No newline at end of file
diff --git a/layouts/partials/blocks/templates/datatable.html b/layouts/partials/blocks/templates/datatable.html
index 34efcbac..b9a9fc92 100644
--- a/layouts/partials/blocks/templates/datatable.html
+++ b/layouts/partials/blocks/templates/datatable.html
@@ -15,7 +15,7 @@
</div>
{{ end -}}
<div class="table-responsive">
- <table class="table">
+ <table>
{{- if .caption }}
<caption>{{ partial "PrepareHTML" .caption }}</caption>
{{ end -}}
--
GitLab