Oliver Davies
commit
3ed2ef1192
|
|
@ -2,11 +2,9 @@ source 'https://rubygems.org'
|
|||
|
||||
group :development do
|
||||
|
||||
gem "sass", "3.3.9"
|
||||
gem "sass-globbing", "1.1.1"
|
||||
gem "compass", "1.0.0.alpha.20"
|
||||
gem "susy", "2.1.2"
|
||||
gem "breakpoint", "2.4.2"
|
||||
gem "oily_png"
|
||||
gem "sass"
|
||||
gem "sass-globbing"
|
||||
gem "bootstrap-sass"
|
||||
gem "compass"
|
||||
|
||||
end
|
||||
|
|
@ -1,44 +1,41 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
breakpoint (2.4.2)
|
||||
sass (~> 3.3.0)
|
||||
sassy-maps (< 1.0.0)
|
||||
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.0.alpha.20)
|
||||
compass (1.0.3)
|
||||
chunky_png (~> 1.2)
|
||||
compass-core (~> 1.0.0.alpha.20)
|
||||
compass-import-once (~> 1.0.4)
|
||||
compass-core (~> 1.0.2)
|
||||
compass-import-once (~> 1.0.5)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
sass (>= 3.3.0, < 3.5)
|
||||
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)
|
||||
oily_png (1.1.2)
|
||||
chunky_png (~> 1.3.1)
|
||||
rb-fsevent (0.9.4)
|
||||
rb-inotify (0.9.5)
|
||||
ffi (>= 0.5.0)
|
||||
sass (3.3.9)
|
||||
sass (3.4.13)
|
||||
sass-globbing (1.1.1)
|
||||
sass (>= 3.1)
|
||||
sassy-maps (0.4.0)
|
||||
sass (~> 3.3)
|
||||
susy (2.1.2)
|
||||
sass (~> 3.3.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
breakpoint (= 2.4.2)
|
||||
compass (= 1.0.0.alpha.20)
|
||||
oily_png
|
||||
sass (= 3.3.9)
|
||||
sass-globbing (= 1.1.1)
|
||||
susy (= 2.1.2)
|
||||
bootstrap-sass
|
||||
compass
|
||||
sass
|
||||
sass-globbing
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
<html lang="en" class="no-js">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="description" content="{% if page.front == true %}{{ site.description }}{% else %}{{ page.description }}{% endif %}">
|
||||
<link rel="author" href="{{ site.url }}/humans.txt" />
|
||||
|
|
@ -11,15 +12,15 @@
|
|||
{% block styles %}{% endblock %}
|
||||
</head>
|
||||
<body{% if page.nav %} class="{{ page.nav }}"{% endif %}>
|
||||
{% include 'header' %}
|
||||
{% include 'navbar' %}
|
||||
|
||||
{% block content_wrapper %}
|
||||
<div class="content">
|
||||
<div class="container">
|
||||
{% block content %}{% endblock %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
<footer role="contentinfo">
|
||||
<footer class="container" role="contentinfo">
|
||||
<p class="copyright">© 2010–{{ 'now'|date('Y') }} {{ site.title }}</p>
|
||||
</footer>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
<header role="banner">
|
||||
<div class="inner">
|
||||
<div class="site-name">{{ site.title }}</div>
|
||||
{% include 'main-menu' %}
|
||||
</div>{# .inner #}
|
||||
</header>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<nav class="main-menu" role="navigation">
|
||||
<ul>
|
||||
<li><a href="{{ site.url }}" class="about">About</a></li>
|
||||
<li><a href="{{ site.url }}/work" class="work">Work</a></li>
|
||||
<li><a href="{{ site.url }}/services" class="services">Services</a></li>
|
||||
<li><a href="{{ site.url }}/talks" class="talks">Talks</a></li>
|
||||
<li><a href="{{ site.url }}/blog" class="blog">Blog</a></li>
|
||||
<li><a href="{{ site.url }}/contact" class="contact">Contact</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
23
source/themes/opdavies/opdavies/_partials/navbar.html.twig
Normal file
23
source/themes/opdavies/opdavies/_partials/navbar.html.twig
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
<nav class="navbar navbar-inverse 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">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="{{ site.url }}">{{ site.title }}</a>
|
||||
</div>
|
||||
<div id="navbar" class="collapse navbar-collapse">
|
||||
<ul class="nav navbar-nav navbar-right" role="navigation">
|
||||
<li{% if page.nav == 'about' %} class="active"{% endif %}><a href="{{ site.url }}">About</a></li>
|
||||
<li{% if page.nav == 'work' %} class="active"{% endif %}><a href="{{ site.url }}/work">Work</a></li>
|
||||
<li{% if page.nav == 'services' %} class="active"{% endif %}><a href="{{ site.url }}/services">Services</a></li>
|
||||
<li{% if page.nav == 'talks' %} class="active"{% endif %}><a href="{{ site.url }}/talks">Talks</a></li>
|
||||
<li{% if page.nav == 'blog' %} class="active"{% endif %}><a href="{{ site.url }}/blog">Blog</a></li>
|
||||
<li{% if page.nav == 'contact' %} class="active"{% endif %}><a href="{{ site.url }}/contact">Contact</a></li>
|
||||
</ul>
|
||||
</div><!--/.nav-collapse -->
|
||||
</div>
|
||||
</nav>
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,3 @@
|
|||
body {
|
||||
padding-top: 60px;
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
code {
|
||||
font-family: "Courier New";
|
||||
}
|
||||
|
|
@ -1,9 +1,4 @@
|
|||
ul {
|
||||
list-style-type: disc;
|
||||
}
|
||||
|
||||
dt {
|
||||
font-weight: bold;
|
||||
margin-top: .5em;
|
||||
|
||||
&:after {
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
body {
|
||||
@include adjust-font-size-to(14px);
|
||||
@include adjust-leading-to(1);
|
||||
color: #222;
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
}
|
||||
|
||||
p,
|
||||
ul,
|
||||
ol,
|
||||
pre {
|
||||
margin-bottom: 1em;
|
||||
|
||||
&:last-child {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
h1 {
|
||||
@include adjust-font-size-to(30px, 1, 14px);
|
||||
@include adjust-leading-to(1);
|
||||
margin-bottom: .2em;
|
||||
}
|
||||
|
||||
h2 {
|
||||
@include adjust-font-size-to(21px, 1, 14px);
|
||||
display: inline-block;
|
||||
margin: .5em 0;
|
||||
|
||||
h1 + & {
|
||||
// Remove the top margin if the h2 is after a h1.
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
.copyright {
|
||||
border-top: 1px solid #CCC;
|
||||
margin-top: 1em;
|
||||
padding-top: 1em;
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
$susy: (
|
||||
columns: 12,
|
||||
gutters: 1/4,
|
||||
gutter-position: before
|
||||
);
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
.content {
|
||||
@include container(95%);
|
||||
padding: 1em 0;
|
||||
|
||||
@include breakpoint($desktop) {
|
||||
@include container(960px);
|
||||
}
|
||||
|
||||
a {
|
||||
text-decoration: none;
|
||||
|
||||
&:link,
|
||||
&:visited {
|
||||
color: #0678be;
|
||||
}
|
||||
|
||||
&:hover,
|
||||
&:focus {
|
||||
color: black;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
footer[role="contentinfo"] {
|
||||
@include container(95%);
|
||||
border-top: 1px solid #CCC;
|
||||
margin-top: 1em;
|
||||
padding: 1em 0;
|
||||
|
||||
@include breakpoint($desktop) {
|
||||
@include container(960px);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
header[role="banner"] {
|
||||
@include adjust-leading-to(1);
|
||||
background-color: #064771;
|
||||
color: white;
|
||||
padding: 1.5em 0;
|
||||
|
||||
.inner {
|
||||
@include container(95%);
|
||||
|
||||
@include breakpoint($desktop) {
|
||||
@include container(960px);
|
||||
}
|
||||
|
||||
.main-menu {
|
||||
ul {
|
||||
@include inline-block-list;
|
||||
}
|
||||
|
||||
a {
|
||||
border-bottom: 1px solid #064771;
|
||||
color: white;
|
||||
display: block;
|
||||
margin: 0 .5em 0 0;
|
||||
text-decoration: none;
|
||||
|
||||
&.active {
|
||||
border-color: white;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@include breakpoint($mobile + 1) {
|
||||
.site-name {
|
||||
@include span(first 4);
|
||||
}
|
||||
|
||||
.main-menu {
|
||||
@include span(8);
|
||||
text-align: right;
|
||||
|
||||
a {
|
||||
margin: 0 0 0 .5em;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@each $class in about, work, services, talks, blog, contact {
|
||||
body.#{$class} .main-menu a.#{$class} {
|
||||
border-bottom-color: white;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +1,5 @@
|
|||
@import 'compass';
|
||||
@import 'compass/reset';
|
||||
@import 'compass/css3';
|
||||
@import 'compass/typography/vertical_rhythm';
|
||||
@import 'susy';
|
||||
@import 'breakpoint';
|
||||
@import 'bootstrap';
|
||||
|
||||
@import "variables/**/*";
|
||||
@import "base/**/*";
|
||||
@import "layout/**/*";
|
||||
@import "modules/**/*";
|
||||
@import "components/**/*";
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
// Legacy support.
|
||||
$legacy-support-for-ie6: false;
|
||||
$legacy-support-for-ie7: false;
|
||||
$legacy-support-for-ie8: true;
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
$mobile: 321px;
|
||||
$desktop: 1025px;
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
$base-font-size: 16px;
|
||||
$base-line-height: 24px;
|
||||
|
||||
@include establish-baseline();
|
||||
|
|
@ -14,9 +14,8 @@ generated_images_dir = images_dir + "/generated"
|
|||
javascripts_dir = "assets/js"
|
||||
|
||||
# Require any additional compass plugins installed on your system.
|
||||
require 'susy'
|
||||
require 'sass-globbing'
|
||||
require 'breakpoint'
|
||||
require 'bootstrap-sass'
|
||||
|
||||
##
|
||||
## You probably don't need to edit anything below this.
|
||||
|
|
|
|||
Reference in a new issue