Permalink
Browse files

Various bugfixes and missing ingrediences

  • Loading branch information...
1 parent 82b65ee commit 7abb04e453666f128926452a63142fed98a409a6 @obenland committed May 12, 2012
Showing with 40 additions and 38 deletions.
  1. +2 −2 header.php
  2. +1 −2 inc/custom-header.php
  3. +15 −14 inc/theme-options.php
  4. +21 −19 style.css
  5. +1 −1 style.min.css
View
@@ -46,7 +46,7 @@
<h2 id="site-description"><?php bloginfo( 'description' ); ?></h2>
</hgroup>
<?php if ( get_header_image() ) : ?>
- <a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
+ <a id="header-image" href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
<img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="" />
</a>
<?php endif; // if ( get_header_image() ) ?>
@@ -55,7 +55,7 @@
<div class="skip-link"><a class="assistive-text" href="#content" title="<?php esc_attr_e( 'Skip to primary content', 'the-bootstrap' ); ?>"><?php _e( 'Skip to primary content', 'the-bootstrap' ); ?></a></div>
<div class="skip-link"><a class="assistive-text" href="#secondary" title="<?php esc_attr_e( 'Skip to secondary content', 'the-bootstrap' ); ?>"><?php _e( 'Skip to secondary content', 'the-bootstrap' ); ?></a></div>
<?php if ( has_nav_menu( 'primary' ) OR the_bootstrap_options()->navbar_site_name OR the_bootstrap_options()->navbar_searchform ) : ?>
- <div class="navbar">
+ <div <?php the_bootstrap_navbar_class(); ?>>
<div class="navbar-inner">
<div class="container">
<!-- .btn-navbar is used as the toggle for collapsed navbar content -->
View
@@ -67,8 +67,7 @@ function the_bootstrap_header_style() {
?>
<style type="text/css">
<?php if ( 'blank' == get_header_textcolor() ) : ?>
- #site-title,
- #site-description {
+ #branding hgroup {
position: absolute !important;
clip: rect(1px 1px 1px 1px); /* IE6, IE7 */
clip: rect(1px, 1px, 1px, 1px);
View
@@ -84,25 +84,25 @@ function the_bootstrap_theme_options_init() {
'description' => __( 'Add site name to navigation bar.', 'the-bootstrap' )
),
(object) array(
- 'name' => 'navbar_searchbar',
- 'value' => the_bootstrap_options()->navbar_searchbar,
+ 'name' => 'navbar_searchform',
+ 'value' => the_bootstrap_options()->navbar_searchform,
'description' => __( 'Add searchform to navigation bar.', 'the-bootstrap' )
)
) );
add_settings_field( 'navbar-position', __( 'Navigation Bar Position', 'the-bootstrap' ), 'the_bootstrap_settings_field_radio', 'theme_options', 'general', array(
'name' => 'navbar_position',
'options' => array(
(object) array(
- 'value' => 'static',
- 'description' => __( 'Static.', 'the-bootstrap' )
+ 'value' => 'static',
+ 'description' => __( 'Static.', 'the-bootstrap' )
),
(object) array(
- 'value' => 'navbar-fixed-top',
- 'description' => __( 'Fixed on top.', 'the-bootstrap' )
+ 'value' => 'navbar-fixed-top',
+ 'description' => __( 'Fixed on top.', 'the-bootstrap' )
),
(object) array(
- 'value' => 'navbar-fixed-bottom',
- 'description' => __( 'Fixed at bottom.', 'the-bootstrap' )
+ 'value' => 'navbar-fixed-bottom',
+ 'description' => __( 'Fixed at bottom.', 'the-bootstrap' )
),
)
) );
@@ -254,15 +254,15 @@ function the_bootstrap_settings_field_checkbox( $options ) {
/**
* Renders a field with radio buttons.
*
- * @author WordPress.org
+ * @author Konstantin Obenland
* @since 1.4.0 - 12.05.2012
*
* @return void
*/
function the_bootstrap_settings_field_radio( $args ) {
extract( wp_parse_args( $args, array(
- 'name' => null,
- 'options' => array(),
+ 'name' => null,
+ 'options' => array(),
) ) );
foreach ( (array) $options as $o ) : ?>
@@ -322,10 +322,11 @@ function the_bootstrap_theme_options_render_page() {
* @return void
*/
function the_bootstrap_theme_options_validate( $input ) {
- $output = $defaults = the_bootstrap_get_default_theme_options();
-
+ $output = $defaults = the_bootstrap_get_default_theme_options();
+ $input = wp_parse_args( $input, $defaults );
+
if ( isset( $input['theme_layout'] ) AND array_key_exists( $input['theme_layout'], the_bootstrap_layouts() ) )
- $output['theme_layout'] = $input['theme_layout'];
+ $output['theme_layout'] = $input['theme_layout'];
if ( isset( $input['navbar_position'] ) AND in_array( $input['navbar_position'], array('static', 'navbar-fixed-top', 'navbar-fixed-bottom') ) )
$output['navbar_position'] = $input['navbar_position'];
View
@@ -51,13 +51,6 @@ h1, h2, h3, h4, h5, h6, .clear {
clear: both;
}
-/* Right Content */
-.sidebar-content #primary,
-.sidebar-content #attachment-comment {
- float: right;
- margin: 0 20px 0 0;
-}
-
/* =Classes
-------------------------------------------------------------- */
@@ -71,6 +64,13 @@ body > .container {
margin: 18px auto;
}
+/* Right Content */
+.sidebar-content #primary,
+.sidebar-content #attachment-comment {
+ float: right;
+ margin: 0 20px 0 0;
+}
+
.navbar-fixed-top {
position: fixed;
}
@@ -85,22 +85,22 @@ body > .container {
padding: 14px 0 0;
}
-#branding hgroup {
- margin-bottom: 18px;
-}
-
.page-header {
margin: 0 0 18px;
}
+#header-image {
+ display: block;
+}
+
+#branding hgroup,
+#header-image,
.entry-content {
margin-bottom: 18px;
}
-#author-info,
-article.post,
-article.page {
- margin-bottom: 72px;
+.entry-attachment {
+ margin-bottom: 36px;
}
.single #author-info,
@@ -110,6 +110,12 @@ article.page {
margin-bottom: 54px;
}
+#author-info,
+article.post,
+article.page {
+ margin-bottom: 72px;
+}
+
.page-header,
.entry-content {
word-wrap: break-word;
@@ -119,10 +125,6 @@ article.page {
font-size: inherit;
}
-.entry-attachment {
- margin-bottom: 36px;
-}
-
.entry-attachment figure {
display: table;
margin: 0 auto;
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit 7abb04e

Please sign in to comment.