diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml index 73c35225..6dcd1a35 100644 --- a/app/config/sculpin_kernel.yml +++ b/app/config/sculpin_kernel.yml @@ -6,6 +6,7 @@ sculpin_content_types: projects: permalink: portfolio/:slug_title/ taxonomies: + - skills - tags talks: permalink: talks/:filename/ diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index 89346b01..ffce22f3 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -118,3 +118,14 @@ companies: title: CTI Digital website: https://www.ctidigital.com logo: cti-digital.png + +skills: + drupal: { title: Drupal, image: drupal.png } + drupal-commerce: { title: Drupal Commerce, image: drupal-commerce.png } + php: { title: PHP, image: php.png } + git: { title: Git, image: git.png } + svn: { title: Subversion, image: svn.jpg } + less: { title: Less, image: less.png } + sass: { title: Sass, image: sass.png } + compass: { title: Compass, image: compass.png } + jenkins: { title: Jenkins, image: jenkins.png } diff --git a/source/_includes/project-company.html.twig b/source/_includes/project-company.html.twig new file mode 100644 index 00000000..9259adfd --- /dev/null +++ b/source/_includes/project-company.html.twig @@ -0,0 +1,25 @@ +{% if page.company %} + {% set company = site.companies[page.company] %} + + +{% endif %} diff --git a/source/_includes/project-skills.html.twig b/source/_includes/project-skills.html.twig new file mode 100644 index 00000000..7d71c567 --- /dev/null +++ b/source/_includes/project-skills.html.twig @@ -0,0 +1,14 @@ +{% if page.skills %} +
+

Skills

