Change SASS to use Bootstrap

This commit is contained in:
Oliver Davies 2015-03-29 23:09:21 +01:00
parent 02d9221cd3
commit 8bec2a2b56
14 changed files with 47 additions and 153 deletions

File diff suppressed because one or more lines are too long

View file

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

View file

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

View file

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

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

View file

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

View file

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

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

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

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

View file

@ -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/**/*";

View file

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

View file

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

View file

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