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

Merge pull request #1 from opdavies/bootstrap

Browse source 
Use Bootstrap
This commit is contained in:
Oliver Davies 2015-03-29 23:16:29 +01:00
parent 93914af7a5 bb67b34c17
commit 3ed2ef1192
21 changed files with 60 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/themes/opdavies/opdavies/Gemfile
View file

@ -2,11 +2,9 @@ source 'https://rubygems.org'
group :development do group :development do
gem "sass", "3.3.9" gem "sass"
gem "sass-globbing", "1.1.1" gem "sass-globbing"
gem "compass", "1.0.0.alpha.20" gem "bootstrap-sass"
gem "susy", "2.1.2" gem "compass"
gem "breakpoint", "2.4.2"
gem "oily_png"
end end

37
source/themes/opdavies/opdavies/Gemfile.lock
View file

@ -1,44 +1,41 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
breakpoint (2.4.2) autoprefixer-rails (5.1.8)
sass (~> 3.3.0) execjs
sassy-maps (< 1.0.0) json
bootstrap-sass (3.3.4.1)
autoprefixer-rails (>= 5.0.0.1)
sass (>= 3.2.19)
chunky_png (1.3.4) chunky_png (1.3.4)
compass (1.0.0.alpha.20) compass (1.0.3)
chunky_png (~> 1.2) chunky_png (~> 1.2)
compass-core (~> 1.0.0.alpha.20) compass-core (~> 1.0.2)
compass-import-once (~> 1.0.4) compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
sass (>= 3.3.0, < 3.5) sass (>= 3.3.13, < 3.5)
compass-core (1.0.3) compass-core (1.0.3)
multi_json (~> 1.0) multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5) sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5) compass-import-once (1.0.5)
sass (>= 3.2, < 3.5) sass (>= 3.2, < 3.5)
execjs (2.4.0)
ffi (1.9.8) ffi (1.9.8)
json (1.8.2)
multi_json (1.11.0) multi_json (1.11.0)
oily_png (1.1.2)
chunky_png (~> 1.3.1)
rb-fsevent (0.9.4) rb-fsevent (0.9.4)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
sass (3.3.9) sass (3.4.13)
sass-globbing (1.1.1) sass-globbing (1.1.1)
sass (>= 3.1) sass (>= 3.1)
sassy-maps (0.4.0)
sass (~> 3.3)
susy (2.1.2)
sass (~> 3.3.0)
PLATFORMS PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
breakpoint (= 2.4.2) bootstrap-sass
compass (= 1.0.0.alpha.20) compass
oily_png sass
sass (= 3.3.9) sass-globbing
sass-globbing (= 1.1.1)
susy (= 2.1.2)

7
source/themes/opdavies/opdavies/_layouts/default.html.twig
View file

@ -2,6 +2,7 @@
<html lang="en" class="no-js"> <html lang="en" class="no-js">
<head> <head>
<meta charset="utf-8"> <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="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="{% if page.front == true %}{{ site.description }}{% else %}{{ page.description }}{% endif %}"> <meta name="description" content="{% if page.front == true %}{{ site.description }}{% else %}{{ page.description }}{% endif %}">
<link rel="author" href="{{ site.url }}/humans.txt" /> <link rel="author" href="{{ site.url }}/humans.txt" />
@ -11,15 +12,15 @@
{% block styles %}{% endblock %} {% block styles %}{% endblock %}
</head> </head>
<body{% if page.nav %} class="{{ page.nav }}"{% endif %}> <body{% if page.nav %} class="{{ page.nav }}"{% endif %}>
{% include 'header' %} {% include 'navbar' %}
{% block content_wrapper %} {% block content_wrapper %}
<div class="content"> <div class="container">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>
{% endblock %} {% endblock %}
<footer role="contentinfo"> <footer class="container" role="contentinfo">
<p class="copyright">&copy; 2010&ndash;{{ 'now'|date('Y') }} {{ site.title }}</p> <p class="copyright">&copy; 2010&ndash;{{ 'now'|date('Y') }} {{ site.title }}</p>
</footer> </footer>

