From ef2672d00403df1614e3022192461c9823edbbed Mon Sep 17 00:00:00 2001 From: Oliver Stapleton Date: Sun, 10 Aug 2014 13:33:24 +0200 Subject: [PATCH 1/5] Set various variables for easier customization Address and more social media names can now be set in the config file, date at bottom of site is set automatically. --- _config.yml | 18 +++++++++++++-- _includes/footer.html | 54 ++++++++++++++++++++++++++++++++++++------- _layouts/default.html | 10 -------- index.html | 2 +- 4 files changed, 63 insertions(+), 21 deletions(-) diff --git a/_config.yml b/_config.yml index f356250..323b403 100644 --- a/_config.yml +++ b/_config.yml @@ -2,8 +2,22 @@ title: Your awesome title email: your-email@domain.com description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description." -twitter_username: jekyllrb -github_username: jekyll + +# Social media usernames +twitter: jekyllrb +facebook: +google-plus: +linkedin: +dribbble: +flickr: +bitbucket: jekyll +github: jekyll + +# Postal address +address-line1: 3481 Melrose Place +address-line2: Beverly Hills, CA 90210 +address-line3: +address-line4: # Build settings markdown: kramdown diff --git a/_includes/footer.html b/_includes/footer.html index ff45e7f..9661099 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -5,30 +5,68 @@

Location

-

3481 Melrose Place
Beverly Hills, CA 90210

+

+ {% if site.address-line1 %} + {{ site.address-line1 }} + {% endif %} + {% if site.address-line2 %} +
{{ site.address-line2 }} + {% endif %} + {% if site.address-line3 %} +
{{ site.address-line3 }} + {% endif %} + {% if site.address-line4 %} +
{{ site.address-line4 }} + {% endif %} +

Around the Web

    + {% if site.facebook %}
  • - +
    • + {% endif %} + {% if site.google-plus %}
  • - +
    • + {% endif %} + {% if site.twitter %}
  • - +
    • + {% endif %} + {% if site.linkedin %}
  • - +
    • + {% endif %} + {% if site.dribbble %}
  • - +
    • + {% endif %} + {% if site.flickr %} +
  • + +
    • + {% endif %} + {% if site.bitbucket %} +
  • + +
    • + {% endif %} + {% if site.github %} +
  • + +
    • + {% endif %}
-

About Freelancer

+

Credits

Freelance is a free to use, open source Bootstrap theme created by Start Bootstrap.

@@ -38,7 +76,7 @@
- Copyright © Your Website 2014 + Copyright © 20{{ site.time | date: '%y' }}
diff --git a/_layouts/default.html b/_layouts/default.html index 4ded93b..b8e225c 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -9,16 +9,6 @@ {% include portfolio_grid.html %} {% include about.html %} {% include contact.html %} - - - - {% include footer.html %} {% include modals.html %} {% include js.html %} diff --git a/index.html b/index.html index 62a0273..a9f5097 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ layout: default
-

Postsss

+

Posts

