Browse Source

reconfigured structure and changed footer

main
Simon Bowie 1 year ago
parent
commit
19f62b122e
11 changed files with 32 additions and 73 deletions
  1. +1
    -1
      web/app/conversations.py
  2. +1
    -1
      web/app/main.py
  3. +2
    -2
      web/app/making.py
  4. +9
    -42
      web/app/static/styles/custom.css
  5. +2
    -1
      web/app/templates/conversations-overview.html
  6. +0
    -12
      web/app/templates/conversations-text.html
  7. +2
    -1
      web/app/templates/index.html
  8. +2
    -1
      web/app/templates/making-overview.html
  9. +0
    -12
      web/app/templates/making-text.html
  10. +6
    -0
      web/app/templates/text.html
  11. +7
    -0
      web/app/templates/toc.html

+ 1
- 1
web/app/conversations.py View File

@@ -23,4 +23,4 @@ def martha():
with open('content/section_2/I-Martha-gowans.md', 'r') as f:
text = f.read()
text = markdown.markdown(text)
return render_template('conversations-text.html', text=text)
return render_template('text.html', text=text)

+ 1
- 1
web/app/main.py View File

@@ -22,7 +22,7 @@ def contents():
with open('content/TOC.md', 'r') as f:
text = f.read()
text = markdown.markdown(text)
return render_template('text.html', text=text)
return render_template('toc.html', text=text)

# route for introduction page
@main.route('/introduction/')

+ 2
- 2
web/app/making.py View File

@@ -24,7 +24,7 @@ def interface():
with open('content/section_3/on-interface-design.md', 'r') as f:
text = f.read()
text = markdown.markdown(text)
return render_template('making-text.html', text=text)
return render_template('text.html', text=text)

# route for databases essay
@making.route('/making/search-engine-book/')
@@ -32,4 +32,4 @@ def databases():
with open('content/section_3/on-combining-databases-and-books.md', 'r') as f:
text = f.read()
text = markdown.markdown(text)
return render_template('making-text.html', text=text)
return render_template('text.html', text=text)

+ 9
- 42
web/app/static/styles/custom.css View File

@@ -448,76 +448,43 @@ canvas > * {
background-color: var(--color-light-gray);
}

/* CONVERSATIONS */
/* TEXT PAGES LIKE ARCHIVAL CONVERSATIONS AND MAKING OF */

.conversations {
.text {
margin: 0% 20%;
}

.conversations h1 {
.text h1 {
text-align: center;
}

.conversations p {
.text p {
margin: 2rem 0rem;
}

.conversations img {
.text img {
width: 100%;
}

.conversations h2, .conversations h3 {
.text h2, .text h3 {
margin: 2rem 0rem;
padding: 0rem 1rem;
}

.conversations h2 {
.text h2 {
font-size: 2.25 rem;
background-color: var(--color-lightyellow);
border-radius: 0.5rem;
}

.conversations h3 {
.text h3 {
border-bottom: 0.25rem dashed var(--color-lightyellow);
}

.conversations li {
.text li {
}

/* MAKING OF */

.making {
margin: 0% 20%;
}

.making h1 {
text-align: center;
}

.making p {
margin: 2rem 0rem;
}

.making img {
width: 100%;
}

.making h2, .making h3 {
margin: 2rem 0rem;
padding: 0rem 1rem;
}

.making h2 {
font-size: 2.25 rem;
background-color: var(--color-lightyellow);
border-radius: 0.5rem;
}

.making h3 {
border-bottom: 0.25rem dashed var(--color-lightyellow);
}

code {
display: flex;
flex-direction: column;

+ 2
- 1
web/app/templates/conversations-overview.html View File

@@ -1,4 +1,5 @@
<div class="conversations">
<div class="text">
<button id="notes-operations" onclick="hideShowInfo()">?</button>
<a href="/contents/" class="arrow-back h1 text-left" title="back to index"> ⇽ </a>
{% extends "base.html" %}

+ 0
- 12
web/app/templates/conversations-text.html View File

@@ -1,12 +0,0 @@
<div class="conversations">
<a href="/contents/" class="arrow-back h1 text-left" title="back to index"> ⇽ </a>
{% extends "base.html" %}

{% block content %}

{{ text|safe }}

{% endblock %}

</div>

+ 2
- 1
web/app/templates/index.html View File

@@ -104,7 +104,8 @@
{% block footer %}
<footer class="footer mt-5 py-3 bg-light">
<div class="container">
<span class="text-muted">Data from the <a href="https://www.epo.org/">European Patent Office's</a> <a href="https://worldwide.espacenet.com/">Espacenet patent search engine</a> and reconfigured by Goldsmiths, University of London's Archival Conversations project.</span>
<span class="text-muted">Copyright © Julien McHardy & Kat Jungnickel, chapters by respective authors, 2023. Licensed under a <a href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International (CC BY-NC-SA 4.0)</a> license.</span>
<span class="text-muted">Data from the <a href="https://www.epo.org/">European Patent Office</a> and reconfigured by Goldsmiths, University of London's <a href="https://www.politicsofpatents.org/">Politics of Patents</a> research project funded by an <a href="https://erc.europa.eu/">ERC</a> Consolidator grant.</span>
</div>
</footer>
{% endblock%}

+ 2
- 1
web/app/templates/making-overview.html View File

@@ -1,4 +1,5 @@
<div class="making">
<div class="text">
<button id="notes-operations" onclick="hideShowInfo()">?</button>
<a href="/contents/" class="arrow-back h1 text-left" title="back to index"> ⇽ </a>
{% extends "base.html" %}

+ 0
- 12
web/app/templates/making-text.html View File

@@ -1,12 +0,0 @@
<div class="making">
<a href="/contents/" class="arrow-back h1 text-left" title="back to index"> ⇽ </a>
{% extends "base.html" %}

{% block content %}

{{ text|safe }}

{% endblock %}

</div>

+ 6
- 0
web/app/templates/text.html View File

@@ -1,3 +1,7 @@
<div class="text">
<button id="notes-operations" onclick="hideShowInfo()">?</button>
<a href="/contents/" class="arrow-back h1 text-left" title="back to index"> ⇽ </a>
{% extends "base.html" %}

{% block content %}
@@ -5,3 +9,5 @@
{{ text|safe }}

{% endblock %}

</div>

+ 7
- 0
web/app/templates/toc.html View File

@@ -0,0 +1,7 @@
{% extends "base.html" %}

{% block content %}

{{ text|safe }}

{% endblock %}

Loading…
Cancel
Save