diff --git a/_includes/authorlist.html b/_includes/authorlist.html
index ff78bba7262460..21784681ce485d 100644
--- a/_includes/authorlist.html
+++ b/_includes/authorlist.html
@@ -2,10 +2,10 @@
{%- for author in authors -%}
{%- if author contains "<" -%}
{%- assign authorparts=author|split:"<" -%}
- "}}">{{authorparts[0]|strip}}
+ {{authorparts[0]|strip}} <"}}">{{authorparts[1]|remove:">"}}>
{%- elsif author contains "(@" -%}
{%- assign authorparts=author|split:"(@" -%}
- {{authorparts[0]|strip}}
+ {{authorparts[0]|strip}} (@{{authorparts[1]|remove:")"}})
{%- else -%}
{{author}}
{%- endif -%}
diff --git a/_includes/eipnums.html b/_includes/eipnums.html
index cd823d545d16cf..4edcd30b7028ad 100644
--- a/_includes/eipnums.html
+++ b/_includes/eipnums.html
@@ -1,4 +1,4 @@
{% assign eips=include.eips|split:"," %}
{% for eipnum in eips %}
- {{eipnum|strip}}{% if forloop.last == false %}, {% endif %}
+ EIP-{{eipnum|strip}}{% if forloop.last == false %}, {% endif %}
{% endfor %}
diff --git a/_includes/head.html b/_includes/head.html
index 4ee006aa2d4324..d5a2675e807dc0 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,8 +3,13 @@
{% if page.layout == "eip" %}
- EIP-{{ page.eip }}: {{ page.title | escape }}
-
+ {% if page.category == "ERC" %}
+ ERC-{{ page.eip }}: {{ page.title | escape }}
+
+ {% else %}
+ EIP-{{ page.eip }}: {{ page.title | escape }}
+
+ {% endif %}
@@ -36,5 +41,29 @@
{%- feed_meta -%}
-
+
+
+
+
+
+
+
diff --git a/_includes/header.html b/_includes/header.html
new file mode 100644
index 00000000000000..2afd73fb539985
--- /dev/null
+++ b/_includes/header.html
@@ -0,0 +1,29 @@
+
diff --git a/_layouts/eip.html b/_layouts/eip.html
index d8d5cbe8ff9484..27544d8f97a689 100644
--- a/_layouts/eip.html
+++ b/_layouts/eip.html
@@ -2,59 +2,103 @@
layout: default
---
-{% if page.status == "Draft" %}
-
- β οΈ This EIP is not recommended for general use or implementation as it is likely to change.
-
-{% elsif page.status == "Review" %}
-
- π This EIP is in the review stage. It is subject to changes and feedback is appreciated.
-
-{% elsif page.status == "Last Call" %}
-
- π’ This EIP is in the last call for review stage. The authors wish to finalize the EIP and appreciate feedback.
-
-{% elsif page.status == "Stagnant" %}
-
- π§ This EIP had no activity for at least 6 months.
-
-{% elsif page.status == "Withdrawn" %}
-
- π This EIP has been withdrawn.
-
-{% endif %}
+
-
- EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}
-
-
-
{{ page.description | xml_escape }}
-
- | Author | {% include authorlist.html authors=page.author %} |
|---|
- {% if page["discussions-to"] != undefined %}
- | Discussions-To | {{ page["discussions-to"] | xml_escape }} |
|---|
+
+ {% if page.status == "Stagnant" %}
+ π§ Stagnant
{% endif %}
- | Status | {{ page.status | xml_escape }}
- {% if page.last-call-deadline != undefined %}
- |
|---|
| Last Call Deadline | {{ page.last-call-deadline | xml_escape }} |
|---|
+ {% if page.status == "Withdrawn" %}
+ π Withdrawn
{% endif %}
-
- | Type | {{ page.type | xml_escape }} |
|---|
- {% if page.category != undefined %}
- | Category | {{ page.category | xml_escape }} |
|---|
+ {% if page.status == "Draft" or page.status == "Review" %}
+ β οΈ {{ page.status }}
{% endif %}
- | Created | {{ page.created | xml_escape }} |
|---|
- {% if page.updated != undefined %}
- | Updated | {{ page.updated | xml_escape }} |
|---|
+ {% if page.status == "Last Call" %}
+ π’ Last Call
{% endif %}
- {% if page.requires != undefined %}
- | Requires | {% include eipnums.html eips=page.requires %} |
|---|
+ {% if page.category == "ERC" %}
+ Standards Track: ERC
+ {% elsif page.category == "Interface" %}
+ Standards Track: Interface
+ {% elsif page.category == "Networking" %}
+ Standards Track: Networking
+ {% elsif page.category == "Core" %}
+ Standards Track: Core
+ {% elsif page.type == "Informational" %}
+ Informational
+ {% elsif page.type == "Meta" %}
+ Meta
{% endif %}
- {% if page["withdrawal-reason"] != undefined %}
- | Withdrawal reason | {{ page["withdrawal-reason"] | xml_escape }} |
|---|
+
+
+ {% if page.category == "ERC" %}
+ ERC-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}
+ {% elsif page.category != "ERC" %}
+ EIP-{{ page.eip | xml_escape }}: {{ page.title | xml_escape }}
{% endif %}
+
+
+
+
+
+
+
+ {{ page.description | xml_escape }}
+
+
+
+ | Authors |
+ {% include authorlist.html authors=page.author %} |
+
+ {% if page.created != undefined %}
+
+ | Created |
+ {{ page.created }} |
+
+ {% endif %}
+ {% if page.status != "Review" and page.status != "Last Call" and page.status != "Final" and page["discussions-to"] != undefined %}
+
+ | Discussion Link |
+ {{ page["discussions-to"] | xml_escape }} |
+
+ {% endif %}
+ {% if page.requires != undefined %}
+
+ | Requires |
+ {% include eipnums.html eips=page.requires %} |
+
+ {% endif %}
+
+
+
+ {% if page.status == "Review" or page.status == "Last Call" %}
+
+ {% endif %}
Table of Contents
@@ -92,15 +136,3 @@
Citation
"copyrightYear": "{{ page.created | date: "%Y" }}"
}
-
diff --git a/assets/css/style.scss b/assets/css/style.scss
index 2624f9b84cb5d2..c2c72c25ffd15e 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -2,7 +2,7 @@
# Only the main Sass file needs front matter (the dashes are enough)
---
-$content-width: 960px;
+$content-width: 1152px;
@import 'minima';
@@ -30,10 +30,22 @@ $content-width: 960px;
color: #111;
}
+.table-borderless, .table-borderless * {
+ border-style : hidden !important; // !important To override Jekyll styling
+ background-color: rgba(0,0,0,0) !important;
+}
+
+table.preamble > tbody > tr > :not(:first-child) {
+ width: 100%;
+}
+
+table.preamble > tbody > tr > :first-child {
+ white-space: nowrap;
+}
+
a, a:link {
color: #726E97;
text-decoration: none;
- transition: 0.5s;
}
a:visited {
@@ -42,44 +54,37 @@ a:visited {
a:hover, a:active {
color: #7F557D;
- box-shadow: 0 3px 0 #7F557D;
+ text-decoration: underline;
}
-.status {
- border-radius: 6px;
- line-height: 18px;
- overflow: hidden;
- padding: 12px;
- display: inline-block;
- margin-bottom: 15px;
+.site-footer, .site-footer * {
+ box-sizing: content-box !important; // !important To override bootstrap styling
}
-.draft {
- @extend .status;
- background-color: #fffbea;
- border: solid 1px #f1c40f;
+.no-underline {
+ text-decoration: none !important; // !important To override previous
styling
}
-.review {
- @extend .status;
- background-color: #f0f7fb;
- border: solid 1px #3498db;
+.badge:hover {
+ filter: brightness(75%);
+ transition: all 0.25s ease;
}
-.lastcall {
- @extend .status;
- background-color: #e7f6f0;
- border: solid 1px #27ae60;
+h1 {
+ vertical-align: middle;
}
-.stagnant {
- @extend .status;
- background-color: #ffdead;
- border: solid 1px #ff6700;
+h1 a {
+ height: 1em;
+ display: inline-block;
+ vertical-align: baseline;
}
-.withdrawn {
- @extend .status;
- background-color: #f9e7e5;
- border: solid 1px #c0392b;
+.inline-svg {
+ display: inline-block;
+ vertical-align: bottom;
+ fill: currentColor;
+ width: 1.5ex;
+ height: 100%;
+ object-fit: cover;
}