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 0000000..032b941 Binary files /dev/null and b/www/themes/jason-williamsca/assets/images/favicon-16x16.png differ diff --git a/www/themes/jason-williamsca/assets/images/favicon-32x32.png b/www/themes/jason-williamsca/assets/images/favicon-32x32.png new file mode 100644 index 0000000..908712b Binary files /dev/null and b/www/themes/jason-williamsca/assets/images/favicon-32x32.png differ diff --git a/www/themes/jason-williamsca/assets/images/jwlogo.png b/www/themes/jason-williamsca/assets/images/jwlogo.png deleted file mode 100644 index fc0db3b..0000000 Binary files a/www/themes/jason-williamsca/assets/images/jwlogo.png and /dev/null differ 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