Merge branch 'master' of https://github.com/johnraz/roots into johnraz-master
This commit is contained in:
Ben Word
2
404.php
2
404.php
@@ -1,5 +1,5 @@
|
||||
<?php get_header(); ?>
|
||||
<div id="content" class="span-24">
|
||||
<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
|
||||
<div id="main" role="main">
|
||||
<div class="container">
|
||||
<h1>File Not Found</h1>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php get_header(); ?>
|
||||
<div id="content" class="span-24">
|
||||
<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
|
||||
<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
|
||||
<div class="container">
|
||||
<h1><?php single_cat_title(); ?></h1>
|
||||
@@ -11,5 +11,6 @@
|
||||
<?php get_sidebar(); ?>
|
||||
</div>
|
||||
</aside><!-- /#sidebar -->
|
||||
<?php echo get_roots_960gs_cleardiv() ?>
|
||||
</div><!-- /#content -->
|
||||
<?php get_footer(); ?>
|
||||
1
css/960gs/960.css
Executable file
1
css/960gs/960.css
Executable file
File diff suppressed because one or more lines are too long
1
css/960gs/960_24_col.css
Executable file
1
css/960gs/960_24_col.css
Executable file
File diff suppressed because one or more lines are too long
1
css/960gs/reset.css
Executable file
1
css/960gs/reset.css
Executable file
@@ -0,0 +1 @@
|
||||
a,abbr,acronym,address,applet,article,aside,audio,b,big,blockquote,body,canvas,caption,center,cite,code,dd,del,details,dfn,dialog,div,dl,dt,em,embed,fieldset,figcaption,figure,font,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,hr,html,i,iframe,img,ins,kbd,label,legend,li,mark,menu,meter,nav,object,ol,output,p,pre,progress,q,rp,rt,ruby,s,samp,section,small,span,strike,strong,sub,summary,sup,table,tbody,td,tfoot,th,thead,time,tr,tt,u,ul,var,video,xmp{border:0;font-size:100%;margin:0;padding:0}html,body{height:100%}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}b,strong{font-weight:bold}img{color:transparent;font-size:0;vertical-align:middle;-ms-interpolation-mode:bicubic}li{display:list-item}table{border-collapse:collapse;border-spacing:0}th,td,caption{font-weight:normal;vertical-align:top;text-align:left}svg{overflow:hidden}
|
||||
1
css/960gs/rtl_960.css
Executable file
1
css/960gs/rtl_960.css
Executable file
File diff suppressed because one or more lines are too long
1
css/960gs/rtl_960_24_col.css
Executable file
1
css/960gs/rtl_960_24_col.css
Executable file
File diff suppressed because one or more lines are too long
1
css/960gs/rtl_text.css
Executable file
1
css/960gs/rtl_text.css
Executable file
@@ -0,0 +1 @@
|
||||
body{font:13px/1.5 'Helvetica Neue',Arial,'Liberation Sans',FreeSans,sans-serif}a:focus{outline:1px dotted}hr{border:0 #ccc solid;border-top-width:1px;clear:both;height:0}h1{font-size:25px}h2{font-size:23px}h3{font-size:21px}h4{font-size:19px}h5{font-size:17px}h6{font-size:15px}ol{list-style:decimal}ul{list-style:disc}li{margin-right:30px}p,dl,hr,h1,h2,h3,h4,h5,h6,ol,ul,pre,table,address,fieldset{margin-bottom:20px}
|
||||
1
css/960gs/text.css
Executable file
1
css/960gs/text.css
Executable file
@@ -0,0 +1 @@
|
||||
body{font:13px/1.5 'Helvetica Neue',Arial,'Liberation Sans',FreeSans,sans-serif}a:focus{outline:1px dotted}hr{border:0 #ccc solid;border-top-width:1px;clear:both;height:0}h1{font-size:25px}h2{font-size:23px}h3{font-size:21px}h4{font-size:19px}h5{font-size:17px}h6{font-size:15px}ol{list-style:decimal}ul{list-style:disc}li{margin-left:30px}p,dl,hr,h1,h2,h3,h4,h5,h6,ol,ul,pre,table,address,fieldset,figure{margin-bottom:20px}
|
||||
@@ -1,4 +1,4 @@
|
||||
<footer id="content-info" class="span-24" role="contentinfo">
|
||||
<footer id="content-info" class="<?php echo CONTAINER_CLASS; ?>" role="contentinfo">
|
||||
<div class="container">
|
||||
<?php if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar("Footer") ) : ?>
|
||||
<?php endif; ?>
|
||||
@@ -25,6 +25,7 @@
|
||||
<?php } ?>
|
||||
|
||||
</div>
|
||||
<?php echo get_roots_960gs_cleardiv() ?>
|
||||
</footer>
|
||||
</div><!-- /#wrap -->
|
||||
<?php wp_footer(); ?>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php get_header(); ?>
|
||||
<div id="content" class="span-24">
|
||||
<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
|
||||
<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
|
||||
<div class="container">
|
||||
<?php get_template_part('loop', 'page'); ?>
|
||||
@@ -10,5 +10,6 @@
|
||||
<?php get_sidebar(); ?>
|
||||
</div>
|
||||
</aside><!-- /#sidebar -->
|
||||
<?php echo get_roots_960gs_cleardiv() ?>
|
||||
</div><!-- /#content -->
|
||||
<?php get_footer(); ?>
|
||||
|
||||
@@ -10,8 +10,63 @@ include_once('includes/roots-ob.php'); // output buffer
|
||||
include_once('includes/roots-cleanup.php'); // code cleanup/removal
|
||||
include_once('includes/roots-htaccess.php'); // h5bp htaccess
|
||||
|
||||
// set the value of the main container class depending on the selected grid framework
|
||||
$roots_selected_css_framework = get_option('roots_css_framework');
|
||||
if (!defined('CONTAINER_CLASS')){
|
||||
if ($roots_selected_css_framework === 'blueprint'){
|
||||
define('CONTAINER_CLASS', 'span-24');
|
||||
define('IS_960_GS',False);
|
||||
}
|
||||
elseif ($roots_selected_css_framework === '960gs_12'){
|
||||
define('CONTAINER_CLASS', 'container_12');
|
||||
define('IS_960_GS',True);
|
||||
}
|
||||
elseif ($roots_selected_css_framework === '960gs_16'){
|
||||
define('CONTAINER_CLASS', 'container_16');
|
||||
define('IS_960_GS',True);
|
||||
}
|
||||
elseif ($roots_selected_css_framework === '960gs_24'){
|
||||
define('CONTAINER_CLASS', 'container_24');
|
||||
define('IS_960_GS',True);
|
||||
}
|
||||
else {
|
||||
define('CONTAINER_CLASS', '');
|
||||
define('IS_960_GS',False);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function get_roots_css_framework_stylesheets(){
|
||||
$roots_selected_css_framework = get_option('roots_css_framework');
|
||||
if ($roots_selected_css_framework === 'blueprint'){
|
||||
return '<link rel="stylesheet" href="/css/blueprint/screen.css">';
|
||||
}
|
||||
elseif ($roots_selected_css_framework === '960gs_12' || $roots_selected_css_framework === '960gs_16'){
|
||||
return <<<EOD
|
||||
<link rel="stylesheet" href="/css/960gs/reset.css">
|
||||
<link rel="stylesheet" href="/css/960gs/text.css">
|
||||
<link rel="stylesheet" href="/css/960gs/960.css">
|
||||
EOD;
|
||||
}
|
||||
elseif ($roots_selected_css_framework === '960gs_24'){
|
||||
return <<<EOD
|
||||
<link rel="stylesheet" href=""$roots_style_sheet_uri"/css/960gs/reset.css">
|
||||
<link rel="stylesheet" href=""$roots_style_sheet_uri"/css/960gs/text.css">
|
||||
<link rel="stylesheet" href=""$roots_style_sheet_uri"/css/960gs/960_24_col.css">
|
||||
EOD;
|
||||
}
|
||||
else {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
function get_roots_960gs_cleardiv() {
|
||||
if (IS_960_GS) return "<div class=\"clear\" ></div>";
|
||||
else return "";
|
||||
}
|
||||
|
||||
// set the maximum 'Large' image width to the Blueprint grid maximum width
|
||||
if (!isset($content_width)) $content_width = 950;
|
||||
if (!isset($content_width)) $roots_selected_css_framework === 'blueprint' ? $content_width = 950 : $content_width = 940;
|
||||
|
||||
// tell the TinyMCE editor to use editor-style.css
|
||||
// if you have issues with getting the editor to show your changes then use the following line:
|
||||
|
||||
22
header.php
22
header.php
@@ -10,12 +10,17 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width; initial-scale=1.0">
|
||||
|
||||
<link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri(); ?>/css/blueprint/screen.css">
|
||||
<?php if (class_exists('RGForms')) { ?>
|
||||
<?php echo get_roots_css_framework_stylesheets(); ?>
|
||||
|
||||
<?php if (class_exists('RGForms')) { ?>
|
||||
<link rel="stylesheet" href="<?php echo plugins_url(); ?>/gravityforms/css/forms.css">
|
||||
<?php } ?>
|
||||
<?php } ?>
|
||||
|
||||
<link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri(); ?>/css/style.css">
|
||||
|
||||
<?php if(!IS_960_GS) { ?>
|
||||
<!--[if lt IE 8]><link rel="stylesheet" href="<?php echo get_stylesheet_directory_uri(); ?>/css/blueprint/ie.css"><![endif]-->
|
||||
<?php } ?>
|
||||
|
||||
<link rel="alternate" type="application/rss+xml" title="<?php bloginfo('name'); ?> Feed" href="<?php site_url(); ?>/feed/">
|
||||
|
||||
@@ -26,25 +31,28 @@
|
||||
<?php wp_head(); ?>
|
||||
|
||||
<script src="<?php echo get_stylesheet_directory_uri(); ?>/js/scripts.js"></script>
|
||||
<?php if (get_option('roots_google_analytics') !== "") { ?>
|
||||
<?php if (get_option('roots_google_analytics') !== "") { ?>
|
||||
<script>
|
||||
var _gaq=[["_setAccount","<?php echo get_option('roots_google_analytics') ?>"],["_trackPageview"]];
|
||||
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
|
||||
g.src=("https:"==location.protocol?"//ssl":"//www")+".google-analytics.com/ga.js";
|
||||
s.parentNode.insertBefore(g,s)}(document,"script"));
|
||||
</script>
|
||||
<?php } ?>
|
||||
<?php } ?>
|
||||
</head>
|
||||
<body <?php $page_slug = $post->post_name; body_class($page_slug); ?>>
|
||||
<div id="wrap" class="container" role="document">
|
||||
<header id="banner" class="span-24" role="banner">
|
||||
<header id="banner" class="<?php echo CONTAINER_CLASS; ?>" role="banner">
|
||||
<div class="container">
|
||||
<a id="logo" href="<?php site_url(); ?>/"><img src="<?php echo get_stylesheet_directory_uri(); ?>/img/logo.png" width="300" height="75" alt="<?php bloginfo('name'); ?>"></a>
|
||||
<nav id="nav-main" class="span-24" role="navigation">
|
||||
<nav id="nav-main" class="<?php echo CONTAINER_CLASS; ?>" role="navigation">
|
||||
<?php wp_nav_menu(array('theme_location' => 'primary_navigation')); ?>
|
||||
</nav>
|
||||
<nav id="nav-utility">
|
||||
<?php wp_nav_menu(array('theme_location' => 'utility_navigation')); ?>
|
||||
</nav>
|
||||
</div>
|
||||
<?php echo get_roots_960gs_cleardiv() ?>
|
||||
</header>
|
||||
|
||||
|
||||
|
||||
@@ -36,6 +36,7 @@ function roots_admin_styles() {
|
||||
|
||||
function roots_register_settings() {
|
||||
// register our settings
|
||||
register_setting('roots-settings-group', 'roots_css_framework');
|
||||
register_setting('roots-settings-group', 'roots_main_class');
|
||||
register_setting('roots-settings-group', 'roots_sidebar_class');
|
||||
register_setting('roots-settings-group', 'roots_google_analytics');
|
||||
@@ -51,6 +52,7 @@ function roots_register_settings() {
|
||||
register_setting('roots-settings-group', 'roots_footer_vcard');
|
||||
|
||||
// add default settings
|
||||
add_option('roots_css_framework', 'blueprint');
|
||||
add_option('roots_main_class', 'span-14 append-1');
|
||||
add_option('roots_sidebar_class', 'span-8 prepend-1 last');
|
||||
add_option('roots_google_analytics', '');
|
||||
@@ -76,6 +78,13 @@ function roots_settings_page() { ?>
|
||||
</ul>
|
||||
<div id="general">
|
||||
<ul class="options clearfix">
|
||||
<li>
|
||||
<label class="settings-label">Css Grid Framework</label>
|
||||
<input id="roots_blueprint" name="roots_css_framework" type="radio" <?php echo get_option('roots_css_framework') === 'blueprint' ? 'checked' : ''; ?> value="blueprint" /><label for="roots_blueprint">Blueprint</label>
|
||||
<input id="roots_960gs_12" name="roots_css_framework" type="radio" <?php echo get_option('roots_css_framework') === '960gs_12' ? 'checked' : ''; ?> value="960gs_12" /><label for="roots_960gs_12">960gs (12 cols)</label>
|
||||
<input id="roots_960gs_16" name="roots_css_framework" type="radio" <?php echo get_option('roots_css_framework') === '960gs_16' ? 'checked' : ''; ?> value="960gs_16" /><label for="roots_960gs_16">960gs (16 cols)</label>
|
||||
<input id="roots_960gs_24" name="roots_css_framework" type="radio" <?php echo get_option('roots_css_framework') === '960gs_24' ? 'checked' : ''; ?> value="960gs_24" /><label for="roots_960gs_24">960gs (24 cols)</label>
|
||||
</li>
|
||||
<li>
|
||||
<label class="settings-label">Class for #main</label>
|
||||
<input name="roots_main_class" type="text" value="<?php echo get_option('roots_main_class'); ?>" class="text" />
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php get_header(); ?>
|
||||
<div id="content" class="span-24">
|
||||
<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
|
||||
<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
|
||||
<div class="container">
|
||||
<h1>Latest Posts</h1>
|
||||
@@ -11,5 +11,6 @@
|
||||
<?php get_sidebar(); ?>
|
||||
</div>
|
||||
</aside><!-- /#sidebar -->
|
||||
<?php echo get_roots_960gs_cleardiv() ?>
|
||||
</div><!-- /#content -->
|
||||
<?php get_footer(); ?>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
Template Name: Custom
|
||||
*/
|
||||
get_header(); ?>
|
||||
<div id="content" class="span-24">
|
||||
<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
|
||||
<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
|
||||
<div class="container">
|
||||
<?php get_template_part('loop', 'page'); ?>
|
||||
@@ -14,5 +14,6 @@ get_header(); ?>
|
||||
<?php get_sidebar(); ?>
|
||||
</div>
|
||||
</aside><!-- /#sidebar -->
|
||||
<?php echo get_roots_960gs_cleardiv() ?>
|
||||
</div><!-- /#content -->
|
||||
<?php get_footer(); ?>
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
Template Name: Full Width
|
||||
*/
|
||||
get_header(); ?>
|
||||
<div id="content" class="span-24">
|
||||
<div id="main" class="span-24" role="main">
|
||||
<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
|
||||
<div id="main" class="<?php echo CONTAINER_CLASS; ?>" role="main">
|
||||
<div class="container">
|
||||
<?php get_template_part('loop', 'page'); ?>
|
||||
</div>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
Template Name: Sitemap
|
||||
*/
|
||||
get_header(); ?>
|
||||
<div id="content" class="span-24">
|
||||
<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
|
||||
<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
|
||||
<div class="container">
|
||||
<?php get_template_part('loop', 'page'); ?>
|
||||
@@ -20,5 +20,6 @@ get_header(); ?>
|
||||
<?php get_sidebar(); ?>
|
||||
</div>
|
||||
</aside><!-- /#sidebar -->
|
||||
<?php echo get_roots_960gs_cleardiv() ?>
|
||||
</div><!-- /#content -->
|
||||
<?php get_footer(); ?>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
Template Name: List Subpages
|
||||
*/
|
||||
get_header(); ?>
|
||||
<div id="content" class="span-24">
|
||||
<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
|
||||
<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
|
||||
<div class="container">
|
||||
<?php get_template_part('loop', 'page'); ?>
|
||||
@@ -21,5 +21,6 @@ get_header(); ?>
|
||||
<?php get_sidebar(); ?>
|
||||
</div>
|
||||
</aside><!-- /#sidebar -->
|
||||
<?php echo get_roots_960gs_cleardiv() ?>
|
||||
</div><!-- /#content -->
|
||||
<?php get_footer(); ?>
|
||||
|
||||
3
page.php
3
page.php
@@ -1,5 +1,5 @@
|
||||
<?php get_header(); ?>
|
||||
<div id="content" class="span-24">
|
||||
<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
|
||||
<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
|
||||
<div class="container">
|
||||
<?php get_template_part('loop', 'page'); ?>
|
||||
@@ -10,5 +10,6 @@
|
||||
<?php get_sidebar(); ?>
|
||||
</div>
|
||||
</aside><!-- /#sidebar -->
|
||||
<?php echo get_roots_960gs_cleardiv() ?>
|
||||
</div><!-- /#content -->
|
||||
<?php get_footer(); ?>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php get_header(); ?>
|
||||
<div id="content" class="span-24">
|
||||
<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
|
||||
<div id="main" class="<?php echo get_option('roots_main_class'); ?>">
|
||||
<div class="container">
|
||||
<h1>Search Results for <?php echo get_search_query(); ?></h1>
|
||||
@@ -11,5 +11,6 @@
|
||||
<?php get_sidebar(); ?>
|
||||
</div>
|
||||
</aside><!-- /#sidebar -->
|
||||
<?php echo get_roots_960gs_cleardiv() ?>
|
||||
</div><!-- /#content -->
|
||||
<?php get_footer(); ?>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php get_header(); ?>
|
||||
<div id="content" class="span-24">
|
||||
<div id="content" class="<?php echo CONTAINER_CLASS; ?>">
|
||||
<div id="main" class="<?php echo get_option('roots_main_class'); ?>" role="main">
|
||||
<div class="container">
|
||||
<?php get_template_part('loop', 'single'); ?>
|
||||
@@ -10,5 +10,6 @@
|
||||
<?php get_sidebar(); ?>
|
||||
</div>
|
||||
</aside><!-- /#sidebar -->
|
||||
<?php echo get_roots_960gs_cleardiv() ?>
|
||||
</div><!-- /#content -->
|
||||
<?php get_footer(); ?>
|
||||
|
||||
Reference in New Issue
Block a user