Merge branch 'master' into talks
This commit is contained in:
commit
bd1c285366
34 changed files with 73 additions and 57 deletions
|
|
@ -27,11 +27,11 @@
|
|||
{% if og.image %}
|
||||
<meta name="twitter:card" content="summary_large_image"/>
|
||||
<meta name="twitter:image:src" content="{{ og.image.url }}">
|
||||
<meta name="twitter:creator" content="@opdavies"/>
|
||||
<meta name="twitter:creator" content="@{{ site.twitter.name }}"/>
|
||||
{% else %}
|
||||
<meta name="twitter:card" content="summary"/>
|
||||
{% endif %}
|
||||
<meta name="twitter:title" content="{{ og.title|raw }}"/>
|
||||
<meta name="twitter:description" content="{{ og.description|raw }}"/>
|
||||
<meta name="twitter:site" content="@opdavies"/>
|
||||
<meta name="twitter:site" content="@{{ site.twitter.name }}"/>
|
||||
{% endif %}
|
||||
|
|
@ -18,7 +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 }}/css/styles.css">
|
||||
<link rel="stylesheet" href="{{ site.url }}/components/bootswatch/cosmo/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="{{ site.url }}/components/highlightjs/styles/{{ site.hightlightjs_style }}.css">
|
||||
<link rel="stylesheet" href="{{ site.url }}/components/font-awesome/css/font-awesome.min.css">
|
||||
|
|
@ -46,8 +46,10 @@
|
|||
|
||||
<div id="navbar" class="collapse navbar-collapse" role="navigation">
|
||||
<ul class="nav navbar-nav">
|
||||
{% for link in site.main_menu %}
|
||||
<li class="nav__{{ link.title|lower }}{% if page.nav == link.nav %} active{% endif %}"><a href="{{ link.href }}">{{ link.title }}</a></li>
|
||||
{% for name, item in site.main_menu %}
|
||||
<li{% if page.nav == name %} class="active"{% endif %}>
|
||||
<a href="{{ item.href }}">{{ item.title }}</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>{# .nav-collapse #}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{% block content_wrapper %}
|
||||
<main class="col-md-9">
|
||||
{% include 'post_header' %}
|
||||
{% include 'post-header' %}
|
||||
|
||||
{% block content %}{% endblock content %}
|
||||
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
<img src="{{ site.gravatar.url }}?s=50" alt="Picture of Oliver" class="img-circle">
|
||||
|
||||
<p><a href="{{ site.url }}">Oliver Davies</a> is a Drupal Developer and System Administrator based in the UK. He is a Senior Developer at <a href="https://microserve.io">Microserve</a> and also provides freelance consultancy services for Drupal websites and Linux servers.</p>
|
||||
<p>{{ site.author.bio|raw }}</p>
|
||||
</div>
|
||||
|
||||
{% if page.next_post or page.previous_post %}
|
||||
|
|
@ -14,7 +14,7 @@ use:
|
|||
<ul class="posts">
|
||||
{% for post in page.pagination.items %}
|
||||
<li class="post">
|
||||
{% include 'post_header' with { page: post, title_tag: 'h2' } %}
|
||||
{% include 'post-header' with { page: post, title_tag: 'h2' } %}
|
||||
|
||||
{% if post.blocks.excerpt %}
|
||||
{{ post.blocks.excerpt|raw }}
|
||||
|
|
@ -28,14 +28,14 @@ use:
|
|||
</ul>
|
||||
|
||||
{% if page.pagination.previous_page or page.pagination.next_page %}
|
||||
<nav>
|
||||
<ul class="pager">
|
||||
{% if page.pagination.previous_page %}
|
||||
<a href="{{ site.url }}{{ page.pagination.previous_page.url }}">Newer Items</a>
|
||||
<li class="next"><a href="{{ site.url }}{{ page.pagination.previous_page.url }}">Newer →</a></li>
|
||||
{% endif %}
|
||||
{% if page.pagination.next_page %}
|
||||
<a href="{{ site.url }}{{ page.pagination.next_page.url }}">Older Items</a>
|
||||
<li class="previous"><a href="{{ site.url }}{{ page.pagination.next_page.url }}">← Older</a></li>
|
||||
{% endif %}
|
||||
</nav>
|
||||
</ul>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ Here are some other places to find me online:
|
|||
* IRC ({{ site.irc.name }}) - I'm usually in #drupal-uk and #drupal-contribute on Freenode, among others.
|
||||
* <a href="{{ site.twitter.url }}">Twitter</a> (@{{ site.twitter.name }})
|
||||
* <a href="{{ site.drupalorg.url_nice }}">Drupal.org</a>
|
||||
* <a href="{{ site.github.url }}">GitHub</a>
|
||||
* <a href="{{ site.linkedin.url }}">LinkedIn</a>
|
||||
* <a href="{{ site.lanyrd.url }}">Lanyrd</a>
|
||||
* <a href="{{ site.joindin.url }}">Joind.in</a>
|
||||
|
|
|
|||
1
source/css/styles.css
Normal file
1
source/css/styles.css
Normal file
|
|
@ -0,0 +1 @@
|
|||
body{padding-top:60px}main img{height:auto;max-width:100%}dt{margin-top:.5em}dt:after{content:':'}dd{padding-left:2em}table{width:100%}.about-author{overflow:hidden;*zoom:1}.about-author img{float:left;margin:0 1em 1em 0}.copyright{border-top:1px solid #CCC;margin-top:1em;padding-top:1em}.latest-posts li.active a{color:#333;font-weight:500}.block--drupalcon_la img{margin-bottom:.5em}.meetups{overflow:hidden;*zoom:1}.meetups ul{margin:0;padding:0;border:0;overflow:hidden;*zoom:1}.meetups ul li{list-style-image:none;list-style-type:none;margin-left:0;display:inline-block;vertical-align:middle;*vertical-align:auto;*zoom:1;*display:inline;white-space:nowrap}.meetups li{padding:5px 0;margin:0 5px 5px 0}.meetups a{display:block}.meetups img{max-height:45px;width:auto}.page--blog__list ul.posts{list-style:none;margin-bottom:2em;padding-left:0}.page--blog__list .post{overflow:hidden;*zoom:1;border-bottom:1px solid #CCC;margin-bottom:1em;padding-bottom:2em}.page--testimonials .testimonial{overflow:hidden;*zoom:1;margin-bottom:10px}.page--testimonials .testimonial .testimonial__image{float:right;margin:0 0 10px 10px;max-height:100px;max-width:100px}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
group :development do
|
||||
|
||||
gem "sass"
|
||||
gem "sass-globbing"
|
||||
gem "bootstrap-sass"
|
||||
gem "compass"
|
||||
|
||||
end
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
autoprefixer-rails (5.1.8)
|
||||
execjs
|
||||
json
|
||||
bootstrap-sass (3.3.4.1)
|
||||
autoprefixer-rails (>= 5.0.0.1)
|
||||
sass (>= 3.2.19)
|
||||
chunky_png (1.3.4)
|
||||
compass (1.0.3)
|
||||
chunky_png (~> 1.2)
|
||||
compass-core (~> 1.0.2)
|
||||
compass-import-once (~> 1.0.5)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
sass (>= 3.3.13, < 3.5)
|
||||
compass-core (1.0.3)
|
||||
multi_json (~> 1.0)
|
||||
sass (>= 3.3.0, < 3.5)
|
||||
compass-import-once (1.0.5)
|
||||
sass (>= 3.2, < 3.5)
|
||||
execjs (2.4.0)
|
||||
ffi (1.9.8)
|
||||
json (1.8.2)
|
||||
multi_json (1.11.0)
|
||||
rb-fsevent (0.9.4)
|
||||
rb-inotify (0.9.5)
|
||||
ffi (>= 0.5.0)
|
||||
sass (3.4.13)
|
||||
sass-globbing (1.1.1)
|
||||
sass (>= 3.1)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
bootstrap-sass
|
||||
compass
|
||||
sass
|
||||
sass-globbing
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
##
|
||||
## This file is only needed for Compass/Sass integration. If you are not using
|
||||
## Compass, you may safely ignore or delete this file.
|
||||
##
|
||||
## If you'd like to learn more about Sass and Compass, see the sass/README.txt
|
||||
## file for more information.
|
||||
##
|
||||
|
||||
# Location of the theme's resources.
|
||||
sass_dir = "sass"
|
||||
css_dir = "css"
|
||||
images_dir = "images"
|
||||
generated_images_dir = images_dir + "/generated"
|
||||
javascripts_dir = "js"
|
||||
|
||||
# Require any additional compass plugins installed on your system.
|
||||
require 'sass-globbing'
|
||||
require 'bootstrap-sass'
|
||||
|
||||
##
|
||||
## You probably don't need to edit anything below this.
|
||||
##
|
||||
|
||||
# You can select your preferred output style here (:expanded, :nested, :compact
|
||||
# or :compressed).
|
||||
output_style = :compressed
|
||||
|
||||
# To enable relative paths to assets via compass helper functions. Since Drupal
|
||||
# themes can be installed in multiple locations, we don't need to worry about
|
||||
# the absolute path to the theme from the server omega.
|
||||
relative_assets = true
|
||||
|
||||
# Conditionally enable line comments when in development mode.
|
||||
line_comments = false
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -1,7 +0,0 @@
|
|||
body {
|
||||
padding-top: 60px;
|
||||
}
|
||||
|
||||
main img {
|
||||
@extend .img-responsive;
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
dt {
|
||||
margin-top: .5em;
|
||||
|
||||
&:after {
|
||||
content: ':';
|
||||
}
|
||||
}
|
||||
|
||||
dd {
|
||||
padding-left: 2em;
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
table {
|
||||
width: 100%;
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
.about-author {
|
||||
@include clearfix;
|
||||
|
||||
img {
|
||||
float: left;
|
||||
margin: 0 1em 1em 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
.copyright {
|
||||
border-top: 1px solid #CCC;
|
||||
margin-top: 1em;
|
||||
padding-top: 1em;
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
.latest-posts {
|
||||
li.active a {
|
||||
color: $dark-gray;
|
||||
font-weight: $semibold;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
/*
|
||||
@each $page in experience, services, testimonials, talks, blog, contact {
|
||||
.page--#{$page} .nav__#{$page} {
|
||||
@extend .active;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
.block--drupalcon_la {
|
||||
img {
|
||||
margin-bottom: .5em;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
.meetups {
|
||||
@include clearfix;
|
||||
|
||||
ul {
|
||||
@include inline-block-list;
|
||||
}
|
||||
|
||||
li {
|
||||
padding: 5px 0;
|
||||
margin: 0 5px 5px 0;
|
||||
}
|
||||
|
||||
a {
|
||||
display: block;
|
||||
}
|
||||
|
||||
img {
|
||||
max-height: 45px;
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
.page--blog__list {
|
||||
ul.posts {
|
||||
list-style: none;
|
||||
margin-bottom: 2em;
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
.post {
|
||||
@include clearfix;
|
||||
border-bottom: 1px solid #CCC;
|
||||
margin-bottom: 1em;
|
||||
padding-bottom: 2em;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
.page--testimonials .testimonial {
|
||||
@include clearfix;
|
||||
margin-bottom: 10px;
|
||||
|
||||
.testimonial__image {
|
||||
float: right;
|
||||
margin: 0 0 10px 10px;
|
||||
max-height: 100px;
|
||||
max-width: 100px;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
@import 'compass';
|
||||
@import 'bootstrap';
|
||||
|
||||
@import "variables/**/*";
|
||||
@import "base/**/*";
|
||||
@import "components/**/*";
|
||||
|
|
@ -1 +0,0 @@
|
|||
$dark-gray: #333;
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
// Font weights.
|
||||
$semibold: 500;
|
||||
Loading…
Add table
Add a link
Reference in a new issue