From f93cac2e6d46b2ee31b1a13d8a1f57a589adc21f Mon Sep 17 00:00:00 2001 From: Mike Francis Date: Fri, 21 Feb 2014 10:44:42 +0000 Subject: [PATCH] Mass tidy up --- css/_forms.scss | 13 +++-- css/_layout.scss | 4 ++ css/_normalise.scss | 5 ++ css/style.scss | 4 ++ functions.php | 21 +++++-- header.php | 8 +-- index.php | 2 +- style.css | 133 +------------------------------------------- 8 files changed, 42 insertions(+), 148 deletions(-) create mode 100644 css/_layout.scss diff --git a/css/_forms.scss b/css/_forms.scss index 7db5298..ef2c8f2 100755 --- a/css/_forms.scss +++ b/css/_forms.scss @@ -34,14 +34,15 @@ textarea { @extend .clearfix; } +input[type="submit"], .btn { - background-color: $base-background-colour; - border: solid 1px $base-colour; - color: $base-colour; + background-color: $base-colour; + border: 0; + color: $base-background-colour; cursor: pointer; display: inline-block; - height: ($base-margin-bottom * 2) * 1px; - line-height: ($base-margin-bottom * 2) * 1px; + height: ($base-margin-bottom * 1.5); + line-height: ($base-margin-bottom * 1.5); padding: 0 $base-margin-bottom; width: auto; -} +} \ No newline at end of file diff --git a/css/_layout.scss b/css/_layout.scss new file mode 100644 index 0000000..a39e2d6 --- /dev/null +++ b/css/_layout.scss @@ -0,0 +1,4 @@ +.container { + @include outer-container; + padding: 0 ($gutter * 1px); +} \ No newline at end of file diff --git a/css/_normalise.scss b/css/_normalise.scss index 8607b0d..c9bf697 100755 --- a/css/_normalise.scss +++ b/css/_normalise.scss @@ -26,3 +26,8 @@ img { height: auto; max-width: 100%; } + +blockquote { + font-style: italic; + padding-left: $base-margin-bottom; +} \ No newline at end of file diff --git a/css/style.scss b/css/style.scss index e528b13..02c5b9a 100755 --- a/css/style.scss +++ b/css/style.scss @@ -20,6 +20,10 @@ Author: Mike Francis @import 'normalise'; @import 'utilities'; +// Layout, Scaffolding + +@import 'layout'; + // Form, Buttons @import 'forms'; diff --git a/functions.php b/functions.php index c6c95dd..0f08fed 100644 --- a/functions.php +++ b/functions.php @@ -33,13 +33,26 @@ function theme_scripts() { 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_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' ); -/*=Register bog-standard sidebar +/*=Nav menus ----------------------------------------*/ -if ( function_exists( 'register_sidebar' ) ) - register_sidebar(); +if ( function_exists( 'register_nav_menus' ) ) + 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'] = ''; + return $args; +} + +add_filter( 'wp_nav_menu_args', 'my_wp_nav_menu_args' ); \ No newline at end of file diff --git a/header.php b/header.php index 3e17d73..11ae873 100755 --- a/header.php +++ b/header.php @@ -5,22 +5,20 @@ - <?php wp_title( ' / ', true, 'right' ); bloginfo( 'name' ); ?> + <?php wp_title( '' ); ?> > diff --git a/index.php b/index.php index d1a06b7..f5ced89 100755 --- a/index.php +++ b/index.php @@ -12,7 +12,7 @@

-

+

diff --git a/style.css b/style.css index cb03e69..00cfcd3 100644 --- a/style.css +++ b/style.css @@ -1,132 +1 @@ -/* -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'); \ No newline at end of file +@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}