Mass tidy up

This commit is contained in:
Mike Francis 2014-02-21 10:44:42 +00:00
parent b4e6bd5eb2
commit f93cac2e6d
8 changed files with 42 additions and 148 deletions

View File

@ -34,14 +34,15 @@ textarea {
@extend .clearfix; @extend .clearfix;
} }
input[type="submit"],
.btn { .btn {
background-color: $base-background-colour; background-color: $base-colour;
border: solid 1px $base-colour; border: 0;
color: $base-colour; color: $base-background-colour;
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
height: ($base-margin-bottom * 2) * 1px; height: ($base-margin-bottom * 1.5);
line-height: ($base-margin-bottom * 2) * 1px; line-height: ($base-margin-bottom * 1.5);
padding: 0 $base-margin-bottom; padding: 0 $base-margin-bottom;
width: auto; width: auto;
} }

4
css/_layout.scss Normal file
View File

@ -0,0 +1,4 @@
.container {
@include outer-container;
padding: 0 ($gutter * 1px);
}

View File

@ -26,3 +26,8 @@ img {
height: auto; height: auto;
max-width: 100%; max-width: 100%;
} }
blockquote {
font-style: italic;
padding-left: $base-margin-bottom;
}

View File

@ -20,6 +20,10 @@ Author: Mike Francis
@import 'normalise'; @import 'normalise';
@import 'utilities'; @import 'utilities';
// Layout, Scaffolding
@import 'layout';
// Form, Buttons // Form, Buttons
@import 'forms'; @import 'forms';

View File

@ -33,13 +33,26 @@ function theme_scripts() {
wp_deregister_script( 'jquery' ); wp_deregister_script( 'jquery' );
wp_register_script( 'jquery', ( '//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js' ), false, '1.10.2', true); wp_register_script( 'jquery', ( '//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js' ), false, '1.10.2', true);
wp_enqueue_script( 'jquery' ); wp_enqueue_script( 'jquery' );
wp_enqueue_script( 'script', get_stylesheet_directory_uri() . '/js/all.min.js', array( 'jquery' ), null, true ); wp_enqueue_script( 'script', get_stylesheet_directory_uri() . '/js/script.js', array( 'jquery' ), null, true );
} }
add_action( 'wp_enqueue_scripts', 'theme_scripts' ); add_action( 'wp_enqueue_scripts', 'theme_scripts' );
/*=Register bog-standard sidebar /*=Nav menus
----------------------------------------*/ ----------------------------------------*/
if ( function_exists( 'register_sidebar' ) ) if ( function_exists( 'register_nav_menus' ) )
register_sidebar(); register_nav_menus(array(
'main' => 'Main Navigation'
// Add more menus here
));
function my_wp_nav_menu_args( $args = '' ) {
$args['container'] = false;
$args['container_class'] = false;
$args['menu_id'] = false;
$args['items_wrap'] = '<ul class="%2$s">%3$s</ul>';
return $args;
}
add_filter( 'wp_nav_menu_args', 'my_wp_nav_menu_args' );

View File

@ -5,22 +5,20 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<meta name="HandheldFriendly" content="true"> <meta name="HandheldFriendly" content="true">
<meta name="MobileOptimized" content="320"> <meta name="MobileOptimized" content="320">
<title><?php wp_title( ' / ', true, 'right' ); bloginfo( 'name' ); ?></title> <title><?php wp_title( '' ); ?></title>
<link rel="stylesheet" href="<?php bloginfo( 'stylesheet_url' ); ?>"> <link rel="stylesheet" href="<?php bloginfo( 'stylesheet_url' ); ?>">
<?php wp_head(); ?> <?php wp_head(); ?>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.7.1/modernizr.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/selectivizr/1.0.2/selectivizr-min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/selectivizr/1.0.2/selectivizr-min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.7.1/modernizr.min.js"></script>
<![endif]--> <![endif]-->
</head> </head>
<body <?php body_class(); ?>> <body <?php body_class(); ?>>
<header class="header" role="banner"> <header class="header" role="banner">
<div class="container"> <div class="container">
<nav role="navigation"> <nav role="navigation">
<ul class="nav"> <?php wp_nav_menu( array( 'menu_class' => 'nav' ) ); ?>
<?php wp_list_pages( 'title_li=' ); ?>
</ul>
</nav> </nav>
</div> </div>
</header> </header>

View File

