framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refs #149 - remove 1140's container class

Browse Source
This commit is contained in:
Ben Word
2012-01-02 11:21:23 -07:00
parent 8c1f18f3da
commit 331c11d32f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
inc/roots-options.php
View File

@@ -94,7 +94,7 @@ $roots_css_frameworks = array(
'name' => '1140', 'name' => '1140',
'label' => __('1140', 'roots'), 'label' => __('1140', 'roots'),
'classes' => array( 'classes' => array(
'container' => 'twelvecol', 'container' => '',
'main' => 'eightcol', 'main' => 'eightcol',
'sidebar' => 'fourcol last' 'sidebar' => 'fourcol last'
) )
@@ -143,7 +143,7 @@ $roots_css_frameworks = array(
'main' => 'span11', 'main' => 'span11',
'sidebar' => 'span5' 'sidebar' => 'span5'
) )
), ),
'none' => array( 'none' => array(
'name' => 'none', 'name' => 'none',
'label' => __('None', 'roots'), 'label' => __('None', 'roots'),
@@ -239,7 +239,7 @@ function roots_theme_options_render_page() {
</fieldset> </fieldset>
</td> </td>
</tr> </tr>
<?php if($roots_options['css_framework'] == 'bootstrap') { ?> <?php if($roots_options['css_framework'] == 'bootstrap') { ?>
<tr valign="top"><th scope="row"><?php _e('Bootstrap Javascript Packages', 'roots'); ?></th> <tr valign="top"><th scope="row"><?php _e('Bootstrap Javascript Packages', 'roots'); ?></th>
<td> <td>
@@ -250,9 +250,9 @@ function roots_theme_options_render_page() {
</select> </select>
</fieldset> </fieldset>
</td> </td>
</tr> </tr>
<?php } ?> <?php } ?>
<?php if($roots_options['css_framework'] == 'bootstrap_less') { ?> <?php if($roots_options['css_framework'] == 'bootstrap_less') { ?>
<tr valign="top"><th scope="row"><?php _e('Bootstrap Javascript Packages', 'roots'); ?></th> <tr valign="top"><th scope="row"><?php _e('Bootstrap Javascript Packages', 'roots'); ?></th>
<td> <td>
@@ -263,9 +263,9 @@ function roots_theme_options_render_page() {
</select> </select>
</fieldset> </fieldset>
</td> </td>
</tr> </tr>
<?php } ?> <?php } ?>
<tr valign="top"><th scope="row"><?php _e('Google Analytics ID', 'roots'); ?></th> <tr valign="top"><th scope="row"><?php _e('Google Analytics ID', 'roots'); ?></th>
<td> <td>
<fieldset><legend class="screen-reader-text"><span><?php _e('Google Analytics ID', 'roots'); ?></span></legend> <fieldset><legend class="screen-reader-text"><span><?php _e('Google Analytics ID', 'roots'); ?></span></legend>
@@ -371,7 +371,7 @@ function roots_theme_options_validate($input) {
} }
$output['fout_b_gone'] = $input['fout_b_gone']; $output['fout_b_gone'] = $input['fout_b_gone'];
} }
if (isset($input['bootstrap_javascript'])) { if (isset($input['bootstrap_javascript'])) {
if ($input['bootstrap_javascript'] === 'yes') { if ($input['bootstrap_javascript'] === 'yes') {
$input['bootstrap_javascript'] = true; $input['bootstrap_javascript'] = true;
@@ -390,7 +390,7 @@ function roots_theme_options_validate($input) {
$input['bootstrap_less_javascript'] = false; $input['bootstrap_less_javascript'] = false;
} }
$output['bootstrap_less_javascript'] = $input['bootstrap_less_javascript']; $output['bootstrap_less_javascript'] = $input['bootstrap_less_javascript'];
} }
return apply_filters('roots_theme_options_validate', $output, $input, $defaults); return apply_filters('roots_theme_options_validate', $output, $input, $defaults);
} }