6
source/themes/opdavies/opdavies/_partials/header.html.twig
View file

@ -1,6 +0,0 @@
<header role="banner">
<div class="inner">
<div class="site-name">{{ site.title }}</div>
{% include 'main-menu' %}
</div>{# .inner #}
</header>

10
source/themes/opdavies/opdavies/_partials/main-menu.html.twig
View file

@ -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
View 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>

4
source/themes/opdavies/opdavies/assets/css/styles.css
View file

File diff suppressed because one or more lines are too long

3
source/themes/opdavies/opdavies/assets/sass/base/_base.scss Normal file
View file

@ -0,0 +1,3 @@
body {
padding-top: 60px;
}

3
source/themes/opdavies/opdavies/assets/sass/base/_code.scss
View file

@ -1,3 +0,0 @@
code {
font-family: "Courier New";
}

5
source/themes/opdavies/opdavies/assets/sass/base/_lists.scss
View file

@ -1,9 +1,4 @@
ul {
list-style-type: disc;
}
dt { dt {
font-weight: bold;
margin-top: .5em; margin-top: .5em;
&:after { &:after {

34
source/themes/opdavies/opdavies/assets/sass/base/_typography.scss
View file

@ -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;
}
}

5
source/themes/opdavies/opdavies/assets/sass/components/_footer.scss Normal file
View file

@ -0,0 +1,5 @@
.copyright {
border-top: 1px solid #CCC;
margin-top: 1em;
padding-top: 1em;
}

5
source/themes/opdavies/opdavies/assets/sass/layout/_grid.scss
View file

@ -1,5 +0,0 @@
$susy: (
columns: 12,
gutters: 1/4,
gutter-position: before
);

22
source/themes/opdavies/opdavies/assets/sass/modules/_content.scss
View file

@ -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;
}
}
}

10
source/themes/opdavies/opdavies/assets/sass/modules/_footer.scss
View file

@ -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);
}
}

53
source/themes/opdavies/opdavies/assets/sass/modules/_header.scss
View file

@ -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;
}
}

10
source/themes/opdavies/opdavies/assets/sass/styles.scss
View file

@ -1,11 +1,5 @@
@import 'compass'; @import 'compass';
@import 'compass/reset'; @import 'bootstrap';
@import 'compass/css3';
@import 'compass/typography/vertical_rhythm';
@import 'susy';
@import 'breakpoint';
@import "variables/**/*";
@import "base/**/*"; @import "base/**/*";
@import "layout/**/*"; @import "components/**/*";
@import "modules/**/*";

4
source/themes/opdavies/opdavies/assets/sass/variables/_legacy.scss
View file

@ -1,4 +0,0 @@
// Legacy support.
$legacy-support-for-ie6: false;
$legacy-support-for-ie7: false;
$legacy-support-for-ie8: true;

2
source/themes/opdavies/opdavies/assets/sass/variables/_responsive.scss
View file

@ -1,2 +0,0 @@
$mobile: 321px;
$desktop: 1025px;

4
source/themes/opdavies/opdavies/assets/sass/variables/_typography.scss
View file

@ -1,4 +0,0 @@
$base-font-size: 16px;
$base-line-height: 24px;
@include establish-baseline();

3
source/themes/opdavies/opdavies/config.rb
View file

@ -14,9 +14,8 @@ generated_images_dir = images_dir + "/generated"
javascripts_dir = "assets/js" javascripts_dir = "assets/js"
# Require any additional compass plugins installed on your system. # Require any additional compass plugins installed on your system.
require 'susy'
require 'sass-globbing' require 'sass-globbing'
require 'breakpoint' require 'bootstrap-sass'
## ##
## You probably don't need to edit anything below this. ## You probably don't need to edit anything below this.