summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Letan <lthms@soap.coffee>2020-02-23 20:54:34 +0100
committerThomas Letan <lthms@soap.coffee>2020-02-23 21:54:36 +0100
commitb79765f4383bd08f3b89fde947a2f1ae3c837e1d (patch)
tree882ea6f56e14577c095fe0c72e7a26d3a8175b86
parentUse font-display, use non-breaking spaces with URL mark (diff)
Move plugin-specific SASS rules in Soupault.org
-rw-r--r--.gitignore1
-rw-r--r--site/cleopatra/Bootstrap.org2
-rw-r--r--site/cleopatra/Soupault.org96
-rw-r--r--site/cleopatra/Theme.org38
4 files changed, 78 insertions, 59 deletions
diff --git a/.gitignore b/.gitignore
index a5f8380..e0222e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ node_modules/
site/style/coq.sass
site/style/coq.sass
site/style/org.sass
+site/style/plugins.sass
site/style/main.sass
build.log
# begin generated files
diff --git a/site/cleopatra/Bootstrap.org b/site/cleopatra/Bootstrap.org
index e1e7902..9274fb4 100644
--- a/site/cleopatra/Bootstrap.org
+++ b/site/cleopatra/Bootstrap.org
@@ -277,7 +277,7 @@ started using ~soupault~. You can read more about [[./Soupault.org][how the ~sou
configuration of the present website in the dedicated document]].
#+BEGIN_SRC makefile :tangle bootstrap.mk :noweb tangle :exports none
-<<extends(MK="soupault.mk", IN="Soupault.org", GF="soupault.conf package.json templates/history.html plugins/external-urls.lua plugins/urls-rewriting.lua scripts/katex.js scripts/history.sh")>>
+<<extends(MK="soupault.mk", IN="Soupault.org", GF="soupault.conf package.json templates/history.html plugins/external-urls.lua plugins/urls-rewriting.lua scripts/katex.js scripts/history.sh", GS="site/style/plugins.sass")>>
#+END_SRC
** Theming and Templating
diff --git a/site/cleopatra/Soupault.org b/site/cleopatra/Soupault.org
index 2ff6ab6..7f73561 100644
--- a/site/cleopatra/Soupault.org
+++ b/site/cleopatra/Soupault.org
@@ -140,28 +140,17 @@ while index do
end
#+END_SRC
-#+BEGIN_SRC html :tangle templates/history.html
-<details class="history">
- <summary>Revisions</summary>
- <p>
- This revisions table has been automatically generated from
- <a href="https://code.soap.coffee/writing/lthms.git">the <code>git</code>
- history of this website repository</a>, and the change descriptions may not
- always be as useful as they should. You can consult the source of this file
- in its current
- version <a href="https://code.soap.coffee/writing/lthms.git/tree/{{file}}">here</a>.
- </p>
+#+BEGIN_SRC sass :tangle site/style/plugins.sass
+.url-mark.fa
+ display: inline
+ font-size: 90%
+ width: 1em
- <table>
- {{#history}}
- <tr>
- <td class="date">{{date}}</a></td>
- <td class="subject">{{subject}}</a></td>
- <td class="commit"><a href="https://code.soap.coffee/writing/lthms.git/commit/{{filename}}/?id={{hash}}">{{abbr_hash}}</a></td>
- </tr>
- {{/history}}
- </table>
-</details>
+.url-mark.fa-github::before
+ content: "\00a0\f09b"
+
+.url-mark.fa-external-link::before
+ content: "\00a0\f08e"
#+END_SRC
#+BEGIN_SRC toml :tangle soupault.conf
@@ -232,6 +221,66 @@ haskell-mustache ${1} ${tmp_file}
rm ${tmp_file}
#+END_SRC
+#+NAME: repo
+#+BEGIN_SRC text
+https://code.soap.coffee/writing/lthms.git
+#+END_SRC
+
+#+BEGIN_SRC html :tangle templates/history.html :noweb tangle
+<details class="history">
+ <summary>Revisions</summary>
+ <p>
+ This revisions table has been automatically generated from
+ <a href="<<repo>>">the
+ <code>git</code> history of this website repository</a>,
+ and the change descriptions may not always be as useful as
+ they should. You can consult the source of this file
+ in its current version
+ <a href="<<repo>>/tree/{{file}}">here</a>.
+ </p>
+
+ <table>
+ {{#history}}
+ <tr>
+ <td class="date">{{date}}</a></td>
+ <td class="subject">{{subject}}</a></td>
+ <td class="commit">
+ <a href="<<repo>>/commit/{{filename}}/?id={{hash}}">
+ {{abbr_hash}}
+ </a>
+ </td>
+ </tr>
+ {{/history}}
+ </table>
+</details>
+#+END_SRC
+
+#+BEGIN_SRC sass :tangle site/style/plugins.sass
+#history
+ summary
+ color: $primary-color
+ font-weight: bold
+
+ table
+ border-top: 2px solid $primary-color
+ border-bottom: 2px solid $primary-color
+ border-collapse: collapse;
+
+ td
+ border-bottom: 1px solid $primary-color
+ padding: .5em
+ vertical-align: top
+
+ td.commit
+ font-size: smaller
+
+ td.commit
+ font-family: 'Fira Code', monospace
+ color: $code-fg-color
+ font-size: 80%
+ white-space: nowrap;
+#+END_SRC
+
#+BEGIN_SRC toml :tangle soupault.conf
[widgets.generate-history]
widget = "preprocess_element"
@@ -272,6 +321,11 @@ GENFILES += package-lock.json
GENAUX += node_modules/
#+END_SRC
+#+BEGIN_SRC sass :tangle site/style/plugins.sass
+.imath
+ font-size: smaller
+#+END_SRC
+
#+BEGIN_SRC toml :tangle soupault.conf
[widgets.math]
widget = "preprocess_element"
diff --git a/site/cleopatra/Theme.org b/site/cleopatra/Theme.org
index 0478683..e013ee6 100644
--- a/site/cleopatra/Theme.org
+++ b/site/cleopatra/Theme.org
@@ -206,43 +206,7 @@ body#vcard
ol
margin-top: 0.3em
-.url-mark.fa
- display: inline
- font-size: 90%
- width: 1em
-
-.url-mark.fa-github::before
- content: "\00a0\f09b"
-
-.url-mark.fa-external-link::before
- content: "\00a0\f08e"
-
-#history
- summary
- color: $primary-color
- font-weight: bold
-
- table
- border-top: 2px solid $primary-color
- border-bottom: 2px solid $primary-color
- border-collapse: collapse;
-
- td
- border-bottom: 1px solid $primary-color
- padding: .5em
- vertical-align: top
-
- td.commit
- font-size: smaller
-
- td.commit
- font-family: 'Fira Code', monospace
- color: $code-fg-color
- font-size: 80%
- white-space: nowrap;
-
-.imath
- font-size: smaller
+@import plugins
#+END_SRC
#+BEGIN_SRC makefile :tangle theme.mk