Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Various bugfixes and missing ingrediences

  • Loading branch information...
commit 7abb04e453666f128926452a63142fed98a409a6 1 parent 82b65ee
@obenland authored
View
4 header.php
@@ -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
3  inc/custom-header.php
@@ -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
29 inc/theme-options.php
@@ -84,8 +84,8 @@ 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' )
)
) );
@@ -93,16 +93,16 @@ function the_bootstrap_theme_options_init() {
'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
40 style.css
@@ -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
2  style.min.css
@@ -1 +1 @@
-blockquote cite:before{content:'\2014 \00A0';}blockquote cite{color:#999;display:block;font-size:13px;line-height:18px;}figure{margin:0;}h1,h2,h3,h4,h5,h6,.clear{clear:both;}.sidebar-content #primary,.sidebar-content #attachment-comment{float:right;margin:0 20px 0 0;}.assistive-text{clip:rect(1px,1px,1px,1px);position:absolute !important;}body>.container{margin:18px auto;}.navbar-fixed-top{position:fixed;}#page{background-color:#fff;margin-right:-20px;padding:14px 0 0;}#branding hgroup{margin-bottom:18px;}.page-header{margin:0 0 18px;}.entry-content{margin-bottom:18px;}#author-info,article.post,article.page{margin-bottom:72px;}.single #author-info,.author #author-info,.single article.post,.single article.page{margin-bottom:54px;}.page-header,.entry-content{word-wrap:break-word;}.post-password-form legend{font-size:inherit;}.entry-attachment{margin-bottom:36px;}.entry-attachment figure{display:table;margin:0 auto;}#comments-title{border-bottom:1px solid #eee;font-size:19.5px;margin:0 0 27px;}#comment,.entry-content iframe,.entry-content embed{max-width:100%;}.commentlist>li{margin-bottom:36px;}.commentlist ul.children{margin:10px 0 18px;list-style:none;}#reply-title{position:relative;}#reply-title small{position:absolute;right:0;top:7px;}.form-search{margin:0;}.entry-content .post-thumbnail{margin:0 20px 20px 0;}.thumbnail>img{width:100%;}header img,.entry-content img,.comment-content img,.widget img{max-width:100%;}img[class*="align"],img[class*="wp-image-"],img[class*="attachment-"],img[class*="avatar"]{height:auto;}img.wp-smiley{border:none;margin-bottom:0;margin-top:0;padding:0;}#colophon .nav-pills{margin:0;}#site-generator{float:right;font-family:Georgia,"Bitstream Charter",serif;font-style:italic;}#site-generator a{background:url("images/wordpress.png") no-repeat scroll left center transparent;color:#787878;display:inline-block;line-height:16px;padding-left:20px;text-decoration:none;}#site-generator.footer-nav-menu a{margin-top:10px;}table .label{background-color:transparent;border-radius:none;color:inherit;font-size:inherit;text-transform:inherit;}#comment,.thumbnail{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;}.label .post-edit-link,.label .comment-edit-link{color:#fff;}.navbar .btn,.navbar .btn-group{margin:5px;}.navbar-search{height:34px;}.pagination span{background-color:#f5f5f5;border:1px solid #ddd;border-left-width:0;color:#999;cursor:default;float:left;line-height:34px;padding:0 14px;}.pagination span.dots,.pagination a{background-color:#fff;}.pagination li:first-child span{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}.alignnone{margin:5px 20px 20px 0;}.aligncenter,div.aligncenter{display:block;margin:0 auto 20px;}.alignright{float:right;margin:0 0 20px 20px;}.alignleft{float:left;margin:0 20px 20px 0;}a img.alignright{margin:5px 0 20px 20px;}a img.alignnone{margin:5px 20px 20px 0;}a img.alignleft{margin:5px 20px 20px 0;}.wp-caption{max-width:100%;}.wp-caption .wp-caption-text,.gallery-caption,.entry-caption{padding:0 9px 9px;text-align:center;}.wp-caption .wp-caption-text{padding-top:9px;}.wp-caption.alignnone{margin:5px 20px 20px 0;}.wp-caption.alignleft{margin:5px 20px 20px 0;}.wp-caption.alignright{margin:5px 0 20px 20px;}.wp-caption.aligncenter{text-align:center;}.sticky{}.bypostauthor{}@media(max-width:767px){body{padding:0;}.container{width:auto;padding:0 10px;}#page{margin:0;padding:10px;}.thumbnail[class*="span"],.gallery [class*="span"] .thumbnail{display:table;float:left;}.carousel .item>img{width:100%;}.thumbnails>li:nth-child(4n+1){margin-left:0;}.thumbnails [class*="span"]{width:21%;}.sidebar-content #primary{float:none;margin:inherit;}#s{display:inline-block;}#site-generator,#site-generator.footer-nav-menu a{float:none;margin-top:5px;}textarea[class*="span"]{height:auto;}.navbar-fixed-top,.navbar-fixed-bottom{margin:0;}}@media(min-width:768px) and (max-width:778px){#page{margin-right:-15px;}}@media(min-width:768px) and (max-width:979px){.dl-horizontal dt{width:85px;}.dl-horizontal dd{margin-left:95px;}}@media(min-width:1200px){#page{margin-right:-30px;padding:24px 0 10px;}.sidebar-content #primary,.sidebar-content #attachment-comment{margin-right:30px;}.wp-caption{display:table;}}
+blockquote cite:before{content:'\2014 \00A0';}blockquote cite{color:#999;display:block;font-size:13px;line-height:18px;}figure{margin:0;}h1,h2,h3,h4,h5,h6,.clear{clear:both;}.assistive-text{clip:rect(1px,1px,1px,1px);position:absolute !important;}body>.container{margin:18px auto;}.sidebar-content #primary,.sidebar-content #attachment-comment{float:right;margin:0 20px 0 0;}.navbar-fixed-top{position:fixed;}#page{background-color:#fff;margin-right:-20px;padding:14px 0 0;}.page-header{margin:0 0 18px;}#header-image{display:block;}#branding hgroup,#header-image,.entry-content{margin-bottom:18px;}.entry-attachment{margin-bottom:36px;}.single #author-info,.author #author-info,.single article.post,.single article.page{margin-bottom:54px;}#author-info,article.post,article.page{margin-bottom:72px;}.page-header,.entry-content{word-wrap:break-word;}.post-password-form legend{font-size:inherit;}.entry-attachment figure{display:table;margin:0 auto;}#comments-title{border-bottom:1px solid #eee;font-size:19.5px;margin:0 0 27px;}#comment,.entry-content iframe,.entry-content embed{max-width:100%;}.commentlist>li{margin-bottom:36px;}.commentlist ul.children{margin:10px 0 18px;list-style:none;}#reply-title{position:relative;}#reply-title small{position:absolute;right:0;top:7px;}.form-search{margin:0;}.entry-content .post-thumbnail{margin:0 20px 20px 0;}.thumbnail>img{width:100%;}header img,.entry-content img,.comment-content img,.widget img{max-width:100%;}img[class*="align"],img[class*="wp-image-"],img[class*="attachment-"],img[class*="avatar"]{height:auto;}img.wp-smiley{border:none;margin-bottom:0;margin-top:0;padding:0;}#colophon .nav-pills{margin:0;}#site-generator{float:right;font-family:Georgia,"Bitstream Charter",serif;font-style:italic;}#site-generator a{background:url("images/wordpress.png") no-repeat scroll left center transparent;color:#787878;display:inline-block;line-height:16px;padding-left:20px;text-decoration:none;}#site-generator.footer-nav-menu a{margin-top:10px;}table .label{background-color:transparent;border-radius:none;color:inherit;font-size:inherit;text-transform:inherit;}#comment,.thumbnail{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;}.label .post-edit-link,.label .comment-edit-link{color:#fff;}.navbar .btn,.navbar .btn-group{margin:5px;}.navbar-search{height:34px;}.pagination span{background-color:#f5f5f5;border:1px solid #ddd;border-left-width:0;color:#999;cursor:default;float:left;line-height:34px;padding:0 14px;}.pagination span.dots,.pagination a{background-color:#fff;}.pagination li:first-child span{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}.alignnone{margin:5px 20px 20px 0;}.aligncenter,div.aligncenter{display:block;margin:0 auto 20px;}.alignright{float:right;margin:0 0 20px 20px;}.alignleft{float:left;margin:0 20px 20px 0;}a img.alignright{margin:5px 0 20px 20px;}a img.alignnone{margin:5px 20px 20px 0;}a img.alignleft{margin:5px 20px 20px 0;}.wp-caption{max-width:100%;}.wp-caption .wp-caption-text,.gallery-caption,.entry-caption{padding:0 9px 9px;text-align:center;}.wp-caption .wp-caption-text{padding-top:9px;}.wp-caption.alignnone{margin:5px 20px 20px 0;}.wp-caption.alignleft{margin:5px 20px 20px 0;}.wp-caption.alignright{margin:5px 0 20px 20px;}.wp-caption.aligncenter{text-align:center;}.sticky{}.bypostauthor{}@media(max-width:767px){body{padding:0;}.container{width:auto;padding:0 10px;}#page{margin:0;padding:10px;}.thumbnail[class*="span"],.gallery [class*="span"] .thumbnail{display:table;float:left;}.carousel .item>img{width:100%;}.thumbnails>li:nth-child(4n+1){margin-left:0;}.thumbnails [class*="span"]{width:21%;}.sidebar-content #primary{float:none;margin:inherit;}#s{display:inline-block;}#site-generator,#site-generator.footer-nav-menu a{float:none;margin-top:5px;}textarea[class*="span"]{height:auto;}.navbar-fixed-top,.navbar-fixed-bottom{margin:0;}}@media(min-width:768px) and (max-width:778px){#page{margin-right:-15px;}}@media(min-width:768px) and (max-width:979px){.dl-horizontal dt{width:85px;}.dl-horizontal dd{margin-left:95px;}}@media(min-width:1200px){#page{margin-right:-30px;padding:24px 0 10px;}.sidebar-content #primary,.sidebar-content #attachment-comment{margin-right:30px;}.wp-caption{display:table;}}
Please sign in to comment.
Something went wrong with that request. Please try again.