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

CSS changes

Browse source
This commit is contained in:
Oliver Davies 2015-03-22 08:59:19 +00:00
parent a81c075ecd
commit 111507b391
4 changed files with 57 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,11 @@ a img {
article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {
display: block; } display: block; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Library\/Ruby\/Gems\/2\.0\.0\/gems\/compass-core-1\.0\.3\/stylesheets\/compass\/typography\/_vertical_rhythm\.scss}line{font-family:\00003106}}
html {
font-size: 100%;
line-height: 1.5em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_content\.scss}line{font-family:\000031}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_content\.scss}line{font-family:\000031}}
.content { .content {
max-width: 960px; max-width: 960px;
@ -77,10 +82,11 @@ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu,
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\000031}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\000031}}
header[role="banner"] { header[role="banner"] {
line-height: 1.5em;
background-color: #064771; background-color: #064771;
color: white; color: white;
padding: 1.5em 0; } padding: 1.5em 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\000036}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\000037}}
header[role="banner"] .inner { header[role="banner"] .inner {
max-width: 960px; max-width: 960px;
margin-left: auto; margin-left: auto;
@ -90,29 +96,29 @@ header[role="banner"] {
content: " "; content: " ";
display: block; display: block;
clear: both; } clear: both; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\000039}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000310}}
header[role="banner"] .inner .site-name { header[role="banner"] .inner .site-name {
width: 23.72881%; width: 23.72881%;
float: left; float: left;
margin-left: 0; } margin-left: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000313}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000314}}
header[role="banner"] .inner .main-menu { header[role="banner"] .inner .main-menu {
width: 74.57627%; width: 74.57627%;
float: left; float: left;
margin-left: 1.69492%; margin-left: 1.69492%;
text-align: right; } text-align: right; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000317}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000318}}
header[role="banner"] .inner .main-menu a { header[role="banner"] .inner .main-menu a {
border-bottom: 1px solid #064771; border-bottom: 1px solid #064771;
color: white; color: white;
display: block; display: block;
margin-left: .5em; margin-left: .5em;
text-decoration: none; } text-decoration: none; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000324}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000325}}
header[role="banner"] .inner .main-menu a.active { header[role="banner"] .inner .main-menu a.active {
border-color: white; } border-color: white; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000332}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/modules\/_header\.scss}line{font-family:\0000333}}
.main-menu ul { .main-menu ul {
margin: 0; margin: 0;
padding: 0; padding: 0;
@ -131,42 +137,52 @@ header[role="banner"] {
*display: inline; *display: inline;
white-space: nowrap; } white-space: nowrap; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000310}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000311}}
body { body {
font-size: 0.875em;
line-height: 1.71429em;
line-height: 1.5em;
color: #222; color: #222;
font: 14px Arial; } font-family: Arial; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000315}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000318}}
p, p,
ul, ul,
ol, ol,
pre { pre {
margin-bottom: 1em; } margin-bottom: 1em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000321}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000324}}
p:last-child, p:last-child,
ul:last-child, ul:last-child,
ol:last-child, ol:last-child,
pre:last-child { pre:last-child {
margin-bottom: 0; } margin-bottom: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000326}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000329}}
h1 { h1 {
font-size: 2em; font-size: 2.14286em;
margin-bottom: .5em; } line-height: 0.8em;
line-height: 1.5em;
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000330}} margin-bottom: .2em; }
h2 {
font-size: 1.5em;
margin-bottom: .5em; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000335}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000335}}
h2 {
font-size: 1.5em;
line-height: 1.14286em;
display: inline-block;
margin: .5em 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000340}}
h1 + h2 {
margin-top: 0; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000346}}
ul { ul {
list-style-type: disc; } list-style-type: disc; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000339}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000350}}
code { code {
font-family: "Courier New"; } font-family: "Courier New"; }
@media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000343}} @media -sass-debug-info{filename{font-family:file\:\/\/\/Users\/opdavies\/Code\/Personal\/Current\/oliverdavies\.co\.uk\/source\/themes\/opdavies\/opdavies\/assets\/scss\/styles\.scss}line{font-family:\0000354}}
dd { dd {
padding-left: 1.5em; } padding-left: 1.5em; }

1
source/themes/opdavies/opdavies/assets/scss/modules/_header.scss
View file

@ -1,4 +1,5 @@
header[role="banner"] { header[role="banner"] {
@include adjust-leading-to(1);
background-color: #064771; background-color: #064771;
color: white; color: white;
padding: 1.5em 0; padding: 1.5em 0;

21
source/themes/opdavies/opdavies/assets/scss/styles.scss
View file

@ -1,6 +1,7 @@
@import 'compass'; @import 'compass';
@import 'compass/reset'; @import 'compass/reset';
@import 'compass/css3'; @import 'compass/css3';
@import 'compass/typography/vertical_rhythm';
@import 'susy'; @import 'susy';
@import "variables/**/*"; @import "variables/**/*";
@ -8,8 +9,10 @@
@import "modules/**/*"; @import "modules/**/*";
body { body {
@include adjust-font-size-to(14px);
@include adjust-leading-to(1);
color: #222; color: #222;
font: 14px Arial; font-family: Arial;
} }
p, p,
@ -24,12 +27,20 @@ pre {
} }
h1 { h1 {
font-size: 2em; @include adjust-font-size-to(30px, 1, 14px);
margin-bottom: .5em; @include adjust-leading-to(1);
margin-bottom: .2em;
} }
h2 { h2 {
font-size: 1.5em; @include adjust-font-size-to(21px, 1, 14px);
margin-bottom: .5em; display: inline-block;
margin: .5em 0;
h1 + & {
// Remove the top margin if the h2 is after a h1.
margin-top: 0;
}
} }
ul { ul {

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

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