+ + +
+{% endif %} diff --git a/source/_layouts/project.html.twig b/source/_layouts/project.html.twig index 6859cb47..a47b8ddc 100644 --- a/source/_layouts/project.html.twig +++ b/source/_layouts/project.html.twig @@ -25,29 +25,6 @@ {% endif %} - {% if page.company %} - {% set company = site.companies[page.company] %} - - - {% endif %} + {{ include('project-skills') }} + {{ include('project-company') }} {% endblock %} diff --git a/source/_projects/2009-abertawe-country-hotel-for-cats.md b/source/_projects/2009-abertawe-country-hotel-for-cats.md index e17e2a82..a20ad499 100644 --- a/source/_projects/2009-abertawe-country-hotel-for-cats.md +++ b/source/_projects/2009-abertawe-country-hotel-for-cats.md @@ -7,4 +7,5 @@ tags: image: cattery.png role: Freelance Developer freelance: true +skills: [drupal, php, jenkins] --- diff --git a/source/_projects/2010-horse-and-country.md b/source/_projects/2010-horse-and-country.md index b596d335..8592d800 100644 --- a/source/_projects/2010-horse-and-country.md +++ b/source/_projects/2010-horse-and-country.md @@ -7,4 +7,5 @@ tags: image: handc.png company: horse_country role: Developer +skills: [drupal, php, git] --- diff --git a/source/_projects/2011-avon-motorsport.md b/source/_projects/2011-avon-motorsport.md index 1faaeb3f..f6bfae5f 100644 --- a/source/_projects/2011-avon-motorsport.md +++ b/source/_projects/2011-avon-motorsport.md @@ -7,4 +7,5 @@ tags: image: avon-motorsport.png company: proctors role: Developer +skills: [drupal, php, less, svn] --- diff --git a/source/_projects/2011-rathbone-greenbank.md b/source/_projects/2011-rathbone-greenbank.md index 17323923..212b9196 100644 --- a/source/_projects/2011-rathbone-greenbank.md +++ b/source/_projects/2011-rathbone-greenbank.md @@ -8,4 +8,5 @@ image: rathbone-greenbank.png company: proctors slug: rathbone-greenbank role: Developer +skills: [drupal, php, less, svn] --- diff --git a/source/_projects/2011-source-for-searches.md b/source/_projects/2011-source-for-searches.md index 014b556b..0bd69fce 100644 --- a/source/_projects/2011-source-for-searches.md +++ b/source/_projects/2011-source-for-searches.md @@ -8,4 +8,5 @@ tags: image: source-for-searches.png company: proctors role: Developer +skills: [drupal, php, less, svn] --- diff --git a/source/_projects/2011-wlsquared.md b/source/_projects/2011-wlsquared.md index 94bfb78b..93ae36e2 100644 --- a/source/_projects/2011-wlsquared.md +++ b/source/_projects/2011-wlsquared.md @@ -7,4 +7,5 @@ tags: image: wlsquared.png role: Freelance Developer freelance: true +skills: [drupal, php, git] --- diff --git a/source/_projects/2012-accessible-bristol.md b/source/_projects/2012-accessible-bristol.md index 3711f04a..a7ff2c6b 100644 --- a/source/_projects/2012-accessible-bristol.md +++ b/source/_projects/2012-accessible-bristol.md @@ -8,4 +8,5 @@ tags: image: accessible-bristol.png role: Freelance Developer freelance: true +skills: [drupal, php, less, git] --- diff --git a/source/_projects/2012-aspira.md b/source/_projects/2012-aspira.md index ead46dec..70e57f08 100644 --- a/source/_projects/2012-aspira.md +++ b/source/_projects/2012-aspira.md @@ -7,4 +7,5 @@ tags: image: aspira.png company: proctors role: Developer +skills: [drupal, php, svn] --- diff --git a/source/_projects/2012-daylight-photo-awards.md b/source/_projects/2012-daylight-photo-awards.md index 19df449e..03f912f2 100644 --- a/source/_projects/2012-daylight-photo-awards.md +++ b/source/_projects/2012-daylight-photo-awards.md @@ -8,4 +8,5 @@ tags: image: daylight-photo-awards.png role: Freelance Developer freelance: true +skills: [drupal, drupal-commerce, git, sass, compass, jenkins] --- diff --git a/source/_projects/2012-digital-theatre-plus.md b/source/_projects/2012-digital-theatre-plus.md index 1788cff4..c1462334 100644 --- a/source/_projects/2012-digital-theatre-plus.md +++ b/source/_projects/2012-digital-theatre-plus.md @@ -8,4 +8,5 @@ tags: image: digital-theatre-plus.png company: nomensa role: Developer +skills: [drupal, php] --- diff --git a/source/_projects/2012-door-decor-and-more.md b/source/_projects/2012-door-decor-and-more.md index 4ddaab5f..9beb0a76 100644 --- a/source/_projects/2012-door-decor-and-more.md +++ b/source/_projects/2012-door-decor-and-more.md @@ -9,4 +9,5 @@ image: door-decor-more.png company: zooba role: Freelance Developer freelance: true +skills: [drupal, drupal-commerce, php, git] --- diff --git a/source/_projects/2012-vikisports.md b/source/_projects/2012-vikisports.md index e0ef5a22..c8e6f8eb 100644 --- a/source/_projects/2012-vikisports.md +++ b/source/_projects/2012-vikisports.md @@ -7,4 +7,5 @@ tags: image: vikisports.png role: Freelance Developer freelance: true +skills: [drupal, php, git, jenkins] --- diff --git a/source/_projects/2013-hutch-paving.md b/source/_projects/2013-hutch-paving.md index 327dcddb..1a0cdf18 100644 --- a/source/_projects/2013-hutch-paving.md +++ b/source/_projects/2013-hutch-paving.md @@ -7,4 +7,5 @@ image: hutch-paving.png role: Freelance Developer company: trent freelance: true +skills: [drupal, php] --- diff --git a/source/_projects/2013-ifoa.md b/source/_projects/2013-ifoa.md index 7ad96007..39912606 100644 --- a/source/_projects/2013-ifoa.md +++ b/source/_projects/2013-ifoa.md @@ -8,4 +8,5 @@ image: ifoa.png company: precedent role: Lead Developer slug: ifoa +skills: [drupal, php, git] --- diff --git a/source/_projects/2013-mfvc.md b/source/_projects/2013-mfvc.md index 6d2a7611..13374880 100644 --- a/source/_projects/2013-mfvc.md +++ b/source/_projects/2013-mfvc.md @@ -8,4 +8,5 @@ image: mfvc.png slug_title: my-favourite-voucher-codes role: Freelance Developer freelance: true +skills: [drupal, php, git] --- diff --git a/source/_projects/2013-watts-tvc.md b/source/_projects/2013-watts-tvc.md index fe5b98c4..dc60071d 100644 --- a/source/_projects/2013-watts-tvc.md +++ b/source/_projects/2013-watts-tvc.md @@ -8,4 +8,5 @@ image: wattstvc.png company: lab_class role: Freelance Developer freelance: true +skills: [drupal, php, git, sass, compass] --- diff --git a/source/_projects/2014-drupalorg.md b/source/_projects/2014-drupalorg.md index bed16593..dbed6c5e 100644 --- a/source/_projects/2014-drupalorg.md +++ b/source/_projects/2014-drupalorg.md @@ -7,4 +7,5 @@ tags: image: drupalorg.png company: drupal_association role: Drupal.org Developer +skills: [drupal, php, git, sass, compass, jenkins] --- diff --git a/source/_projects/2015-roadcc.md b/source/_projects/2015-roadcc.md index 7dfa0458..7b44c6fb 100644 --- a/source/_projects/2015-roadcc.md +++ b/source/_projects/2015-roadcc.md @@ -7,4 +7,5 @@ tags: image: roadcc.png company: microserve role: Lead Developer +skills: [drupal, php, git, less] --- diff --git a/source/assets/images/skills/compass.png b/source/assets/images/skills/compass.png new file mode 100644 index 00000000..2aece0af Binary files /dev/null and b/source/assets/images/skills/compass.png differ diff --git a/source/assets/images/skills/drupal-commerce.png b/source/assets/images/skills/drupal-commerce.png new file mode 100644 index 00000000..597efc91 Binary files /dev/null and b/source/assets/images/skills/drupal-commerce.png differ diff --git a/source/assets/images/skills/drupal.png b/source/assets/images/skills/drupal.png new file mode 100644 index 00000000..96d9ab60 Binary files /dev/null and b/source/assets/images/skills/drupal.png differ diff --git a/source/assets/images/skills/git.png b/source/assets/images/skills/git.png new file mode 100644 index 00000000..3888ded2 Binary files /dev/null and b/source/assets/images/skills/git.png differ diff --git a/source/assets/images/skills/jenkins.png b/source/assets/images/skills/jenkins.png new file mode 100644 index 00000000..5473a63a Binary files /dev/null and b/source/assets/images/skills/jenkins.png differ diff --git a/source/assets/images/skills/less.png b/source/assets/images/skills/less.png new file mode 100644 index 00000000..1a739b3e Binary files /dev/null and b/source/assets/images/skills/less.png differ diff --git a/source/assets/images/skills/php.png b/source/assets/images/skills/php.png new file mode 100644 index 00000000..2412c68e Binary files /dev/null and b/source/assets/images/skills/php.png differ diff --git a/source/assets/images/skills/sass.png b/source/assets/images/skills/sass.png new file mode 100644 index 00000000..ac21f231 Binary files /dev/null and b/source/assets/images/skills/sass.png differ diff --git a/source/assets/images/skills/svn.jpg b/source/assets/images/skills/svn.jpg new file mode 100644 index 00000000..b3389531 Binary files /dev/null and b/source/assets/images/skills/svn.jpg differ diff --git a/styles/_portfolio.scss b/styles/_portfolio.scss index 5e9937a0..eb5abfb6 100644 --- a/styles/_portfolio.scss +++ b/styles/_portfolio.scss @@ -1,3 +1,20 @@ +.project--skills { + ul { + list-style: none; + margin-left: 0; + padding-left: 0; + } + + li { + display: inline-block; + margin-right: 5px; + } + + img { + max-height: 30px; + } +} + .project--company__has-logo { a:link, a:hover {