opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into talks

Browse source
This commit is contained in:
Oliver Davies 2015-09-09 22:16:04 +01:00
parent ca4e1de605 3d45150c29
commit 0edd19efa1
4 changed files with 88 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/config/sculpin_site.yml
View file

@ -56,6 +56,7 @@ default_date_format: jS F, Y
fuzzy_date_format: F Y
title_separator: "|"
html_lang: en-GB
bootswatch: lumen
availability:
status:

1
sculpin.json
View file

@ -3,6 +3,7 @@
"components/bootstrap": "~2.3.1",
"components/highlightjs": "~7.3.0",
"components/jquery": "~1.9.1",
"thomaspark/bootswatch": "@dev",
"tsphethean/sculpin-related-posts-bundle": "~0.1.0"
},
"config": {

102
sculpin.lock
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "c1a9ae4e8c31d83d7b43e6ad0161e602",
"hash": "bfddc03ede664e6abc3827244340aba6",
"packages": [
{
"name": "components/bootstrap",
@ -153,35 +153,39 @@
},
{
"name": "kriswallsmith/assetic",
"version": "v1.2.1",
"version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/kriswallsmith/assetic.git",
"reference": "b20efe38845d20458702f97f3ff625d80805897b"
"reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/b20efe38845d20458702f97f3ff625d80805897b",
"reference": "b20efe38845d20458702f97f3ff625d80805897b",
"url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/56cb5d6dec9e7a68a4da2fa89844f39d41092f31",
"reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31",
"shasum": ""
},
"require": {
"php": ">=5.3.1",
"symfony/process": "~2.1"
},
"conflict": {
"twig/twig": "<1.12"
},
"require-dev": {
"cssmin/cssmin": "*",
"joliclic/javascript-packer": "*",
"kamicane/packager": "*",
"leafo/lessphp": "*",
"leafo/scssphp": "*",
"leafo/scssphp-compass": "*",
"leafo/lessphp": "^0.3.7",
"leafo/scssphp": "*@dev",
"leafo/scssphp-compass": "*@dev",
"mrclay/minify": "*",
"patchwork/jsqueeze": "~1.0",
"phpunit/phpunit": "~4",
"patchwork/jsqueeze": "~1.0|~2.0",
"phpunit/phpunit": "~4.8",
"psr/log": "~1.0",
"ptachoire/cssembed": "*",
"twig/twig": "~1.6"
"symfony/phpunit-bridge": "~2.7",
"twig/twig": "~1.8|~2.0"
},
"suggest": {
"leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
@ -194,7 +198,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2-dev"
"dev-master": "1.3-dev"
}
},
"autoload": {
@ -223,20 +227,20 @@
"compression",
"minification"
],
"time": "2014-12-12 05:04:05"
"time": "2015-08-31 19:07:16"
},
{
"name": "robloach/component-installer",
"version": "0.2.2",
"version": "0.2.3",
"source": {
"type": "git",
"url": "https://github.com/RobLoach/component-installer.git",
"reference": "0553c9bbf60fa1623594d125e8425edd9e8ecce3"
"reference": "908a859aa7c4949ba9ad67091e67bac10b66d3d7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/RobLoach/component-installer/zipball/0553c9bbf60fa1623594d125e8425edd9e8ecce3",
"reference": "0553c9bbf60fa1623594d125e8425edd9e8ecce3",
"url": "https://api.github.com/repos/RobLoach/component-installer/zipball/908a859aa7c4949ba9ad67091e67bac10b66d3d7",
"reference": "908a859aa7c4949ba9ad67091e67bac10b66d3d7",
"shasum": ""
},
"require": {
@ -271,7 +275,65 @@
}
],
"description": "Allows installation of Components via Composer.",
"time": "2015-08-07 13:12:01"
"time": "2015-08-10 12:35:38"
},
{
"name": "thomaspark/bootswatch",
"version": "v3.3.5+3",
"source": {
"type": "git",
"url": "https://github.com/thomaspark/bootswatch.git",
"reference": "913f54b9483b99fa12c7feccfa18ee5cc0206043"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thomaspark/bootswatch/zipball/913f54b9483b99fa12c7feccfa18ee5cc0206043",
"reference": "913f54b9483b99fa12c7feccfa18ee5cc0206043",
"shasum": ""
},
"suggest": {
"robloach/component-installer": "Allows installation of Components via Composer"
},
"type": "component",
"extra": {
"component": {
"name": "bootswatch",
"files": [
"README.md",
"LICENSE",
"amelia/*",
"cerulean/*",
"cosmo/*",
"cyborg/*",
"darkly/*",
"flatly/*",
"fonts/*",
"journal/*",
"lumen/*",
"paper/*",
"readable/*",
"sandstone/*",
"simplex/*",
"slate/*",
"spacelab/*",
"superhero/*",
"united/*",
"yeti/*"
]
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "thomaspark",
"email": "thomas@bootswatch.com"
}
],
"description": "Themes for Bootstrap",
"time": "2015-09-03 20:39:50"
},
{
"name": "tsphethean/sculpin-related-posts-bundle",
@ -322,7 +384,9 @@
"packages-dev": [],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": [],
"stability-flags": {
"thomaspark/bootswatch": 20
},
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],

5
source/themes/opdavies/oliverdavies/_layouts/default.html.twig
View file

@ -18,6 +18,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{{ site.url }}/{{ theme_path('css/styles.css') }}">
<link rel="stylesheet" href="{{ site.url }}/components/bootswatch/{{ site.bootswatch }}/bootstrap.min.css">
<link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css">
{% for size in site.apple_touch_icon_sizes %}
@ -29,7 +30,7 @@
{% endfor %}
</head>
<body class="{% block body_classes %}{% endblock %}">
<nav class="navbar navbar-inverse navbar-fixed-top">
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
@ -42,7 +43,7 @@
</div>
<div id="navbar" class="collapse navbar-collapse" role="navigation">
<ul class="nav navbar-nav navbar-right">
<ul class="nav navbar-nav">
{% for link in site.main_menu %}
<li class="nav__{{ link.title|lower }}{% if page.url ~ '/' == link.href %} active{% endif %}"><a href="{{ link.href }}">{{ link.title }}</a></li>
{% endfor %}