Merge pull request #8 from chollinger93/2023-04

minor: Figures, Quote CSS adjustments
chollinger93 · Apr 8, 2023 · 9308aec · 9308aec
2 parents 6cf1bd0 + f0ebea1
commit 9308aec
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 13 deletions.
diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
@@ -1,18 +1,35 @@
 <!-- image -->
 <figure {{ with .Get "class" }}class="{{.}}"{{ end }}>
     {{ with .Get "link" }}<a href="{{ . }}">{{ end }}
-        <img src="{{ .Get "src" }}" {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt" }}{{ . }}{{ else }}{{ .Get "caption" }}{{ end }}"{{ end }} />
+        <img src="{{ .Get "src" }}" 
+            {{ if or (.Get "alt") (.Get "caption") }}alt="{{ with .Get "alt" }}{{ . }}{{ else }}{{ .Get "caption" }}{{ end }}"{{ end }} />
     {{ if .Get "link" }}</a>{{ end }}
+
     {{ if or (or (.Get "title") (.Get "caption")) (.Get "attr") }}
-    <figcaption>{{ if isset .Params "title" }}
-        {{ .Get "title" }}{{ end }}
-        {{ if or (.Get "caption") (.Get "attr") }}<p>
-        {{ .Get "caption" }}
-        {{ with .Get "attrlink" }}<a href="{{ . }}"> {{ end }}
-            {{ .Get "attr" }}
-        {{ if .Get "attrlink" }}</a> {{ end }}
-        </p> {{ end }}
-    </figcaption>
+        <figcaption>
+            {{ if isset .Params "title" }}
+                {{ .Get "title" }}
+            {{ end }}
+
+            {{ if or (.Get "caption") (.Get "attr") }}
+                <p style="margin: -0.5rem 0 0 0;">
+                    {{ .Get "caption" }}
+
+
+                {{ with .Get "attrlink" }}
+                    <a href="{{ . }}"> 
+                {{ end }}
+                {{ if .Get "attr" }}
+                    <small style="margin: -0.5rem 0 0 0;">
+                       [{{ .Get "attr" }}]
+                    </small>
+                {{ end }}
+                {{ if .Get "attrlink" }}</a> 
+                {{ end }}
+
+            </p> 
+            {{ end }}
+        </figcaption>
     {{ end }}
 </figure>
-<!-- image -->
+<!-- image -->
diff --git a/static/css/main.css b/static/css/main.css
@@ -106,11 +106,11 @@ textarea {
 blockquote {
     margin-left: 1rem;
     font-style: italic;
-    font-size: 1.4rem;
+    font-size: 1.1rem;
     font-family: Georgia, bitstream charter, serif;
     border-left: 3px solid;
     border-color: #3700ff;
-    padding-left: 20px;
+    padding-left: 15px;
 }
 
 blockquote cite {
@@ -122,6 +122,10 @@ blockquote em {
     font-weight: 600;
 }
 
+blockquote code {
+    font-size: 0.8rem;
+}
+
 
 h1, h2, h3, h4, h5, h6 {
     color: #333;
@@ -514,3 +518,7 @@ code:not(pre *)  {
     background-color: rgb(239, 241, 243);
     font-size: 95%;
 }
+
+code {
+    font-size: 0.8rem;
+}