@ -12,7 +12,7 @@
<header role="heading"> <header role="heading">
<h3 class="post__title"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h3> <h3 class="post__title"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></h3>
<p class="post__date"><time><?php echo human_time_diff( strtotime( $post->post_date ) ); ?></time></p> <p class="post__date"><time><?php echo human_time_diff( strtotime( $post->post_date ) ) . ' ' . __( 'ago' ); ?></time></p>
<p class="post__comments"><?php comments_popup_link( __( 'No comments yet' ), __( '1 comment' ), __( '% comments' ) ); ?></p> <p class="post__comments"><?php comments_popup_link( __( 'No comments yet' ), __( '1 comment' ), __( '% comments' ) ); ?></p>
</header> </header>

133
style.css
View File

@ -1,132 +1 @@
/* @import '//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css';*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video{border:0;font-size:100%;font:inherit;margin:0;padding:0;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}address,caption,cite,dfn,th,var{font-style:normal;font-weight:normal}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}table{border-collapse:collapse;border-spacing:0}th{font-weight:bold;text-align:left}html{background-color:#fff;color:#444;font:100%/1.5 "Helvetica Neue",Helvetica,Arial,sans-serif}a{color:#444;text-decoration:none}h1,h2,h3,h4,h5,h6,p,ul,ol{margin-bottom:24px}ul,ol{margin-left:24px}ul ul,ol ol{margin-bottom:0}img{display:block;height:auto;max-width:100%}blockquote{font-style:italic;padding-left:24px}.alignleft{float:left}img.alignleft{margin-right:20px}.alignright{float:right}img.alignright{margin-left:20px}.aligncenter{display:block;margin-left:auto;margin-right:auto}.clearfix:before,.form__controls:before,.clearfix:after,.form__controls:after{content:'';display:table;line-height:0}.clearfix:after,.form__controls:after{clear:both}.container{*zoom:1;max-width:940px;margin-left:auto;margin-right:auto;padding:0 20px}.container:before,.container:after{content:" ";display:table}.container:after{clear:both}input,select,textarea{background-color:#fff;border:solid 1px #444;color:#444;display:inline-block;font:inherit;line-height:24px;padding:6px 12px;width:208px}input[type="checkbox"],input[type="radio"]{background:transparent;border:0;width:auto}textarea{min-height:96px}.form__group{margin-bottom:24px}.form__label{font-weight:bold}input[type="submit"],.btn{background-color:#444;border:0;color:#fff;cursor:pointer;display:inline-block;height:36px;line-height:36px;padding:0 24px;width:auto}.nav{list-style:none;margin:0}.nav>li{display:inline-block}.nav>li>a{display:block}
Theme Name: Bare Bones
Theme URI: http://github.com/mikefrancis/barebones
Author: Mike Francis
*/
* {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box; }
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
border: 0;
font-size: 100%;
font: inherit;
margin: 0;
padding: 0;
vertical-align: baseline; }
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {
display: block; }
address, caption, cite, dfn, th, var {
font-style: normal;
font-weight: normal; }
blockquote, q {
quotes: none; }
blockquote:before, blockquote:after, q:before, q:after {
content: '';
content: none; }
table {
border-collapse: collapse;
border-spacing: 0; }
th {
font-weight: bold;
text-align: left; }
html {
background-color: #fff;
color: #444;
font: 100%/1.5 'Helvetica Neue', Helvetica, Arial, sans-serif; }
a {
color: #444;
text-decoration: none; }
h1, h2, h3, h4, h5, h6, p, ul, ol {
margin-bottom: 24px; }
ul, ol {
margin-left: 24px; }
ul ul, ol ol {
margin-bottom: 0; }
img {
display: block;
height: auto;
max-width: 100%; }
.alignleft {
float: left; }
img.alignleft {
margin-right: 20px; }
.alignright {
float: right; }
img.alignright {
margin-left: 20px; }
.aligncenter {
display: block;
margin-left: auto;
margin-right: auto; }
.clearfix:before, .clearfix:after {
content: '';
display: table;
line-height: 0; }
.clearfix:after {
clear: both; }
input, select, textarea {
background-color: #fff;
border: solid 1px #444;
color: #444;
display: inline-block;
font: inherit;
line-height: 24px;
padding: 6 12;
width: 208px; }
input[type="checkbox"], input[type="radio"] {
background: transparent;
border: 0;
width: auto; }
textarea {
min-height: 96px; }
.form__group {
margin-bottom: 24px; }
.form__label {
font-weight: bold; }
.btn {
background-color: #fff;
border: solid 1px #444;
color: #444;
cursor: pointer;
display: inline-block;
height: 48px;
line-height: 48px;
padding: 0 24;
width: auto; }
.nav {
list-style: none;
margin: 0; }
.nav > li {
display: inline-block; }
.nav > li > a {
display: block; }
@import url('//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css');