From b9663c2e0742848967d7c0ae261d861633253579 Mon Sep 17 00:00:00 2001 From: Jeff MacKinnon Date: Thu, 7 Jul 2022 10:39:09 -0300 Subject: [PATCH] It is close now --- README.rst | 42 +++++--- static/css-blue/main.css | 159 ++++++++++++++++++----------- templates/include/cornerstone.html | 23 +++++ templates/index.html | 37 ++++++- 4 files changed, 180 insertions(+), 81 deletions(-) create mode 100644 templates/include/cornerstone.html diff --git a/README.rst b/README.rst index ddb20ce..a635968 100644 --- a/README.rst +++ b/README.rst @@ -7,30 +7,38 @@ The base pelican theme for my site, `jeffmackinnon.com :last-child { - border-bottom: solid 3px #004360; + border-bottom: solid 3px var(--style-colour); display: inline-block; margin: 0 0 2em 0; padding: 0 0.75em 0.5em 0; } @@ -1015,7 +1040,7 @@ form { margin: 0 0 2em 0; } label { - color: #3d4449; + color: var(--header-colour); display: block; font-size: 0.9em; font-weight: 600; @@ -1033,7 +1058,7 @@ textarea { -webkit-appearance: none; -ms-appearance: none; appearance: none; - background: #ffffff; + background: var(--white); border-radius: 0.375em; border: none; border: solid 1px rgba(210, 215, 217, 0.75); @@ -1060,8 +1085,8 @@ textarea { input[type="url"]:focus, select:focus, textarea:focus { - border-color: #004360; - box-shadow: 0 0 0 1px #004360; } + border-color: var(--style-colour); + box-shadow: 0 0 0 1px var(--style-colour); } select { background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='40' height='40' preserveAspectRatio='none' viewBox='0 0 40 40'%3E%3Cpath d='M9.4,12.3l10.4,10.4l10.4-10.4c0.2-0.2,0.5-0.4,0.9-0.4c0.3,0,0.6,0.1,0.9,0.4l3.3,3.3c0.2,0.2,0.4,0.5,0.4,0.9 c0,0.4-0.1,0.6-0.4,0.9L20.7,31.9c-0.2,0.2-0.5,0.4-0.9,0.4c-0.3,0-0.6-0.1-0.9-0.4L4.3,17.3c-0.2-0.2-0.4-0.5-0.4-0.9 c0-0.4,0.1-0.6,0.4-0.9l3.3-3.3c0.2-0.2,0.5-0.4,0.9-0.4S9.1,12.1,9.4,12.3z' fill='rgba(210, 215, 217, 0.75)' /%3E%3C/svg%3E"); @@ -1072,8 +1097,8 @@ select { padding-right: 2.75em; text-overflow: ellipsis; } select option { - color: #3d4449; - background: #ffffff; } + color: var(--header-colour); + background: var(--white); } select:focus::-ms-value { background-color: transparent; } select::-ms-expand { @@ -1106,7 +1131,7 @@ input[type="radio"] { input[type="checkbox"] + label, input[type="radio"] + label { text-decoration: none; - color: #7f888f; + color: var(--input-colour); cursor: pointer; display: inline-block; font-size: 1em; @@ -1128,7 +1153,7 @@ input[type="radio"] { font-weight: 900; } input[type="checkbox"] + label:before, input[type="radio"] + label:before { - background: #ffffff; + background: var(--white); border-radius: 0.375em; border: solid 1px rgba(210, 215, 217, 0.75); content: ''; @@ -1143,14 +1168,14 @@ input[type="radio"] { width: 2.0625em; } input[type="checkbox"]:checked + label:before, input[type="radio"]:checked + label:before { - background: #3d4449; - border-color: #3d4449; - color: #ffffff; + background: var(--header-colour); + border-color: var(--header-colour); + color: var(--white); content: '\f00c'; } input[type="checkbox"]:focus + label:before, input[type="radio"]:focus + label:before { - border-color: #004360; - box-shadow: 0 0 0 1px #004360; } + border-color: var(--style-colour); + box-shadow: 0 0 0 1px var(--style-colour); } input[type="checkbox"] + label:before { border-radius: 0.375em; } @@ -1159,19 +1184,19 @@ input[type="radio"] + label:before { border-radius: 100%; } ::-webkit-input-placeholder { - color: #9fa3a6 !important; + color: var(--placeholder-colour) !important; opacity: 1.0; } :-moz-placeholder { - color: #9fa3a6 !important; + color: var(--placeholder-colour) !important; opacity: 1.0; } ::-moz-placeholder { - color: #9fa3a6 !important; + color: var(--placeholder-colour) !important; opacity: 1.0; } :-ms-input-placeholder { - color: #9fa3a6 !important; + color: var(--placeholder-colour) !important; opacity: 1.0; } /* Box */ @@ -1219,10 +1244,12 @@ input[type="radio"] + label:before { border-radius: 0.375em; border: 0; display: inline-block; - position: relative; } + position: relative; + } .image img { border-radius: 0.375em; - display: block; } + display: block; + max-width: 100%; } .image.left, .image.right { max-width: 40%; } .image.left img, .image.right img { @@ -1380,7 +1407,7 @@ ul.contact { font-family: 'Font Awesome 5 Free'; font-weight: 400; } ul.contact li:before { - color: #004360; + color: var(--style-colour); display: inline-block; font-size: 1.5em; height: 1.125em; @@ -1425,8 +1452,8 @@ ul.pagination { padding: 0 0.5em; text-align: center; } ul.pagination li > .page.active { - background-color: #004360; - color: #ffffff !important; } + background-color: var(--style-colour); + color: var(--white) !important; } ul.pagination li > .page.active:hover { background-color: #f67878; } ul.pagination li > .page.active:active { @@ -1458,7 +1485,7 @@ table { table td { padding: 0.75em 0.75em; } table th { - color: #3d4449; + color: var(--header-colour); font-size: 0.9em; font-weight: 600; padding: 0 0.75em 0.75em 0.75em; @@ -1499,8 +1526,8 @@ button, background-color: transparent; border-radius: 0.375em; border: 0; - box-shadow: inset 0 0 0 2px #004360; - color: #004360 !important; + box-shadow: inset 0 0 0 2px var(--style-colour); + color: var(--style-colour) !important; cursor: pointer; display: inline-block; font-family: "Roboto Slab", serif; @@ -1519,13 +1546,13 @@ button, input[type="button"]:hover, button:hover, .button:hover { - background-color: rgba(0, 67, 96, 0.05); } + background-color: rgba(245, 106, 106, 0.05); } input[type="submit"]:active, input[type="reset"]:active, input[type="button"]:active, button:active, .button:active { - background-color: rgba(0, 67, 96, 0.15); } + background-color: rgba(245, 106, 106, 0.15); } input[type="submit"].icon:before, input[type="reset"].icon:before, input[type="button"].icon:before, @@ -1557,9 +1584,9 @@ button, input[type="button"].primary, button.primary, .button.primary { - background-color: #004360; + background-color: var(--style-colour); box-shadow: none; - color: #ffffff !important; } + color: var(--white) !important; } input[type="submit"].primary:hover, input[type="reset"].primary:hover, input[type="button"].primary:hover, @@ -1611,7 +1638,7 @@ button, -ms-flex-wrap: wrap; flex-wrap: wrap; margin: 0 0 2em -3em; - width: calc(100% + 3em); } + width: calc(80% + 3em); } .features article { -moz-align-items: center; -webkit-align-items: center; @@ -1646,7 +1673,7 @@ button, text-align: center; width: 10em; } .features article .icon:before { - color: #004360; + color: var(--style-colour); font-size: 2.75rem; position: relative; top: 0.05em; } @@ -1737,8 +1764,8 @@ button, -webkit-flex-wrap: wrap; -ms-flex-wrap: wrap; flex-wrap: wrap; - margin: 0 0 2em -6em; - width: calc(100% + 6em); } + margin: 0 0 0em -1em; + width: calc(100% + 4em); } .posts article { -moz-flex-grow: 0; -webkit-flex-grow: 0; @@ -1748,21 +1775,21 @@ button, -webkit-flex-shrink: 1; -ms-flex-shrink: 1; flex-shrink: 1; - margin: 0 0 6em 6em; + margin: 0 2em 2em 2em; position: relative; - width: calc(33.33333% - 6em); } + width: calc(33.33333% - 4em); } .posts article:before { background: rgba(210, 215, 217, 0.75); content: ''; display: block; - height: calc(100% + 6em); - left: -3em; + height: calc(100% + 2em); + left: -2em; position: absolute; top: 0; width: 1px; } .posts article:after { background: rgba(210, 215, 217, 0.75); - bottom: -3em; + bottom: 0em; content: ''; display: block; height: 1px; @@ -1776,7 +1803,8 @@ button, margin: 0 0 2em 0; } .posts article .image img { display: block; - width: 100%; } + width: 100%; + max-width:100%;} @media screen and (min-width: 1681px) { .posts article:nth-child(3n + 1):before { display: none; } @@ -1863,7 +1891,7 @@ button, margin: 0 auto; max-width: 110em; } #main > .inner > section { - padding: 6em 0 4em 0 ; + padding: 2em 0 4em 0 ; border-top: solid 2px rgba(210, 215, 217, 0.75); } #main > .inner > section:first-of-type { border-top: 0 !important; } @@ -1871,17 +1899,17 @@ button, #main > .inner { padding: 0 5em 0.1em 5em ; } #main > .inner > section { - padding: 5em 0 3em 0 ; } } + padding: 2em 0 3em 0 ; } } @media screen and (max-width: 1280px) { #main > .inner { padding: 0 4em 0.1em 4em ; } #main > .inner > section { - padding: 4em 0 2em 0 ; } } + padding: 1em 0 2em 0 ; } } @media screen and (max-width: 736px) { #main > .inner { padding: 0 2em 0.1em 2em ; } #main > .inner > section { - padding: 3em 0 1em 0 ; } } + padding: 1em 0 1em 0 ; } } /* Sidebar */ #search form { @@ -1903,7 +1931,7 @@ button, -webkit-transform: scaleX(-1); -ms-transform: scaleX(-1); transform: scaleX(-1); - color: #7f888f; + color: var(--input-colour); content: '\f002'; cursor: default; display: block; @@ -2058,7 +2086,7 @@ button, text-indent: 7.25em; width: 7.25em; } #sidebar .toggle:before { - color: #7f888f; + color: var(--input-colour); margin-left: -0.0625em; margin-top: -0.25em; font-size: 1.1rem; @@ -2079,7 +2107,7 @@ button, display: -webkit-flex; display: -ms-flex; display: flex; - border-bottom: solid 5px #004360; + border-bottom: solid 5px var(--style-colour); padding: 6em 0 1em 0; position: relative; } #header > * { @@ -2191,7 +2219,7 @@ button, /* Footer */ #footer .copyright { - color: #9fa3a6; + color: var(--placeholder-colour); font-size: 0.9em; } #footer .copyright a { color: inherit; } @@ -2202,7 +2230,7 @@ button, -webkit-user-select: none; -ms-user-select: none; user-select: none; - color: #3d4449; + color: var(--header-colour); font-family: "Roboto Slab", serif; font-weight: 400; letter-spacing: 0.075em; @@ -2218,7 +2246,7 @@ button, font-size: 0.9em; padding: 0.625em 0; } #menu ul a:hover, #menu ul span:hover { - color: #004360; } + color: var(--style-colour); } #menu ul a.opener, #menu ul span.opener { -moz-transition: color 0.2s ease-in-out; -webkit-transition: color 0.2s ease-in-out; @@ -2243,12 +2271,12 @@ button, -webkit-transition: color 0.2s ease-in-out, -webkit-transform 0.2s ease-in-out; -ms-transition: color 0.2s ease-in-out, -ms-transform 0.2s ease-in-out; transition: color 0.2s ease-in-out, transform 0.2s ease-in-out; - color: #9fa3a6; + color: var(--placeholder-colour); content: '\f078'; position: absolute; right: 0; } #menu ul a.opener:hover:before, #menu ul span.opener:hover:before { - color: #004360; } + color: var(--style-colour); } #menu ul a.opener.active + ul, #menu ul span.opener.active + ul { display: block; } #menu ul a.opener.active:before, #menu ul span.opener.active:before { @@ -2262,7 +2290,7 @@ button, margin: 0.5em 0 0 0; padding: 0.5em 0 0 0; } #menu > ul > li > ul { - color: #9fa3a6; + color: var(--placeholder-colour); display: none; margin: 0.5em 0 1.5em 0; padding-left: 1em; } @@ -2275,3 +2303,10 @@ button, border-top: 0; margin-top: 0; padding-top: 0; } + + +/* index header size */ +#indexheader { + min-height: 80px; + vertical-align:bottom; +} \ No newline at end of file diff --git a/templates/include/cornerstone.html b/templates/include/cornerstone.html new file mode 100644 index 0000000..780fa61 --- /dev/null +++ b/templates/include/cornerstone.html @@ -0,0 +1,23 @@ +
+
+
+

TEST 1

+
+ +
Some TEXT TO GET CLICKS
+
+
+
+

TEST 1

+
+ +
Some TEXT TO GET CLICKS
+
+
+
+

TEST 1

+
+ +
Some TEXT TO GET CLICKS
+
+
diff --git a/templates/index.html b/templates/index.html index 2144537..6a271ec 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,5 +1,32 @@ {% extends "base.html" %} {% block content %} + +{% if TAGLINE or TAGLINEHEAD %} + + +{% endif %} + +{% if CORNERSTONE_CONTENT == True %} + +
+ {% include 'include/cornerstone.html' %} +
+
+
+{% endif %} + +{% if NEWSLETTER %} + +
+

Our Newsletter

+ {{ NEWSLETTER }} +
+
+{% endif %} +
{% block content_title %}

All articles

@@ -19,14 +46,20 @@
{{ article.summary }}
+ {% if INCLUDECATEGORY == True %} {% if article.category %} - {% endif %} + +
+ {% endif %} {% endif %}