From 5cf77538230117f5b95a3b74e539ef5394ea4bda Mon Sep 17 00:00:00 2001 From: Joshua Byrd Date: Sat, 25 Jan 2020 12:33:36 +1000 Subject: [PATCH] About etc --- .vscode/settings.json | 18 +++++++++--------- components/foot.js | 10 +++++++++- components/foot.scss | 21 ++++++++++++++++++--- components/heading.scss | 3 +-- components/layout.js | 9 +++++++-- components/layout.scss | 10 +++++----- components/quotation.scss | 8 +++----- components/search.js | 6 ++++-- components/search.scss | 3 +-- pages/about.js | 12 ++++++++++++ pages/about.scss | 0 pages/index.js | 2 +- pages/index.scss | 22 ++-------------------- pages/page/[page].js | 2 +- pages/quote/[slug].scss | 13 ++----------- public/icons/favorite-7-240.png | Bin 0 -> 2019 bytes public/icons/favorite-7.svg | 1 + 17 files changed, 76 insertions(+), 64 deletions(-) create mode 100644 pages/about.js create mode 100644 pages/about.scss create mode 100644 public/icons/favorite-7-240.png create mode 100644 public/icons/favorite-7.svg diff --git a/.vscode/settings.json b/.vscode/settings.json index 8faa587..60d3f21 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,18 +1,18 @@ { "workbench.colorCustomizations": { - "activityBar.background": "#2f7c47", - "activityBar.activeBorder": "#422c74", + "activityBar.background": "#368e52", + "activityBar.activeBorder": "#c7bae5", "activityBar.foreground": "#e7e7e7", "activityBar.inactiveForeground": "#e7e7e799", - "activityBarBadge.background": "#422c74", - "activityBarBadge.foreground": "#e7e7e7", - "titleBar.activeBackground": "#215732", - "titleBar.inactiveBackground": "#21573299", + "activityBarBadge.background": "#c7bae5", + "activityBarBadge.foreground": "#15202b", + "titleBar.activeBackground": "#28693d", + "titleBar.inactiveBackground": "#28693d99", "titleBar.activeForeground": "#e7e7e7", "titleBar.inactiveForeground": "#e7e7e799", - "statusBar.background": "#215732", - "statusBarItem.hoverBackground": "#2f7c47", + "statusBar.background": "#28693d", + "statusBarItem.hoverBackground": "#368e52", "statusBar.foreground": "#e7e7e7" }, - "peacock.color": "#215732" + "peacock.color": "#28693d" } \ No newline at end of file diff --git a/components/foot.js b/components/foot.js index 342b299..7e1930b 100644 --- a/components/foot.js +++ b/components/foot.js @@ -4,7 +4,15 @@ import css from "./foot.scss"; export default props => { return (
- Home About +
+ + Home + {" "} + + About + +
+
Made with Love
); }; diff --git a/components/foot.scss b/components/foot.scss index b0b2e1e..08dca72 100644 --- a/components/foot.scss +++ b/components/foot.scss @@ -1,10 +1,11 @@ .foot { - font-size: 1.5em; color: white; min-height: 100px; display: flex; + flex-direction: column; align-items: center; justify-content: center; + padding-top: 1em; a { color: white; @@ -16,7 +17,21 @@ text-decoration: underline; } - .fleuron { - font-size: 1.5em; + .mid { + margin-bottom: 0.7em; + } + + .sub { + display: flex; + align-items: center; + font-size: 0.7em; + color: dimgray; + margin-bottom: 2em; + + img { + filter: invert(0.4); + height: 0.9em; + padding-left: 8px; + } } } diff --git a/components/heading.scss b/components/heading.scss index c809aa8..aef4531 100644 --- a/components/heading.scss +++ b/components/heading.scss @@ -1,6 +1,6 @@ .root { color: white; - padding: 0.5rem 2rem; + padding: 0.5rem 1rem; display: flex; align-items: center; @@ -17,7 +17,6 @@ } .branding { - font-size: 2em; img { max-height: 2.5rem; diff --git a/components/layout.js b/components/layout.js index b3b1380..a6ecc09 100644 --- a/components/layout.js +++ b/components/layout.js @@ -3,7 +3,7 @@ import css from "./layout.scss"; import { useStoreState } from "easy-peasy"; import Heading from "../components/heading"; -import Search from "../components/search" +import Search from "../components/search"; import Foot from "../components/foot"; const Layout = props => { @@ -17,7 +17,12 @@ const Layout = props => { content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no" /> */} - + {/* */} + diff --git a/components/layout.scss b/components/layout.scss index 03c4fd5..cfaab3a 100644 --- a/components/layout.scss +++ b/components/layout.scss @@ -28,7 +28,7 @@ :global { html { height: 100%; - font-size: 16px; + font-size: 32px; } body { @@ -40,10 +40,6 @@ background-color: black; } - footer { - - } - h1, h2, h3, h4, h5, h6 { margin-top: 0; } @@ -93,4 +89,8 @@ content: "❧"; content: "&"; } + + .invert { + filter: invert(1); + } } diff --git a/components/quotation.scss b/components/quotation.scss index 7c7c991..b426f67 100644 --- a/components/quotation.scss +++ b/components/quotation.scss @@ -1,15 +1,13 @@ @import "../sass/breakpoints.scss"; .quotation { - padding-top: 3em; - padding-bottom: 3em; + blockquote { text-align: center; - max-width: 1024px; + max-width: 960px; margin: auto; - padding: 16px; - font-size: 2em; + padding: 1em; // @include for-size(tablet-portrait-up) { // font-size: 1.3rem; diff --git a/components/search.js b/components/search.js index 89c597b..18f89a0 100644 --- a/components/search.js +++ b/components/search.js @@ -3,7 +3,9 @@ import css from "./search.scss"; export default props => { return (
-
+
+ +
); -}; \ No newline at end of file +}; diff --git a/components/search.scss b/components/search.scss index ef0939e..026cc7a 100644 --- a/components/search.scss +++ b/components/search.scss @@ -9,10 +9,9 @@ } input[type=search] { - font-size: 2em; width: 100%; height: 100%; border: none; - padding: 0rem 2rem; + padding: 0rem 1rem; } } \ No newline at end of file diff --git a/pages/about.js b/pages/about.js new file mode 100644 index 0000000..3719569 --- /dev/null +++ b/pages/about.js @@ -0,0 +1,12 @@ +import Layout from "../components/layout"; +import css from "./about.scss"; + +const About = props => { + return ( + +
About
+ + ); +}; + +export default About; diff --git a/pages/about.scss b/pages/about.scss new file mode 100644 index 0000000..e69de29 diff --git a/pages/index.js b/pages/index.js index f65d12c..e38c6dc 100644 --- a/pages/index.js +++ b/pages/index.js @@ -33,7 +33,7 @@ const Home = props => { ))} -
+
Next > diff --git a/pages/index.scss b/pages/index.scss index addd1dc..9d1395f 100644 --- a/pages/index.scss +++ b/pages/index.scss @@ -4,27 +4,9 @@ .quote { margin-bottom: 2em; text-align: left; - font-size: 2em; } -} - -.quotes-root { - font-size: 14px; - display: flex; - justify-content: center; - margin-left: 16px; - margin-right: 16px; -} -.topic-link { - a { - margin-right: 6px; - margin-bottom: 6px; - text-decoration: none; - // font-weight: bold; - padding: 4px 8px; - // background-color: #333; - display: inline-block; - border: 1px solid #333; + .pagination { + text-align: center; } } diff --git a/pages/page/[page].js b/pages/page/[page].js index ad55f42..00b8b97 100644 --- a/pages/page/[page].js +++ b/pages/page/[page].js @@ -36,7 +36,7 @@ const Pagination = props => {
))} -
+
{page === "2" ? ( < Previous diff --git a/pages/quote/[slug].scss b/pages/quote/[slug].scss index 19ae8e4..7fe6899 100644 --- a/pages/quote/[slug].scss +++ b/pages/quote/[slug].scss @@ -1,13 +1,4 @@ .root { - width: 100%; - - .title { - padding: 2em 2em; - } - .info { - text-align: center; - font-size: 0.7em; - margin-top: 1.5em; - margin-bottom: 1.5em; - } + padding-top: 0.5em; + padding-bottom: 0.5em; } diff --git a/public/icons/favorite-7-240.png b/public/icons/favorite-7-240.png new file mode 100644 index 0000000000000000000000000000000000000000..2b3df965d1494d557a4f1473ee80aff9213cb8bf GIT binary patch literal 2019 zcmd^Ak5^N56sLowQ7SM;3Z|7Zbs-$41FQt;03paUagX5!Bm^X|&ABr~GNw?(P^6Rm z$RSc4LEGB~17Tz1hjkt!VVD`?q1!~af*edG87LFh_q#f$KcaWed-r|ry`THJ@11w= z6YZmYu-wDf!_CcY`R>@L{lGqk=dzc;HJtw7YhYeJ5}V9-b6bJI^M&fSSNOTPEv?=i z6?vfGj%_ru+;6vU>HV+b&am!mth(l%z>Qn_c==Va?Vc^q;i=Ufdg(-Yc%+3t>~-f} z-|CXfS-~Of+C*|RdE16X-NY$w!&gfpy0*LkbX>=^=(GKn(?eNL9?s6r&N&>8v^e3) z1$A$)^AG5Nfr9sXHZSa)`SVCv7poZ;UaDG`7*`n@8Y;YNGA$tUnm_wZCKDGrnwp)* zx>KFJu(hc*i-CnLV~^5g2>RuWeWEA=59{D2g|o2e@H!r4|I=0phRvK)xf(P8jlBUCV1AI;gJ!>}n>!=}wm%A$ilgRlMPlk^Q3?zm~0h`A=`EIlOz&t3Zrwp18X1zO^FY7;wQ zOYLQ=QFWdbFUU!n8^&ahrt&o{fZUW{ak&WUHdb{QY?E6sNnqUo_2QtOZID_Is-@$~WivC7KI$t4FK zO;1mA8^S-E&;D(DgUiW#X3x=f(X8s}@(^ zqnz$D_a^-I{O!i7Tlt#Ly5Yc9ts9a){C8IED}xG^hVFwhWMyN-4IPc!esCxFHj{oB zx__jgGqriFb}@FFi9yHiEv~Ja;+*eWbuYp!ZO#~F3@a7{_s}nO4IVC1OA-z_Fgod z9>^P%_S(JCqatP&-i$M<f6Vm|Ssx|p=)SQm4l>w8z}SzJ;^@5HvY zd1Sys<0{EN_Nu2V%x7GI^;)+CeGF;0SG^Vv%j9{~9e_Cb_XG;W0cO(cP~Ycpo2%OC zmfL+$Rts% zfWkK+#5Xv}>j|g_K`9-?B;{qynr#Zn`{tSyib9fZuBoqM5KpQy*#xxMOBvv=AaCd8 z-X)-QWNF->Y- zYDUh8=odC}^g9*h*&?O@_|nZt3IY9@#L)*U%F!}rCJFh~kC$r{(PwBz-|Tc^iI=jp zp3!#?lN}-CXGU_^&G z7E+CI>BLh*JHayeJQN308@z=tVx|+%QSA^MPpkl-Ew~+mcN1Zx&4&t-AJeY_*N=n` z!QOds)9^Yl{RJ^HFz3auwu6n}@ecWQ;8N}X0c1t))t&{!nLH_^oGb;v1NAVzWO_T0^wcQ<<-b4Y4yU{O`FKZ<{x1dmmF|wF KMakd)sQ7PlP6E*Y literal 0 HcmV?d00001 diff --git a/public/icons/favorite-7.svg b/public/icons/favorite-7.svg new file mode 100644 index 0000000..b39ba5e --- /dev/null +++ b/public/icons/favorite-7.svg @@ -0,0 +1 @@ + \ No newline at end of file