From 2ae22c2e3b613eceb96ff3caccfe90aa2b27c6a1 Mon Sep 17 00:00:00 2001
From: squidfunk <scifish@gmail.com>
Date: Sun, 18 Dec 2016 14:02:20 +0100
Subject: [PATCH] Added pandoc table styles to specimen
---
docs/specimen.md | 23 +++++++++++++++++++++
material/assets/stylesheets/application.css | 8 -------
material/base.html | 10 ++++-----
src/assets/stylesheets/_shame.scss | 11 +---------
src/base.html | 15 +++++++-------
5 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/docs/specimen.md b/docs/specimen.md
index 973c35dc..e033db70 100644
--- a/docs/specimen.md
+++ b/docs/specimen.md
@@ -202,6 +202,29 @@ Vestibulum vitae orci quis ante viverra ultricies ut eget turpis. Sed eu
lectus dapibus, eleifend nulla varius, lobortis turpis. In ac hendrerit nisl,
sit amet laoreet nibh.
+<table>
+ <colgroup>
+ <col width="30%">
+ <col width="70%">
+ </colgroup>
+ <thead>
+ <tr class="header">
+ <th>Table</th>
+ <th>with colgroups (Pandoc)</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Lorem</td>
+ <td>ipsum dolor sit amet.</td>
+ </tr>
+ <tr>
+ <td>Sed sagittis</td>
+ <td>eleifend rutrum. Donec vitae suscipit est.</td>
+ </tr>
+ </tbody>
+</table>
+
## Colors
### Primary colors
diff --git a/material/assets/stylesheets/application.css b/material/assets/stylesheets/application.css
index b9f644f3..573c8ef3 100644
--- a/material/assets/stylesheets/application.css
+++ b/material/assets/stylesheets/application.css
@@ -1224,14 +1224,6 @@ hr {
opacity: 0;
z-index: -1; }
-.md-button {
- float: right;
- margin-top: 9px;
- font-size: 13px;
- padding-left: 2.6rem;
- font-weight: 700;
- text-transform: uppercase; }
-
@media print {
.md-typeset a::after {
diff --git a/material/base.html b/material/base.html
index 28315dac..61319320 100644
--- a/material/base.html
+++ b/material/base.html
@@ -84,11 +84,6 @@
<div class="md-content">
<article class="md-content__inner md-typeset">
{% block content %}
- {% if config.edit_uri %}
- <a class="md-button md-button--edit" href="{{ page.edit_url }}">
- Edit
- </a>
- {% endif %}
{% if not "\x3ch1 id=" in page.content %}
<h1>{{ page.title | default(config.site_name, true)}}</h1>
{% endif %}
@@ -106,6 +101,11 @@
Material
</a>
theme.
+ {% if config.edit_uri %}
+ <a href="{{ page.edit_url }}">
+ Edit this page
+ </a>
+ {% endif %}
</small>
</article>
</div>
diff --git a/src/assets/stylesheets/_shame.scss b/src/assets/stylesheets/_shame.scss
index 8b8f6552..6c5c8691 100644
--- a/src/assets/stylesheets/_shame.scss
+++ b/src/assets/stylesheets/_shame.scss
@@ -21,14 +21,5 @@
////
// ----------------------------------------------------------------------------
-// Rules
+// Nothing to see here, move along
// ----------------------------------------------------------------------------
-
-.md-button {
- float: right;
- margin-top: 9px;
- font-size: 13px;
- padding-left: 2.6rem;
- font-weight: 700;
- text-transform: uppercase;
-}
diff --git a/src/base.html b/src/base.html
index 1d8d0471..cc16e7a7 100644
--- a/src/base.html
+++ b/src/base.html
@@ -168,14 +168,6 @@
<!-- Block: content -->
{% block content %}
- <!-- Edit button, if URL was defined -->
- {% if config.edit_uri %}
- <a class="md-button md-button--edit"
- href="{{ page.edit_url }}">
- Edit
- </a>
- {% endif %}
-
<!--
This is a nasty hack that checks whether the content contains
a h1 headline. If it doesn't, the page title (or respectively
@@ -202,6 +194,13 @@
Material
</a>
theme.
+
+ <!-- Edit button, if URL was defined -->
+ {% if config.edit_uri %}
+ <a href="{{ page.edit_url }}">
+ Edit this page
+ </a>
+ {% endif %}
</small>
</article>
</div>
--
GitLab