Formatting cleanup

This commit is contained in:
Mike Francis 2014-03-31 16:15:18 +01:00
parent 0d8c4da159
commit cbd57dc329
6 changed files with 58 additions and 28 deletions

View File

@ -8,7 +8,7 @@ textarea {
font: inherit; font: inherit;
line-height: $base-margin-bottom; line-height: $base-margin-bottom;
padding: ($base-margin-bottom / 4) ($base-margin-bottom / 2); padding: ($base-margin-bottom / 4) ($base-margin-bottom / 2);
width: 208px; width: 300px;
} }
input[type="checkbox"], input[type="checkbox"],
@ -34,7 +34,6 @@ textarea {
@extend .clearfix; @extend .clearfix;
} }
input[type="submit"],
.btn { .btn {
background-color: $base-colour; background-color: $base-colour;
border: 0; border: 0;

View File

@ -9,15 +9,25 @@ a {
text-decoration: none; text-decoration: none;
} }
h1, h2, h3, h4, h5, h6, p, ul, ol { h1,
h2,
h3,
h4,
h5,
h6,
p,
ul,
ol {
margin-bottom: $base-margin-bottom; margin-bottom: $base-margin-bottom;
} }
ul, ol { ul,
ol {
margin-left: $base-margin-bottom; margin-left: $base-margin-bottom;
} }
ul ul, ol ol { ul ul,
ol ol {
margin-bottom: 0; margin-bottom: 0;
} }

View File

@ -7,11 +7,27 @@ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockq
vertical-align: baseline; vertical-align: baseline;
} }
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section, main { article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
menu,
nav,
section,
main {
display: block; display: block;
} }
address, caption, cite, dfn, th, var { address,
caption,
cite,
dfn,
th,
var {
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
} }
@ -20,9 +36,13 @@ blockquote, q {
quotes: none; quotes: none;
} }
blockquote:before, blockquote:after, q:before, q:after { blockquote,
content: ''; q {
content: none; &:before,
&:after {
content: '';
content: none;
}
} }
table { table {

View File

@ -1,21 +1,21 @@
// Base // Base
$base-colour: #444; $base-colour: #444;
$base-background-colour: #fff; $base-background-colour: #fff;
$base-font-stack: 'Helvetica Neue', Helvetica, Arial, sans-serif; $base-font-stack: 'Helvetica Neue', Helvetica, Arial, sans-serif;
$base-font-size: 16; $base-font-size: 16;
$base-line-height: 1.5; $base-line-height: 1.5;
$base-margin-bottom: ($base-font-size * $base-line-height) * 1px; $base-margin-bottom: ($base-font-size * $base-line-height) * 1px;
// Media Queries // Media Queries
$mobile: 640px; $mobile: 640px;
// Scaffolding // Scaffolding
$max-width: 940px; $max-width: 940px;
$grid-columns: 12; $grid-columns: 12;
$gutter: 20; $gutter: 20;
// Custom colours etc. // Custom colours etc.

View File

@ -1,8 +1,9 @@
<footer class="footer" role="contentinfo"> <footer class="footer" role="contentinfo">
<div class="container"> <div class="container">
&copy; <?php bloginfo( 'name' ); ?> <?php echo date( 'Y' ); ?> <?php wp_nav_menu( array( 'theme_location' => 'footer' ) ); ?>
</div> &copy; <?php bloginfo( 'name' ); ?> <?php echo date( 'Y' ); ?>
</footer> </div>
<?php wp_footer(); ?> </footer>
<?php wp_footer(); ?>
</body> </body>
</html> </html>

View File

@ -18,7 +18,7 @@
<header class="header" role="banner"> <header class="header" role="banner">
<div class="container"> <div class="container">
<nav role="navigation"> <nav role="navigation">
<?php wp_nav_menu( array( 'menu_class' => 'nav' ) ); ?> <?php wp_nav_menu( array( 'theme_location' => 'header' ) ); ?>
</nav> </nav>
</div> </div>
</header> </header>