diff --git a/_includes/main.css b/_includes/main.css index 3e6b5a4..20d6cb4 100644 --- a/_includes/main.css +++ b/_includes/main.css @@ -22,7 +22,7 @@ a:focus, a:active, a.active { outline: 0; - color: #{{ site.primary }}; + color: #{{ site.color.primary }}; } h1, @@ -63,15 +63,15 @@ hr.star-light { hr.star-light:after { color: #fff; - background-color: #{{ site.primary }}; + background-color: #{{ site.color.primary }}; } hr.star-primary { - border-color: #{{ site.secondary-light }}; + border-color: #{{ site.color.secondary }}; } hr.star-primary:after { - color: #{{ site.secondary-light }}; + color: #{{ site.color.secondary }}; background-color: #fff; } @@ -82,7 +82,7 @@ hr.star-primary:after { header { text-align: center; color: #fff; - background: #{{ site.primary }}; + background: #{{ site.color.primary }}; } header .container { @@ -181,7 +181,7 @@ section h2 { section.success { color: #fff; - background: #{{ site.primary }}; + background: #{{ site.color.primary }}; } @media(max-width:767px) { @@ -265,7 +265,7 @@ section.success { .btn-outline:active, .btn-outline.active { border: solid 2px #fff; - color: #{{ site.primary }}; + color: #{{ site.color.primary }}; background: #fff; } @@ -318,7 +318,7 @@ section.success { } .floating-label-form-group-with-focus label { - color: #{{ site.primary }}; + color: #{{ site.color.primary }}; } form .row:first-child .floating-label-form-group { @@ -335,7 +335,7 @@ footer h3 { footer .footer-above { padding-top: 50px; - background-color: #{{ site.secondary-light }}; + background-color: #{{ site.color.secondary }}; } footer .footer-col { @@ -344,7 +344,7 @@ footer .footer-col { footer .footer-below { padding: 25px 0; - background-color: #{{ site.secondary }}; + background-color: #{{ site.color.secondary-dark }}; } .btn-social { @@ -428,7 +428,7 @@ footer .footer-below { width: 1px; height: 75px; margin-left: 35px; - background-color: #{{ site.secondary-light }}; + background-color: #{{ site.color.secondary }}; -webkit-transform: rotate(45deg); -ms-transform: rotate(45deg); transform: rotate(45deg); @@ -438,7 +438,7 @@ footer .footer-below { z-index: 1052; width: 1px; height: 75px; - background-color: #{{ site.secondary-light }}; + background-color: #{{ site.color.secondary }}; -webkit-transform: rotate(90deg); -ms-transform: rotate(90deg); transform: rotate(90deg); diff --git a/_layouts/default.html b/_layouts/default.html index 3ef805f..b6ab968 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,8 +3,7 @@ {% include head.html %} - - + {% include header.html %} From e325892acbab1edfb470c1bd58becf72acc04425 Mon Sep 17 00:00:00 2001 From: Oliver Stapleton Date: Mon, 11 Aug 2014 11:19:28 +0200 Subject: [PATCH 4/5] Removed some content from the config file Reverts of my earlier changes, content should not be stored in configuration. --- _config.yml | 18 ++++++------------ _includes/about.html | 4 ++-- _includes/footer.html | 2 +- _includes/header.html | 4 ++-- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/_config.yml b/_config.yml index 6225d48..3e4841c 100644 --- a/_config.yml +++ b/_config.yml @@ -1,16 +1,6 @@ # Site settings title: Freelancer -header: -tagline: Web Developer - Graphic Artist - User Experience Designer - -about-left: Freelancer is a free bootstrap theme created by Start Bootstrap. The download includes the complete source files including HTML, CSS, and JavaScript as well as optional LESS stylesheets for easy customization. - -about-right: Whether you're a student looking to showcase your work, a professional looking to attract clients, or a graphic artist looking to share your projects, this template is the perfect starting point! - -credits: Freelance is a free to use, open source Bootstrap theme created by Start Bootstrap. - email: your-email@domain.com - description: "Write an awesome description for your new site here. You can edit this line in _config.yml. It will appear in your document head meta (for Google search results) and in your feed.xml site description." # Color settings (hex-codes without the leading hash-tag) @@ -19,16 +9,20 @@ color: secondary: 2c3e50 #FD6E8A secondary-dark: 233140 #A2122F -# Social mnetworks usernames (many more available: facebook, flickr, google-plus, dribbble, pinterest, instagram, tumblr, etc.) +# Social networks usernames (many more available: google-plus, flickr, dribbble, pinterest, instagram, tumblr, linkedin, etc.) social: - title: twitter url: http://twitter.com/jekyllrb + - title: facebook + url: + - title: stack-overflow + url: http://stackoverflow.com/questions/tagged/jekyll - title: bitbucket url: http://bitbucket.org/jekyll - title: github url: http://github.com/jekyll -# Postal address +# Postal address (add as many lines as necessary) address: - line: 3481 Melrose Place - line: Beverly Hills, CA 90210 diff --git a/_includes/about.html b/_includes/about.html index 9a14f91..3e21ec4 100644 --- a/_includes/about.html +++ b/_includes/about.html @@ -9,10 +9,10 @@
-

{{ site.about-left }}

+

Freelancer is a free bootstrap theme created by Start Bootstrap. The download includes the complete source files including HTML, CSS, and JavaScript as well as optional LESS stylesheets for easy customization.

-

{{ site.about-right }}

+

Whether you're a student looking to showcase your work, a professional looking to attract clients, or a graphic artist looking to share your projects, this template is the perfect starting point!

diff --git a/_includes/footer.html b/_includes/footer.html index c012d0e..be94f24 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -23,7 +23,7 @@

Credits

-

{{ site.credits }}

+

Freelance is a free to use, open source Bootstrap theme created by Start Bootstrap.

diff --git a/_includes/header.html b/_includes/header.html index 6a16325..a768e19 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -41,9 +41,9 @@
- {% if site.header %}{{ site.header }}{% else %}{{ site.title }}{% endif %} + {{ site.title }}
- {{ site.tagline }} + Web Developer - Graphic Artist - User Experience Designer
From 3c5db6069e4efc6214e50ee7d0b53288876a1356 Mon Sep 17 00:00:00 2001 From: Oliver Stapleton Date: Mon, 11 Aug 2014 12:04:41 +0200 Subject: [PATCH 5/5] Some corrections --- _includes/{ => css}/bootstrap.min.css | 0 _includes/{ => css}/main.css | 0 _includes/footer.html | 2 +- _layouts/style.css | 4 ++-- style.css | 3 +-- 5 files changed, 4 insertions(+), 5 deletions(-) rename _includes/{ => css}/bootstrap.min.css (100%) rename _includes/{ => css}/main.css (100%) diff --git a/_includes/bootstrap.min.css b/_includes/css/bootstrap.min.css similarity index 100% rename from _includes/bootstrap.min.css rename to _includes/css/bootstrap.min.css diff --git a/_includes/main.css b/_includes/css/main.css similarity index 100% rename from _includes/main.css rename to _includes/css/main.css diff --git a/_includes/footer.html b/_includes/footer.html index be94f24..1e30c7f 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -32,7 +32,7 @@
- Copyright © 20{{ site.time | date: '%y' }} + Copyright © {{ site.title }} 20{{ site.time | date: '%y' }}
diff --git a/_layouts/style.css b/_layouts/style.css index 0ac3b37..cbedf02 100644 --- a/_layouts/style.css +++ b/_layouts/style.css @@ -1,2 +1,2 @@ -{% include bootstrap.min.css %} -{% include main.css %} \ No newline at end of file +{% include css/bootstrap.min.css %} +{% include css/main.css %} \ No newline at end of file diff --git a/style.css b/style.css index f37aa59..106279b 100644 --- a/style.css +++ b/style.css @@ -1,4 +1,3 @@ --- layout: style ---- - +--- \ No newline at end of file