Skip to content

Commit f0615fe

Browse files
committed
Slight facelift of data tables
1 parent 8a8d574 commit f0615fe

File tree

9 files changed

+31
-28
lines changed

9 files changed

+31
-28
lines changed

material/assets/javascripts/bundle.8fb3741f.min.js renamed to material/assets/javascripts/bundle.29db7785.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/javascripts/bundle.8fb3741f.min.js.map renamed to material/assets/javascripts/bundle.29db7785.min.js.map

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/stylesheets/main.1118c9be.min.css

Lines changed: 0 additions & 2 deletions
This file was deleted.

material/assets/stylesheets/main.1118c9be.min.css.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

material/assets/stylesheets/main.75c97395.min.css

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/assets/stylesheets/main.75c97395.min.css.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

material/base.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
{% endif %}
4040
{% endblock %}
4141
{% block styles %}
42-
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.1118c9be.min.css' | url }}">
42+
<link rel="stylesheet" href="{{ 'assets/stylesheets/main.75c97395.min.css' | url }}">
4343
{% if config.theme.palette %}
4444
{% set palette = config.theme.palette %}
4545
<link rel="stylesheet" href="{{ 'assets/stylesheets/palette.ba0d045b.min.css' | url }}">
@@ -223,7 +223,7 @@ <h1>{{ page.title | d(config.site_name, true)}}</h1>
223223
</script>
224224
{% endblock %}
225225
{% block scripts %}
226-
<script src="{{ 'assets/javascripts/bundle.8fb3741f.min.js' | url }}"></script>
226+
<script src="{{ 'assets/javascripts/bundle.29db7785.min.js' | url }}"></script>
227227
{% for path in config["extra_javascript"] %}
228228
<script src="{{ path | url }}"></script>
229229
{% endfor %}

src/assets/stylesheets/main/_colors.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@
9090
--md-typeset-kbd-accent-color: hsla(0, 100%, 100%, 1);
9191
--md-typeset-kbd-border-color: hsla(0, 0%, 72%, 1);
9292

93+
// Typeset `table` color shades
94+
--md-typeset-table-color: hsla(0, 0%, 0%, 0.12);
95+
9396
// Admonition color shades
9497
--md-admonition-fg-color: var(--md-default-fg-color);
9598
--md-admonition-bg-color: var(--md-default-bg-color);

src/assets/stylesheets/main/_typeset.scss

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ kbd {
5757

5858
// Icon definitions
5959
:root {
60-
--md-typeset-table--ascending: svg-load("material/arrow-down.svg");
61-
--md-typeset-table--descending: svg-load("material/arrow-up.svg");
60+
--md-typeset-table-sort-icon: svg-load("material/sort.svg");
61+
--md-typeset-table-sort-icon--asc: svg-load("material/sort-ascending.svg");
62+
--md-typeset-table-sort-icon--desc: svg-load("material/sort-descending.svg");
6263
}
6364

6465
// ----------------------------------------------------------------------------
@@ -496,10 +497,8 @@ kbd {
496497
overflow: auto;
497498
font-size: px2rem(12.8px);
498499
background-color: var(--md-default-bg-color);
499-
border-radius: px2rem(2px);
500-
box-shadow:
501-
0 px2rem(4px) px2rem(10px) hsla(0, 0%, 0%, 0.05),
502-
0 0 px2rem(1px) hsla(0, 0%, 0%, 0.1);
500+
border: px2rem(1px) solid var(--md-typeset-table-color);
501+
border-radius: px2rem(4px);
503502
touch-action: auto;
504503

505504
// [print]: Reset display mode so table header wraps when printing
@@ -544,9 +543,8 @@ kbd {
544543
th {
545544
min-width: px2rem(100px);
546545
padding: px2em(12px, 12.8px) px2em(16px, 12.8px);
547-
color: var(--md-default-bg-color);
546+
font-weight: 700;
548547
vertical-align: top;
549-
background-color: var(--md-default-fg-color--light);
550548

551549
// Links in table headings
552550
a {
@@ -558,23 +556,18 @@ kbd {
558556
td {
559557
padding: px2em(12px, 12.8px) px2em(16px, 12.8px);
560558
vertical-align: top;
561-
border-top: px2rem(1px) solid var(--md-default-fg-color--lightest);
559+
border-top: px2rem(1px) solid var(--md-typeset-table-color);
562560
}
563561

564-
// Table row
565-
tr {
562+
// Table body row
563+
tbody tr {
566564
transition: background-color 125ms;
567565

568566
// Table row on hover
569567
&:hover {
570568
background-color: rgba(0, 0, 0, 0.035);
571569
box-shadow: 0 px2rem(1px) 0 var(--md-default-bg-color) inset;
572570
}
573-
574-
// Hide border on first table row
575-
&:first-child td {
576-
border-top: 0;
577-
}
578571
}
579572

580573
// Text link in table
@@ -594,21 +587,28 @@ kbd {
594587
height: 1.2em;
595588
margin-left: 0.5em;
596589
vertical-align: sub;
590+
mask-image: var(--md-typeset-table-sort-icon);
597591
mask-repeat: no-repeat;
598592
mask-size: contain;
593+
transition: background-color 125ms;
599594
content: "";
600595
}
601596

597+
// Sort ascending
598+
&:hover::after {
599+
background-color: var(--md-default-fg-color--lighter);
600+
}
601+
602602
// Sort ascending
603603
&[aria-sort="ascending"]::after {
604-
background-color: currentColor;
605-
mask-image: var(--md-typeset-table--ascending);
604+
background-color: var(--md-default-fg-color--light);
605+
mask-image: var(--md-typeset-table-sort-icon--asc);
606606
}
607607

608608
// Sort descending
609609
&[aria-sort="descending"]::after {
610-
background-color: currentColor;
611-
mask-image: var(--md-typeset-table--descending);
610+
background-color: var(--md-default-fg-color--light);
611+
mask-image: var(--md-typeset-table-sort-icon--desc);
612612
}
613613
}
614614

0 commit comments

Comments
 (0)