adding support for 960.gs

This commit is contained in:
Ben Word
2011-04-01 14:42:22 -06:00
parent 7db3bbb351
commit 369b6a45f5
34 changed files with 2926 additions and 114 deletions

View File

@@ -19,6 +19,7 @@ body.toplevel_page_roots .ui-widget-content .ui-state-active,
body.toplevel_page_roots .ui-widget-header .ui-state-active { background: #fff !important; }
ul.options li { clear: both; margin-bottom: 8px; }
ul.options li .container { float: left; }
ul.options label.settings-label { font-size: 1em; font-weight: 700; float: left; width: 250px; margin: 3px 0 0 0; }
ul.options input.text { float: left; width: 300px; }
ul.options span.note { clear: both; float: left; margin: 2px 0 8px 250px; display: block; font-size: 0.8em; line-height: 1.5em; }

View File

@@ -126,7 +126,7 @@ function roots_head_cleanup() {
if (!$id = $wp_the_query->get_queried_object_id())
return;
$link = get_permalink($id);
echo " <link rel=\"canonical\" href=\"$link\">\n";
echo "<link rel=\"canonical\" href=\"$link\">\n";
}
add_action('wp_head', 'roots_rel_canonical');

View File

@@ -78,22 +78,24 @@ 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 class="clearfix">
<label class="settings-label">CSS Grid Framework</label>
<div class="container">
<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 CSS</label><br />
<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><br />
<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><br />
<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>
</div>
</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" />
<span class="note">Enter your Blueprint CSS grid classes (use <a href="http://ianli.com/labs/blueprinter/">Blueprinter</a> to create a non-default grid)</span>
<span class="note">Enter your grid classes</span>
</li>
<li>
<label class="settings-label">Class for #sidebar</label>
<input name="roots_sidebar_class" type="text" value="<?php echo get_option('roots_sidebar_class'); ?>" class="text" />
<span class="note">Enter your Blueprint CSS grid classes (use <a href="http://ianli.com/labs/blueprinter/">Blueprinter</a> to create a non-default grid)</span>
<span class="note">Enter your grid classes</span>
</li>
<li>
<label class="settings-label">Google Analytics Tracking ID</label>