summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--static/brochure.css (renamed from templates/brochure/brochure.css)0
-rw-r--r--static/desktop.css29
-rw-r--r--static/styles.css (renamed from templates/styles.css)117
-rw-r--r--templates/about/index.html.j26
-rw-r--r--templates/about/team.html.j26
-rw-r--r--templates/base.html.j27
-rw-r--r--templates/brochure/index.html.j28
-rw-r--r--templates/card.html.j214
-rw-r--r--templates/index.html.j225
-rw-r--r--templates/policies.html.j22
-rw-r--r--templates/posts.html.j220
11 files changed, 69 insertions, 165 deletions
diff --git a/templates/brochure/brochure.css b/static/brochure.css
index 2abb118..2abb118 100644
--- a/templates/brochure/brochure.css
+++ b/static/brochure.css
diff --git a/static/desktop.css b/static/desktop.css
index 4d32d87..acbf1a6 100644
--- a/static/desktop.css
+++ b/static/desktop.css
@@ -1,4 +1,8 @@
@media only screen and (min-width: 700px) {
+ body {
+ font-size: 1.25em;
+ }
+
section {
padding: 3em;
}
@@ -10,17 +14,8 @@
}
div.buttons {
- flex-direction: row-reverse;
- }
-
- form {
- margin-right: 10%;
- margin-left: 10%;
- }
-
- table td,
- table th {
- padding: 0.5em;
+ flex-direction: row;
+ justify-content: center;
}
section.flexible {
@@ -40,10 +35,6 @@
flex-grow: 1;
}
- .signature img {
- width: 30%;
- }
-
.logo img {
width: 15%;
display: block;
@@ -52,10 +43,12 @@
}
.card {
- padding: 2em;
+ padding: 1em;
+ font-size: 1.5em;
}
- .modal .card {
- width: 25%;
+ section.cards {
+ margin-left: 20%;
+ margin-right: 20%;
}
} \ No newline at end of file
diff --git a/templates/styles.css b/static/styles.css
index babfed5..4fcea55 100644
--- a/templates/styles.css
+++ b/static/styles.css
@@ -23,7 +23,7 @@ body {
body {
background-image: url("/assets/bg.webp");
- background-size: 50%;
+ background-size: 9em;
}
nav {
@@ -32,6 +32,7 @@ nav {
background-color: white;
position: fixed;
width: 100%;
+ z-index: 1;
}
nav img {
@@ -103,19 +104,12 @@ section.banner {
rgba(255, 255, 255, 1) 75%);
}
-section.banner h1 {
+section.banner * {
background: white;
- margin-top: 0;
- padding-top: 1em;
-}
-
-section.cards {
- background-color: transparent;
-}
-
-section.squarshed {
- padding-bottom: 1em;
padding-top: 1em;
+ margin-top: 0;
+ margin-left: 0;
+ margin-right: 0;
}
.button img {
@@ -170,15 +164,6 @@ section a {
text-decoration: underline;
}
-.card {
- background-color: white;
- padding: 1em;
- border-radius: 1em;
- margin-left: 0;
- margin-right: 0;
- align-content: center;
-}
-
form input,
form textarea {
font-family: "PT Sans", sans-serif;
@@ -198,34 +183,6 @@ textarea {
resize: none;
}
-/* honeypot */
-textarea#beehive {
- display: none;
-}
-
-table {
- width: 100%;
- border-collapse: collapse;
-}
-
-table caption {
- text-align: left;
-}
-
-table th {
- text-align: right;
- color: var(--darkteal);
-}
-
-table td,
-table th {
- vertical-align: bottom;
-}
-
-tr:nth-child(even) {
- background-color: lightgray;
-}
-
picture img {
width: 100%;
}
@@ -245,20 +202,8 @@ section.flexible {
flex-direction: column;
}
-#reviews .card,
-#offerings .card {
- margin-left: 1em;
- margin-right: 1em;
- margin-top: 0.5em;
- margin-bottom: 0.5em;
- padding: 0.3em;
- flex: 1 0 21%;
- align-items: center;
- text-align: center;
-}
-
-#reviews,
-#offerings {
+section.cards {
+ background-color: transparent;
padding-left: 0;
padding-right: 0;
display: flex;
@@ -266,42 +211,22 @@ section.flexible {
justify-content: center;
}
-#offerings .full {
- flex: 1 1 100%;
-}
-
-.modal {
- position: fixed;
- z-index: 1;
- left: 0;
- top: 0;
- width: 100%;
- height: 100%;
- background-color: white;
- background-color: rgba(1, 1, 1, 0.4);
- overflow: auto;
- display: none;
- font-size: 1.5em;
-}
-
-.modal .card {
- max-height: 90%;
- max-width: 60%;
-}
-
-.modal a,
-.card a.button {
- float: right;
-}
-
-:target.modal {
- display: flex;
- justify-content: center;
+.card {
+ align-content: center;
align-items: center;
+ background-color: white;
+ border-radius: 1em;
+ flex: 1 0 21%;
+ margin-bottom: 0.5em;
+ margin-left: 1em;
+ margin-right: 1em;
+ margin-top: 0.5em;
+ padding: 0.3em;
+ text-align: center;
}
-:target.modal .card {
- overflow: auto;
+section.cards .full {
+ flex: 1 1 100%;
}
.centered {
diff --git a/templates/about/index.html.j2 b/templates/about/index.html.j2
index 71891ee..ad4480c 100644
--- a/templates/about/index.html.j2
+++ b/templates/about/index.html.j2
@@ -5,16 +5,14 @@
<h1>About Us</h1>
</section>
-<section class=" squarshed">
- <p>
+<section>
<h2 style="font-size: 1.5em; text-align: center;">
There are many pathways to success. I started Carpenter Tutoring for
those seeking a little help finding their way.
</h2>
- </p>
</section>
-<section class=" flexible squarshed">
+<section class="flexible">
<figure class="shadowy">
<picture>
<source srcset="/assets/amy.webp" type="image/webp" />
diff --git a/templates/about/team.html.j2 b/templates/about/team.html.j2
index 05bb2f8..07637c8 100644
--- a/templates/about/team.html.j2
+++ b/templates/about/team.html.j2
@@ -1,5 +1,5 @@
{% for tutor in tutors %}
-<sectionclass=" flexible">
+<section class="flexible">
{% if loop.index0 % 2 == 0 %}
{% include "blurb.html.j2" %}
{% include "figure.html.j2" %}
@@ -7,5 +7,5 @@
{% include "figure.html.j2" %}
{% include "blurb.html.j2" %}
{% endif %}
- </section>
- {% endfor %} \ No newline at end of file
+</section>
+{% endfor %} \ No newline at end of file
diff --git a/templates/base.html.j2 b/templates/base.html.j2
index ad99896..e81a8ea 100644
--- a/templates/base.html.j2
+++ b/templates/base.html.j2
@@ -7,7 +7,9 @@
Tutoring Excellence Online and in Suffolk, VA - Carpenter Tutoring, LLC
{% endblock %}
</title>
- {% include "stylewrap.html.j2" %}
+ {% block styles %}
+ <link rel="stylesheet" href="/styles.css" />
+ {% endblock %}
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link rel="stylesheet" href="/desktop.css" />
<link rel="stylesheet" href="/widescreen.css" />
@@ -45,7 +47,6 @@
<a href="/professional">Pros</a>
<a href="/posts">Posts</a>
<a href="/brochure">Brochure</a>
- <a href="/#help">Helpful Links</a>
<a href="/policies">Policies</a>
<a href="/about">Team</a>
<a href="/#reviews">Reviews</a>
@@ -62,7 +63,7 @@
<picture>
<source srcset="/assets/logo.webp" type="image/webp" />
<source srcset="/assets/logo.png" type="image/png" />
- <img alt="logo" src="/assets/logo.png" />
+ <img alt="Carpenter Tutoring logo" src="/assets/logo.png" />
</picture>
</figure>
diff --git a/templates/brochure/index.html.j2 b/templates/brochure/index.html.j2
index 547f9d7..a3a5b33 100644
--- a/templates/brochure/index.html.j2
+++ b/templates/brochure/index.html.j2
@@ -1,8 +1,8 @@
{% extends "base.html.j2" %}
-{% block style %}
-{% include "../styles.css" %}
-{% include "brochure.css" %}
+{% block styles %}
+<link rel="stylesheet" href="/styles.css" />
+<link rel="stylesheet" href="/brochure.css" />
{% endblock %}
{% block main %}
@@ -25,8 +25,6 @@
</section>
-<section></section>
-
<script>
{% include "brochure.js" %}
</script>
diff --git a/templates/card.html.j2 b/templates/card.html.j2
deleted file mode 100644
index 1397bc8..0000000
--- a/templates/card.html.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="card">
- <h2>
- {% block title %}
- Card Title
- {% endblock %}
- </h2>
-
- <p>
- {% block content %}
- Stuff in the card
- {% endblock %}
- </p>
-
-</div> \ No newline at end of file
diff --git a/templates/index.html.j2 b/templates/index.html.j2
index 24c9369..333dd59 100644
--- a/templates/index.html.j2
+++ b/templates/index.html.j2
@@ -3,15 +3,9 @@
{% block main %}
<!--banner-->
<section class="banner">
- <!-- <section class="banner flexible"> -->
- <!-- <figure class="logo">
- <picture>
- <source srcset="/assets/logo.webp" type="image/webp" />
- <source srcset="/assets/logo.png" type="image/png" />
- <img alt="logo" src="/assets/logo.png" />
- </picture>
- </figure> -->
- <h1>CARPENTER TUTORING</h1>
+ <h1>
+ CARPENTER TUTORING
+ </h1>
</section>
<section class="centered">
@@ -20,6 +14,7 @@
</h2>
</section>
+<!-- offerings -->
<section id="offerings" class="cards">
<div class="card full">
<h3>
@@ -53,15 +48,17 @@
</section>
<!-- help -->
-<section class="squarshed centered" id="help">
+<section class="centered" id="help">
<h2>Helpful Links</h2>
- <a class="button primary centered" href="/brochure">View an interactive brochure of our offerings</a>
- <a class="button centered" href="/policies">See policies and procedures regarding scheduling, payment, and
- booking</a>
+ <div class="buttons">
+ <a class="button primary centered" href="/brochure">View an interactive brochure of our offerings</a>
+ <a class="button centered" href="/policies">See policies and procedures regarding scheduling, payment, and
+ booking</a>
+ </div>
</section>
<!-- reviews -->
-<section id="reviews">
+<section id="reviews" class="cards">
<div class="card">
<h2>C.L. Cannon</h2>
diff --git a/templates/policies.html.j2 b/templates/policies.html.j2
index 5580ce9..3d90da5 100644
--- a/templates/policies.html.j2
+++ b/templates/policies.html.j2
@@ -365,6 +365,4 @@
</ul>
</section>
-<section></section>
-
{% endblock %} \ No newline at end of file
diff --git a/templates/posts.html.j2 b/templates/posts.html.j2
index e9efdfb..eec04a9 100644
--- a/templates/posts.html.j2
+++ b/templates/posts.html.j2
@@ -6,10 +6,18 @@
</section>
<section>
- <p>
- {% for post in posts %}
- <h2><a href="/posts/{{ post.get_title()|e }}">{{ post.get_title() }}</a></h2>
+ <h2>
+ Refining how we think and teach.
+ </h2>
+</section>
+
+<section class="cards">
+ {% for post in posts %}
+ <div class="card">
+ <h2>
+ <a href="/posts/{{ post.get_title()|e }}">{{ post.get_title() }}</a>
+ </h2>
+ </div>
{% endfor %}
- </p>
- <section>
- {% endblock %} \ No newline at end of file
+</section>
+{% endblock %} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 00:15:00 +0000