diff options
author | 53hornet <53hornet@gmail.com> | 2018-09-15 13:36:59 -0400 |
---|---|---|
committer | 53hornet <53hornet@gmail.com> | 2018-09-15 13:36:59 -0400 |
commit | d167f3dffa076b0440f934dec8aa571e34d35fc0 (patch) | |
tree | ac2b58ba405bb15acf5f4b2a95ec2216d889471d | |
parent | 276a4df6eef72d195a3e2d57a76f11ad1875debe (diff) | |
download | md-site-d167f3dffa076b0440f934dec8aa571e34d35fc0.tar.xz md-site-d167f3dffa076b0440f934dec8aa571e34d35fc0.zip |
In the middle of redesign
-rw-r--r-- | makefile | 2 | ||||
-rw-r--r-- | md/wedding/accomodations/bg.jpg | bin | 0 -> 4039182 bytes | |||
-rw-r--r-- | md/wedding/background.html | 3 | ||||
-rw-r--r-- | md/wedding/bg.html | 3 | ||||
-rw-r--r-- | md/wedding/bg.jpg | bin | 0 -> 3687580 bytes | |||
-rw-r--r-- | md/wedding/doandeat/bg.jpg | bin | 0 -> 5572815 bytes | |||
-rw-r--r-- | md/wedding/doandeat/index.md | 9 | ||||
-rw-r--r-- | md/wedding/gallery/1.jpg | bin | 0 -> 1394887 bytes | |||
-rw-r--r-- | md/wedding/gallery/10.jpg | bin | 0 -> 1716757 bytes | |||
-rw-r--r-- | md/wedding/gallery/11.jpg | bin | 0 -> 1261173 bytes | |||
-rw-r--r-- | md/wedding/gallery/2.jpg | bin | 0 -> 3221855 bytes | |||
-rw-r--r-- | md/wedding/gallery/3.jpg | bin | 0 -> 4302506 bytes | |||
-rw-r--r-- | md/wedding/gallery/4.jpg | bin | 0 -> 1350497 bytes | |||
-rw-r--r-- | md/wedding/gallery/5.jpg | bin | 0 -> 2023808 bytes | |||
-rw-r--r-- | md/wedding/gallery/6.jpg | bin | 0 -> 2362425 bytes | |||
-rw-r--r-- | md/wedding/gallery/7.jpg | bin | 0 -> 6664954 bytes | |||
-rw-r--r-- | md/wedding/gallery/8.jpg | bin | 0 -> 1975225 bytes | |||
-rw-r--r-- | md/wedding/gallery/9.jpg | bin | 0 -> 1874040 bytes | |||
-rw-r--r-- | md/wedding/gallery/bg.jpg | bin | 0 -> 6446527 bytes | |||
-rw-r--r-- | md/wedding/index.md | 11 | ||||
-rw-r--r-- | md/wedding/nav.html | 4 | ||||
-rw-r--r-- | md/wedding/party/bg.jpg | bin | 0 -> 3884864 bytes | |||
-rw-r--r-- | md/wedding/party/index.md | 4 | ||||
-rw-r--r-- | md/wedding/registry/bg.jpg (renamed from md/wedding/background-old.jpg) | bin | 3937853 -> 3937853 bytes | |||
-rw-r--r-- | md/wedding/registry/index.md (renamed from md/wedding/gifts/index.md) | 4 | ||||
-rw-r--r-- | md/wedding/rsvp/bg.jpg (renamed from md/wedding/background.jpg) | bin | 6823502 -> 6823502 bytes | |||
-rw-r--r-- | md/wedding/rsvp/index.md | 14 | ||||
-rw-r--r-- | md/wedding/styles.css | 76 | ||||
-rw-r--r-- | md/wedding/travel/bg.jpg | bin | 0 -> 4316645 bytes |
29 files changed, 52 insertions, 78 deletions
@@ -57,7 +57,7 @@ wedding: $(WED_OUT) html/wedding/%.html: md/wedding/%.md md/wedding/nav.html @echo "wedding: $< -> $@" @mkdir -p "$(@D)" - @pandoc "$<" -f markdown -t html5 -s -H md/wedding/background.html -B md/wedding/nav.html -c /styles.css -o "$@" + @pandoc "$<" -f markdown -t html5 -s -B md/wedding/nav.html -c /styles.css -o "$@" clean: @rm -rf html/ diff --git a/md/wedding/accomodations/bg.jpg b/md/wedding/accomodations/bg.jpg Binary files differnew file mode 100644 index 0000000..46d35cf --- /dev/null +++ b/md/wedding/accomodations/bg.jpg diff --git a/md/wedding/background.html b/md/wedding/background.html deleted file mode 100644 index 9d8a7bb..0000000 --- a/md/wedding/background.html +++ /dev/null @@ -1,3 +0,0 @@ -<style type="text/css"> - body{background-image: url(background.jpg)} -</style> diff --git a/md/wedding/bg.html b/md/wedding/bg.html new file mode 100644 index 0000000..7480d92 --- /dev/null +++ b/md/wedding/bg.html @@ -0,0 +1,3 @@ +<style type="text/css"> + body{background-image: url(bg.jpg)} +</style> diff --git a/md/wedding/bg.jpg b/md/wedding/bg.jpg Binary files differnew file mode 100644 index 0000000..c783860 --- /dev/null +++ b/md/wedding/bg.jpg diff --git a/md/wedding/doandeat/bg.jpg b/md/wedding/doandeat/bg.jpg Binary files differnew file mode 100644 index 0000000..a5ca689 --- /dev/null +++ b/md/wedding/doandeat/bg.jpg diff --git a/md/wedding/doandeat/index.md b/md/wedding/doandeat/index.md index 7fa1d2a..95650ae 100644 --- a/md/wedding/doandeat/index.md +++ b/md/wedding/doandeat/index.md @@ -3,21 +3,14 @@ pagetitle: Things To Do and Eat --- <article> -# Things To Do and Eat +# Food & Fun ## This is where things to do and eat go - - Ad eaque delectus sint dolores ipsam sit rem alias. Dolores eos placeat velit harum aut. Et libero omnis adipisci soluta veniam consequatur neque. - Ea rerum eos illum amet. Dicta dolores est qui in ratione voluptas. Fugiat dolorem distinctio fugiat quidem in dolor exercitationem et. Sed aut laudantium nisi mollitia eligendi. - Modi illo ex tempora ratione adipisci consequuntur. Commodi a aliquam eligendi. Laudantium similique voluptas labore cumque in dolorum dignissimos sapiente. - Non id totam officia adipisci officiis rerum ut assumenda. Molestias adipisci dignissimos sed nisi sed. Repellendus et id unde qui ex non. - Dolorem debitis ea et assumenda enim. Hic eaque et non enim. Recusandae veniam minima fugiat est ullam minus eum similique. - </article> diff --git a/md/wedding/gallery/1.jpg b/md/wedding/gallery/1.jpg Binary files differnew file mode 100644 index 0000000..c66cb95 --- /dev/null +++ b/md/wedding/gallery/1.jpg diff --git a/md/wedding/gallery/10.jpg b/md/wedding/gallery/10.jpg Binary files differnew file mode 100644 index 0000000..2221b8f --- /dev/null +++ b/md/wedding/gallery/10.jpg diff --git a/md/wedding/gallery/11.jpg b/md/wedding/gallery/11.jpg Binary files differnew file mode 100644 index 0000000..2531243 --- /dev/null +++ b/md/wedding/gallery/11.jpg diff --git a/md/wedding/gallery/2.jpg b/md/wedding/gallery/2.jpg Binary files differnew file mode 100644 index 0000000..ebb3fb1 --- /dev/null +++ b/md/wedding/gallery/2.jpg diff --git a/md/wedding/gallery/3.jpg b/md/wedding/gallery/3.jpg Binary files differnew file mode 100644 index 0000000..4e1d27b --- /dev/null +++ b/md/wedding/gallery/3.jpg diff --git a/md/wedding/gallery/4.jpg b/md/wedding/gallery/4.jpg Binary files differnew file mode 100644 index 0000000..105fdf0 --- /dev/null +++ b/md/wedding/gallery/4.jpg diff --git a/md/wedding/gallery/5.jpg b/md/wedding/gallery/5.jpg Binary files differnew file mode 100644 index 0000000..9f7a759 --- /dev/null +++ b/md/wedding/gallery/5.jpg diff --git a/md/wedding/gallery/6.jpg b/md/wedding/gallery/6.jpg Binary files differnew file mode 100644 index 0000000..d2a2d92 --- /dev/null +++ b/md/wedding/gallery/6.jpg diff --git a/md/wedding/gallery/7.jpg b/md/wedding/gallery/7.jpg Binary files differnew file mode 100644 index 0000000..e0a263b --- /dev/null +++ b/md/wedding/gallery/7.jpg diff --git a/md/wedding/gallery/8.jpg b/md/wedding/gallery/8.jpg Binary files differnew file mode 100644 index 0000000..22a22eb --- /dev/null +++ b/md/wedding/gallery/8.jpg diff --git a/md/wedding/gallery/9.jpg b/md/wedding/gallery/9.jpg Binary files differnew file mode 100644 index 0000000..5f9f6a0 --- /dev/null +++ b/md/wedding/gallery/9.jpg diff --git a/md/wedding/gallery/bg.jpg b/md/wedding/gallery/bg.jpg Binary files differnew file mode 100644 index 0000000..7b6eb98 --- /dev/null +++ b/md/wedding/gallery/bg.jpg diff --git a/md/wedding/index.md b/md/wedding/index.md index 43f6a3e..2546c8a 100644 --- a/md/wedding/index.md +++ b/md/wedding/index.md @@ -5,12 +5,13 @@ pagetitle: Welcome # Amy & Adam -## Join Us on *August 9th, 2019* -## as We Tie the Knot +## Join us on *August 9th, 2019* as we tie the knot! -### R.S.V.P. Here! +![The bride- and groom-to-be](bg.jpg) -Greetings, from the bride- and groom-to-be! If you received something in the mail from us then you are cordially invited to our wedding. +### RSVP Here! + +Greetings, from the bride- and groom-to-be! If you received something from us in the mail then you are cordially invited to our witness our union in marriage. If you're technologically savvy (you made it here!) then you may RSVP through the top of the page [or at this link](/rsvp). ### The Bridal Party @@ -36,7 +37,7 @@ Ea rerum eos illum amet. Dicta dolores est qui in ratione voluptas. Fugiat dolor Modi illo ex tempora ratione adipisci consequuntur. Commodi a aliquam eligendi. Laudantium similique voluptas labore cumque in dolorum dignissimos sapiente. -### Gift-Giving +### Registry Ad eaque delectus sint dolores ipsam sit rem alias. Dolores eos placeat velit harum aut. Et libero omnis adipisci soluta veniam consequatur neque. diff --git a/md/wedding/nav.html b/md/wedding/nav.html index e7fe364..6530dbb 100644 --- a/md/wedding/nav.html +++ b/md/wedding/nav.html @@ -4,8 +4,8 @@ <a href="/party">Bridal Party</a> <a href="/travel">Travel</a> <a href="/accomodations">Accomodations</a> - <a href="/doandeat">To-Do/To-Eat</a> + <a href="/doandeat">To Eat/To Do</a> <a href="/story">Our Story</a> <a href="/gallery">Gallery</a> - <a href="/gifts">Gifts</a> + <a href="/registry">Registry</a> </nav> diff --git a/md/wedding/party/bg.jpg b/md/wedding/party/bg.jpg Binary files differnew file mode 100644 index 0000000..87e26c9 --- /dev/null +++ b/md/wedding/party/bg.jpg diff --git a/md/wedding/party/index.md b/md/wedding/party/index.md index c95b957..d426a36 100644 --- a/md/wedding/party/index.md +++ b/md/wedding/party/index.md @@ -10,9 +10,9 @@ pagetitle: Bridal Party ### The Bridesmaids ![Annie Martinez](placeholder.jpg) -![Maggie Dolenski](placeholder.jpg) +![Maggie Gross](placeholder.jpg) -![Julia BLAAAARGH](placeholder.jpg) +![Julia Franquesa](placeholder.jpg) ### The Groomsmen diff --git a/md/wedding/background-old.jpg b/md/wedding/registry/bg.jpg Binary files differindex a7ce1d9..a7ce1d9 100644 --- a/md/wedding/background-old.jpg +++ b/md/wedding/registry/bg.jpg diff --git a/md/wedding/gifts/index.md b/md/wedding/registry/index.md index f4c1da4..27d398c 100644 --- a/md/wedding/gifts/index.md +++ b/md/wedding/registry/index.md @@ -1,9 +1,9 @@ --- -pagetitle: Gifts +pagetitle: Registry --- <article> -# Gifts +# Registry ## We Don't Have A Registry diff --git a/md/wedding/background.jpg b/md/wedding/rsvp/bg.jpg Binary files differindex 34684f6..34684f6 100644 --- a/md/wedding/background.jpg +++ b/md/wedding/rsvp/bg.jpg diff --git a/md/wedding/rsvp/index.md b/md/wedding/rsvp/index.md index ec8e4d9..a3094cd 100644 --- a/md/wedding/rsvp/index.md +++ b/md/wedding/rsvp/index.md @@ -5,18 +5,10 @@ pagetitle: RSVP # RSVP -## Please Respond! +## Répondez, s'il vous plaît -<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSevvnmHk0wNamQTEICBmRsovUQpqO500F-kxKd0U_uIXgj4Kw/viewform?embedded=true" width="640" height="905" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe> +This is a test paragraph right here. -Ad eaque delectus sint dolores ipsam sit rem alias. Dolores eos placeat velit harum aut. Et libero omnis adipisci soluta veniam consequatur neque. - -Ea rerum eos illum amet. Dicta dolores est qui in ratione voluptas. Fugiat dolorem distinctio fugiat quidem in dolor exercitationem et. Sed aut laudantium nisi mollitia eligendi. - -Modi illo ex tempora ratione adipisci consequuntur. Commodi a aliquam eligendi. Laudantium similique voluptas labore cumque in dolorum dignissimos sapiente. - -Non id totam officia adipisci officiis rerum ut assumenda. Molestias adipisci dignissimos sed nisi sed. Repellendus et id unde qui ex non. - -Dolorem debitis ea et assumenda enim. Hic eaque et non enim. Recusandae veniam minima fugiat est ullam minus eum similique. +<iframe src="https://docs.google.com/forms/d/e/1FAIpQLSevvnmHk0wNamQTEICBmRsovUQpqO500F-kxKd0U_uIXgj4Kw/viewform?embedded=true" width="640" height="1046" frameborder="0" marginheight="0" marginwidth="0">Loading...</iframe> </article> diff --git a/md/wedding/styles.css b/md/wedding/styles.css index 51c3e58..cf81d3f 100644 --- a/md/wedding/styles.css +++ b/md/wedding/styles.css @@ -6,47 +6,47 @@ :root { /* custom colors */ + --amy:#009999; } #topnav { top: 0; padding: 0; overflow: hidden; - background-color: rgba(0, 0, 0, 0.5); + background-color: white; text-align: center; position: fixed; width: 100%; + box-shadow: 0 0px 10px black; + } #topnav a { display: inline-block; text-align: center; - padding: 1em 1em; + padding: 0.5em 0.5em; text-decoration: none; - color: white; + color: var(--amy); transition: 0.5s; - font-family: 'Josefin Sans', sans-serif; - font-weight: 700; - font-style: bold; - font-size: 1em; + font-family: 'Arapey', serif; + font-weight: 400; + font-size: 1.5em; } #topnav a:hover { - color: teal; + color: var(--amy); } html { height: 100%; margin: 0; + padding: 0; } body { - height: 100%; - padding: 0; margin: 0; - font-size: 1.2em; - font-weight: 400; - font-family: 'Arapey', serif; + padding: 0; + height: 100%; background-repeat: no-repeat; background-position: center bottom; background-attachment: fixed; @@ -56,20 +56,17 @@ body { article { height: 100%; margin-top: 4em; - margin-left: 10%; - width: 80%; + padding: 0; } iframe { - height: 100%; width: 100%; - border: none; } figure { - margin: none; - padding: 1em; - background-color: white; + margin: 0; + padding: 0; + background-color: snow; box-shadow: 0 5px 5px black; } @@ -86,40 +83,31 @@ figure figcaption { font-family: 'Arapey', serif; } -hr { - color: white; - margin-left: 4em; - margin-right: 4em; - border-bottom: none; -} - p { + margin: 0; + padding: 0; text-align: justify; text-indent: 2em; font-weight: 400; - font-size: 0.9em; - background-color: white; - margin: 1em; - padding: 1em; - box-shadow: 3px 3px 3px black; + font-size: 1em; + font-family: 'Arapey', serif; } h1 { /* decorative page title */ - font-weight: 400; - font-size: 4em; - font-family: 'Homemade Apple', cursive; - text-align: right; - color: white; - text-shadow: 3px 3px 3px black; + font-weight: 700; + font-size: 5em; + /*font-family: 'Homemade Apple', cursive;*/ + font-family: 'Reenie Beanie', cursive; + text-align: center; + color: black; } h2 { /* decorative page subtitle */ - font-weight: 700; + font-weight: 400; font-size: 2em; - font-family: 'Josefin Sans', sans-serif; - text-align: right; - text-shadow: 3px 3px 3px black; - color: white; + font-family: 'Reenie Beanie', cursive; + text-align: center; + color: black; } h3 { /* section title */ @@ -128,7 +116,7 @@ h3 { /* section title */ font-family: 'Reenie Beanie', cursive; color: white; text-shadow: 3px 3px 3px black; - text-align: right; + text-align: center; margin: 1em; } diff --git a/md/wedding/travel/bg.jpg b/md/wedding/travel/bg.jpg Binary files differnew file mode 100644 index 0000000..a9912c1 --- /dev/null +++ b/md/wedding/travel/bg.jpg |