From cc791c8e2010ae7e8a5348a0248494b6e6f57a37 Mon Sep 17 00:00:00 2001 From: JayWll Date: Mon, 18 May 2020 11:49:56 -0600 Subject: [PATCH] Various Changes - Implemented contact-me form - Added social icons using font-awesome - Changed font - Added favicon - Changed site logo from png to svg --- .../jason-williamsca/assets/css/theme.css | 76 +++++++++++++++--- .../assets/images/favicon-16x16.png | Bin 0 -> 371 bytes .../assets/images/favicon-32x32.png | Bin 0 -> 976 bytes .../jason-williamsca/assets/images/jwlogo.png | Bin 3078 -> 0 bytes .../jason-williamsca/assets/images/jwlogo.svg | 35 ++++++++ .../assets/javascript/tooltips.js | 3 + .../jason-williamsca/layouts/default.htm | 9 ++- www/themes/jason-williamsca/pages/contact.htm | 41 +++++++++- www/themes/jason-williamsca/pages/welcome.htm | 7 +- .../partials/contactform/default.htm | 38 +++++++++ .../jason-williamsca/partials/social.htm | 47 +++++++++++ 11 files changed, 241 insertions(+), 15 deletions(-) create mode 100644 www/themes/jason-williamsca/assets/images/favicon-16x16.png create mode 100644 www/themes/jason-williamsca/assets/images/favicon-32x32.png delete mode 100644 www/themes/jason-williamsca/assets/images/jwlogo.png create mode 100644 www/themes/jason-williamsca/assets/images/jwlogo.svg create mode 100644 www/themes/jason-williamsca/assets/javascript/tooltips.js create mode 100644 www/themes/jason-williamsca/partials/contactform/default.htm create mode 100644 www/themes/jason-williamsca/partials/social.htm diff --git a/www/themes/jason-williamsca/assets/css/theme.css b/www/themes/jason-williamsca/assets/css/theme.css index e1e1da6..ec55023 100644 --- a/www/themes/jason-williamsca/assets/css/theme.css +++ b/www/themes/jason-williamsca/assets/css/theme.css @@ -1,9 +1,20 @@ +:root { + --main-bg-color: #E7D9D1; /*#F0E4D1; #E8D5B5; #e7d9d1;*/ + --main-accent-color: #302b44; + --light-accent-color: #686283; + --alt-accent-color: #B05C71; /*#990F3D;*/ + --dark-alt-accent-color: #913A50; + --title-font: 'Cinzel', serif; + --body-font: 'Raleway', sans-serif; +} + html, body { height: 100%; } body { - background-color: #ccfff3; - font-family: roboto,sans-serif; - color: #302b44; + background-color: var(--main-bg-color); + font-family: var(--body-font); + font-weight: 500; + color: var(--main-accent-color); } #page-content { @@ -12,11 +23,11 @@ body { footer { flex-shrink: 0; - background-color: #302b44; + background-color: var(--main-accent-color); } footer p, footer ul li { - color: #686283; + color: var(--light-accent-color); font-size: 0.8rem; } @@ -25,6 +36,10 @@ footer ul { padding-left: 20px; } +h1, h2, h3, h4 { + font-weight: 500; +} + .container-fluid { padding-left: 5%; padding-right: 5%; @@ -38,9 +53,52 @@ footer ul { .navbar-brand { height: 75px; padding-left: 100px; - font-family: cinzel,serif; + font-family: var(--title-font); font-size: 2.5rem; - background-image: url('../images/jwlogo.png'); + background-image: url('../images/jwlogo.svg'); background-repeat: no-repeat; - color: #302b44; -} \ No newline at end of file + color: var(--main-accent-color); +} + +.navbar-light .navbar-nav .nav-link { + text-decoration: none; +} + +.navbar-light .navbar-nav .nav-link:hover { + color: var(--alt-accent-color); +} + +.social-icons { + font-size: 0; +} + +.social-icons a { + display: inline-block; + height: 3.5rem; + width: 3.5rem; + background-color: var(--main-accent-color); + color: var(--main-bg-color); + text-align: center; + font-size: 1.5rem; + line-height: 3.5rem; + margin-right: 0.25rem; + margin-bottom: 0.25rem; +} + +.social-icons a:last-child { + margin-right: 0; +} + +.social-icons a:hover { + background-color: var(--dark-alt-accent-color); + color: #fff; +} + +a { + color: var(--alt-accent-color); + text-decoration: underline; +} + +a:hover { + color: var(--dark-alt-accent-color); + text-decoration: none; \ No newline at end of file diff --git a/www/themes/jason-williamsca/assets/images/favicon-16x16.png b/www/themes/jason-williamsca/assets/images/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..032b9413bc9aec9f7f3064441dbc9f6797e68134 GIT binary patch literal 371 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 U|E-GfN&o-=07*qoM6N<$g80hW@&Et; diff --git a/www/themes/jason-williamsca/assets/images/jwlogo.svg b/www/themes/jason-williamsca/assets/images/jwlogo.svg new file mode 100644 index 0000000..9676658 --- /dev/null +++ b/www/themes/jason-williamsca/assets/images/jwlogo.svg @@ -0,0 +1,35 @@ + + + + + + + image/svg+xml + + + + + + + + + diff --git a/www/themes/jason-williamsca/assets/javascript/tooltips.js b/www/themes/jason-williamsca/assets/javascript/tooltips.js new file mode 100644 index 0000000..7fee50f --- /dev/null +++ b/www/themes/jason-williamsca/assets/javascript/tooltips.js @@ -0,0 +1,3 @@ +$(() => { + $('[data-toggle="tooltip"]').tooltip() +}); \ No newline at end of file diff --git a/www/themes/jason-williamsca/layouts/default.htm b/www/themes/jason-williamsca/layouts/default.htm index 7a42c52..1d10005 100644 --- a/www/themes/jason-williamsca/layouts/default.htm +++ b/www/themes/jason-williamsca/layouts/default.htm @@ -12,9 +12,11 @@ description = "Default Layout" - + - Hello, world! + + + {{ this.page.title }} - Ja.son-Williams.ca
@@ -44,7 +46,7 @@ description = "Default Layout"
  • Contact Me
    • {% component 'CurrentInfo' %} -

    Made with 💖 in #YYC

    +

    Made with in #YYC

    Recent Projects

    @@ -58,6 +60,7 @@ description = "Default Layout" + {% framework extras %} {% scripts %} diff --git a/www/themes/jason-williamsca/pages/contact.htm b/www/themes/jason-williamsca/pages/contact.htm index 2a53c02..f7b0777 100644 --- a/www/themes/jason-williamsca/pages/contact.htm +++ b/www/themes/jason-williamsca/pages/contact.htm @@ -2,5 +2,44 @@ title = "Contact Me" url = "/contact" layout = "default" is_hidden = 0 + +[emptyForm contactform] +group = "Contact Me" +rules[name] = "required" +rules[email] = "required|email" +rules[message] = "required" +messages_success = "Your form was successfully submitted" +messages_errors = "There were errors with your submission" +mail_enabled = 1 +mail_subject = "Contact Me" +mail_recipients[] = "j@son-williams.ca" +mail_replyto = "email" +inline_errors = "disabled" +sanitize_data = "disabled" +anonymize_ip = "disabled" +recaptcha_enabled = 1 +recaptcha_theme = "light" +recaptcha_type = "image" +recaptcha_size = "invisible" +emails_date_format = "Y-m-d" == -

    Contact Me

    \ No newline at end of file +
    +
    +

    Contact Me

    +

    The simplest and quickest way to contact me is by completing the form below.

    + {% component 'contactform' %} +
    +
    +

    Old School

    +

    Sometimes the more traditional ways of getting in touch are just better...

    +

    IMG

    +

    4th Floor, 1207 11 Ave SW,
    + Calgary, AB, T3C 0M5
    + Canada

    +

    (587) 288-8242

    + +

    New Cool

    +

    ...and sometimes it's better to keep up with the times.

    + {% partial 'social' nocode = true nocontact = true %} +
    +
    \ No newline at end of file diff --git a/www/themes/jason-williamsca/pages/welcome.htm b/www/themes/jason-williamsca/pages/welcome.htm index bf1a218..c2243f5 100644 --- a/www/themes/jason-williamsca/pages/welcome.htm +++ b/www/themes/jason-williamsca/pages/welcome.htm @@ -7,8 +7,11 @@ is_hidden = 0

    Welcome

    Welcome to Ja.son-Williams.ca, the little home on the web of – surprise, surprise – Jason Williams.

    -

    Jay is a caucasian male originally from Swansea, UK but last spotted in Calgary, Canada. By day he's a mild-mannered bank employee and by night he's... uh... asleep, mostly.

    -

    He doesn't kepp very much stuff here, but to browse around please make a selection from the menu at the top right of the page.

    +

    Jay is a caucasian male originally from Swansea, UK but last spotted in Calgary, Canada. By day he's a mild-mannered bank employee and by night he's... uh... asleep, mostly.

    +

    He doesn't keep very much stuff here, but to browse around please make a selection from the menu at the top right of the page.

    + +

    Available Everywhere

    + {% partial 'social' %}

    Feed

    diff --git a/www/themes/jason-williamsca/partials/contactform/default.htm b/www/themes/jason-williamsca/partials/contactform/default.htm new file mode 100644 index 0000000..9a4171f --- /dev/null +++ b/www/themes/jason-williamsca/partials/contactform/default.htm @@ -0,0 +1,38 @@ +description = "Contact Me Form" +== +
    + + {{ form_token() }} + +
    + +
    + + +
    + +
    + + +
    + + + +
    + + +
    + +
    + {% partial '@recaptcha' %} +
    + + + + +
    \ No newline at end of file diff --git a/www/themes/jason-williamsca/partials/social.htm b/www/themes/jason-williamsca/partials/social.htm new file mode 100644 index 0000000..62c25a4 --- /dev/null +++ b/www/themes/jason-williamsca/partials/social.htm @@ -0,0 +1,47 @@ +description = "Social Media Links" +== +addJs('assets/javascript/tooltips.js'); +} +?> +== + \ No newline at end of file