Skip to content

Commit d258a1b

Browse files
Use PST styling for spec meta styling (#576)
* Use PST styling for spec meta styling * Remove more
1 parent 59ad215 commit d258a1b

6 files changed

Lines changed: 44 additions & 89 deletions

File tree

assets/css/custom.css

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,6 @@ table.spec__table thead {
2121
text-decoration: none;
2222
}
2323

24-
.spec-meta {
25-
background-color: var(--pst-color-surface);
26-
border: 1px solid var(--pst-color-border);
27-
border-radius: 0.25rem;
28-
line-height: 1.2em;
29-
margin: 1.5em 0;
30-
padding: 1rem;
31-
display: inline-block;
32-
}
33-
34-
.spec-meta table {
35-
margin-bottom: 0;
36-
}
37-
38-
.spec-meta .field {
39-
}
40-
41-
.spec-meta .field-name {
42-
white-space: nowrap;
43-
font-weight: bold;
44-
vertical-align: top;
45-
}
46-
4724
.gallery {
4825
display: flex;
4926
flex-wrap: wrap;

layouts/partials/specs/author.html

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

layouts/partials/specs/date.html

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
{{- $root := . -}}
2-
<div class="spec-meta">
3-
<table>
2+
<div class="sd-card sd-mb-3 sd-shadow-sm">
3+
<div class="sd-card-body">
44
{{ $meta_fields := (slice "homepage" "repository" "pypi" "libraries-io" "license" "license-type") }}
5+
<dl class="field-list">
56
{{- range $attr := $meta_fields -}}
67
{{ $val := index $.Params $attr }}
7-
<tr class="field">
8-
<td class="field-name">
9-
{{ $attr | humanize }}:
10-
</td>
11-
<td class="field-value">
12-
{{ $val | markdownify }}
13-
</td>
14-
</tr>
8+
<dt class="field-odd">
9+
{{ $attr | humanize }}:
10+
</dt>
11+
<dd class="field-odd">
12+
{{ $val | markdownify }}
13+
</dd>
1514
{{- end -}}
16-
</table>
15+
</dl>
16+
</div>
1717
</div>
18-
19-
<div class="endorsed-specs">
20-
<h1>Endorsed SPECs</h1>
21-
{{ $specs := where $.Site.Pages "Section" "specs" }}
18+
<div class="article-content">
19+
<h2>Endorsed SPECs</h1>
20+
{{- $specs := where $.Site.Pages "Section" "specs" -}}
2221
<ul class="endorsed-specs-list">
2322
{{- range $specs -}}
24-
{{ if not (in (lower .Title) "meta") }}
25-
{{ if in ( index .Params "endorsed-by" ) $root.File.BaseFileName }}
23+
{{- if not (in (lower .Title) "meta") -}}
24+
{{- if in ( index .Params "endorsed-by" ) $root.File.BaseFileName }}
2625
<li><a href="{{ .RelPermalink }}">{{ .Title }}</a></li>
27-
{{- end }}
28-
{{- end }}
26+
{{- end -}}
27+
{{- end -}}
2928
{{- end -}}
3029
</ul>
3130
</div>
Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
{{ $page := . }}
22
{{ $isSpec := eq (len (findRE "^spec-\\d*" .File.ContentBaseName)) 1 }}
3-
<div class="spec-meta">
4-
<table>
3+
<div class="sd-card sd-mb-3 sd-shadow-sm">
4+
<div class="sd-card-body">
55
{{ $meta_fields := (slice "author" "discussion" "history" "endorsed-by") }}
6+
{{ $warn := "" }}
7+
<dl class="field-list">
68
{{- range $attr := $meta_fields -}}
79
{{ $val := index $.Params $attr }}
810
{{ $attr := strings.TrimPrefix "spec_" $attr }}
@@ -20,13 +22,12 @@
2022
{{- end -}}
2123
{{ $isSpecField := (in (slice "endorsed-by" "discussion" ) $attr) }}
2224
{{ if (or $isSpec (not $isSpecField)) }}
23-
<tr class="field">
24-
<td class="field-name">
25-
{{ $attr | humanize }}:
26-
</td>
25+
<dt class="field-odd">
26+
{{ $attr | humanize }}<span class="colon">:</span></dt>
27+
</dt>
2728
{{- if (reflect.IsSlice $val) -}}
2829
{{ $len := len $val }}
29-
<td class="field-value">
30+
<dd class="field-odd">
3031
{{- range $idx, $el := $val }}
3132
{{ if eq $attr "endorsed-by" }}
3233
<a href="{{ relref $.Page.CurrentSection (printf "core-projects/%s" $el) }}">{{ $el }}</a>
@@ -35,31 +36,26 @@
3536
{{- end -}}
3637
{{- if not (eq (add $idx 1) $len) -}},{{ end }}
3738
{{ end }}
38-
</td>
39+
</dd>
3940
{{- else }}
40-
<td class="field-value">
41+
<dd class="field-odd">
4142
{{ $val | markdownify }}
42-
</td>
43+
</dd>
4344
{{- end -}}
44-
</tr>
45-
{{/* add warning that this is a draft, i.e. has not been endorsed by 2 projects or more */}}
46-
{{- if (and (eq $attr "endorsed-by") (lt (len (or $val "")) 2)) }}
47-
{{/* add blank line */}}
48-
<tr class="field">
49-
<td class="field-name">&nbsp;</td>
50-
<td class="field-value"></td>
51-
</tr>
52-
{{/* add warning */}}
53-
<tr class="field" style="background-color:crimson;color:white;">
54-
<td class="field-name">
55-
&nbsp; WARNING:
56-
</td>
57-
<td class="field-value">
58-
Draft document.
59-
</td>
60-
</div>
61-
{{- end -}}
6245
{{- end -}}
46+
{{/* add warning that this is a draft, i.e. has not been endorsed by 2 projects or more */}}
47+
{{- if (and (eq $attr "endorsed-by") (lt (len (or $val "")) 2)) -}}
48+
{{ $warn = "True" }}
49+
{{- end -}}
6350
{{- end -}}
64-
</table>
51+
</dl>
52+
{{- if $warn }}
53+
<div class="admonition attention">
54+
<div class="admonition-title">
55+
Attention
56+
</div>
57+
<p>This is a draft document.</p>
58+
</div>
59+
{{- end -}}
60+
</div>
6561
</div>

layouts/specs/single.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ <h1>{{ .Title }}</h1>
77
<h5 class="subtitle">{{ .Params.Subtitle }}</h5>
88
{{ end }}
99
{{ with partial "specs/meta.html" . -}}
10-
<div class="post-meta">{{ . }}</div>
10+
{{ . }}
1111
{{- end }}
1212

1313
<div class="article-content">

0 commit comments

Comments
 (0)