Skip to content
Browse files

Fixing bootstapwp_autoset_featured_img function

  • Loading branch information...
1 parent 273c800 commit 0cb2a739947b80d57f48fa52c55de7ad2f2dd78a @rachelbaker committed
Showing with 1,404 additions and 1,389 deletions.
  1. +26 −4 README.md
  2. +3 −4 archive.php
  3. +3 −4 author.php
  4. +34 −18 functions.php
  5. +1 −1 less/bootstrap.less
  6. +1 −1 less/bswp-overrides.less
  7. +3 −3 less/button-groups.less
  8. +38 −36 less/buttons.less
  9. +9 −1 less/carousel.less
  10. +2 −2 less/code.less
  11. +38 −30 less/forms.less
  12. +3 −3 less/mixins.less
  13. +28 −6 less/navbar.less
  14. +1 −2 less/pager.less
  15. +1 −1 less/progress-bars.less
  16. +3 −2 less/thumbnails.less
  17. +26 −50 less/type.less
  18. +15 −13 less/variables.less
  19. +4 −3 page-blog.php
  20. +1,165 −1,205 page-styleguide.php
View
30 README.md
@@ -39,21 +39,43 @@ Bug tracker
**Report theme bugs** [https://github.com/rachelbaker/bootstrapwp-Twitter-Bootstrap-for-WordPress/issues](https://github.com/rachelbaker/bootstrapwp-Twitter-Bootstrap-for-WordPress/issues)
-##v.90 Changelog (in progress)
+##v.90 Changelog (still baking)
-__Functions.php__
+__The goals of this release are:__
-* Fixed bootstrapwp_autoset_featured_img() function to return if there is no image set, clearing debug errors.
-* Removed Custom Walker class from file and replaced with external include call for file 'includes/class-bootstrap_walker_nav_menu.php'.
+1. Add Theme Options Screen
+2. Fix Custom Walker Menu PHP errors
+3. Fix Automatic Thumbnail PHP errors
+4. Remove any unnecessary theme files
+5. Update styles and scripts to Bootstrap 2.10 dev branch
+
+__Archive.php__
+
+* Replaced conditional for `the_post_thumbnail()` with `bootstrapwp_autoset_featured_img()`.
+
+__Author.php__
+
+* Replaced conditional for `the_post_thumbnail()` with `bootstrapwp_autoset_featured_img()`.
__Class-bootstrapwp-walker-nav_menu.php__
* Extending Walker_Nav_Menu to modify class assigned to submenu ul element.
+__Functions.php__
+
+* Fixed `bootstrapwp_autoset_featured_img()` function to return if there is no image set, clearing debug errors.
+* Removed the post hooks for `bootstrap_autoset_featured_img()` function to clear debug errors.
+* Added `bootstrapwp_post_thumbnail_check()` function to check if the post displayed in the loop has a post thumbnail already.
+* Removed Custom Walker class from file and replaced with external include call for file 'includes/class-bootstrap_walker_nav_menu.php'.
+
__Index.php__
* Removed unnecessary double loop for page title.
+__Page-blog.php__
+
+* Replaced conditional for `the_post_thumbnail()` with `bootstrapwp_autoset_featured_img()`.
+
__Docs Folder__
* Removed entire 'docs' folder to clean up theme files.
View
7 archive.php
@@ -54,10 +54,9 @@
<a href="<?php the_permalink(); ?>" title="<?php the_title();?>"><h3><?php the_title();?></h3></a>
<p class="meta"><?php echo bootstrapwp_posted_on();?></p>
<div class="row">
- <div class="span2"><?php // Checking for a post thumbnail
- if ( has_post_thumbnail() ) ?>
- <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" >
- <?php the_post_thumbnail();?></a>
+ <div class="span2">
+ <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" >
+ <?php echo bootstrapwp_autoset_featured_img(); ?></a>
</div><!-- /.span2 -->
<div class="span6">
<?php the_excerpt();?>
View
7 author.php
@@ -44,10 +44,9 @@
<a href="<?php the_permalink(); ?>" title="<?php the_title();?>"><h3><?php the_title();?></h3></a>
<p class="meta"><?php echo bootstrapwp_posted_on();?></p>
<div class="row">
- <div class="span2"><?php // Checking for a post thumbnail
- if ( has_post_thumbnail() ) ?>
- <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" >
- <?php the_post_thumbnail();?></a>
+ <div class="span2">
+ <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" >
+ <?php echo bootstrapwp_autoset_featured_img(); ?></a>
</div><!-- /.span2 -->
<div class="span6">
<?php the_excerpt();?>
View
52 functions.php
@@ -52,10 +52,9 @@ function bootstrapwp_theme_setup() {
/**
* Add support for the Aside and Gallery Post Formats
*/
- add_theme_support( 'post-formats', array( 'aside', 'image', 'gallery' ) );
+ add_theme_support( 'post-formats', array( 'aside', 'image', 'gallery', 'link', 'quote', 'status', 'video', 'audio', 'chat' ) );
}
-endif; // twentyeleven_header_style
-
+endif;
################################################################################
// Loading All CSS Stylesheets
@@ -373,6 +372,20 @@ function bootstrapwp_enhanced_image_navigation( $url ) {
}
add_filter( 'attachment_link', 'bootstrapwp_enhanced_image_navigation' );
+
+/*
+| -------------------------------------------------------------------
+| Checking for Post Thumbnail
+| -------------------------------------------------------------------
+|
+| */
+function bootstrapwp_post_thumbnail_check() {
+ global $post;
+ if (get_the_post_thumbnail()) {
+ return true; }
+ else { return false; }
+}
+
/*
| -------------------------------------------------------------------
| Setting Featured Image (Post Thumbnail)
@@ -380,26 +393,29 @@ function bootstrapwp_enhanced_image_navigation( $url ) {
| Will automatically add the first image attached to a post as the Featured Image if post does not have a featured image previously set.
| */
function bootstrapwp_autoset_featured_img() {
- global $post;
- $already_has_thumb = has_post_thumbnail($post->ID);
- if (!$already_has_thumb) {
- $attached_image = get_children( "post_parent=$post->ID&post_type=attachment&post_mime_type=image&numberposts=1" );
- if ($attached_image) {
+ $post_thumbnail = bootstrapwp_post_thumbnail_check();
+ if ($post_thumbnail == true ){
+ return the_post_thumbnail();
+ }
+ if ($post_thumbnail == false ){
+ $image_args = array(
+ 'post_type' => 'attachment',
+ 'numberposts' => 1,
+ 'post_mime_type' => 'image',
+ 'post_parent' => $post->ID,
+ 'order' => 'desc'
+ );
+ $attached_image = get_children( $image_args );
+ if ($attached_image) {
foreach ($attached_image as $attachment_id => $attachment) {
set_post_thumbnail($post->ID, $attachment_id);
}
- } elseif (!$attached_image) {
- return;
- }
- }
+ return the_post_thumbnail();
+ } else { return " ";}
+ }
} //end function
-add_action('the_post', 'bootstrapwp_autoset_featured_img');
-add_action('save_post', 'bootstrapwp_autoset_featured_img');
-add_action('draft_to_publish', 'bootstrapwp_autoset_featured_img');
-add_action('new_to_publish', 'bootstrapwp_autoset_featured_img');
-add_action('pending_to_publish', 'bootstrapwp_autoset_featured_img');
-add_action('future_to_publish', 'bootstrapwp_autoset_featured_img');
+
/*
| -------------------------------------------------------------------
View
2 less/bootstrap.less
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.0.3
+ * Bootstrap v2.0.4
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
View
2 less/bswp-overrides.less
@@ -1,4 +1,4 @@
-// BSWP OVERRIDES v0.87
+// BSWP OVERRIDES v0.90
/********************************************************
Overriding some defaults from the Bootstrap defaults to improve/fix integration with WordPress
-------------------------------------------------- */
View
6 less/button-groups.less
@@ -34,16 +34,16 @@
}
.btn-group > .btn,
.btn-group > .dropdown-menu {
- font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
+ font-size: 13px; // redeclare as part 2 of font-size inline-block hack
}
// Reset fonts for other sizes
.btn-group > .btn-mini,
.btn-group > .btn-small {
- font-size: @baseFontSize - 2px;
+ font-size: 12px;
}
.btn-group > .btn-large {
- font-size: @baseFontSize + 2px;
+ font-size: 16px;
}
// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
View
74 less/buttons.less
@@ -10,10 +10,10 @@
.btn {
display: inline-block;
.ie7-inline-block();
- padding: 4px 10px 4px;
+ padding: 4px 14px;
margin-bottom: 0; // For input.btn
- font-size: @baseFontSize;
- line-height: @baseLineHeight;
+ font-size: 13px;
+ line-height: 20px;
*line-height: 20px;
color: @grayDark;
text-align: center;
@@ -27,47 +27,49 @@
.border-radius(4px);
.ie7-restore-left-whitespace(); // Give IE7 some love
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
-}
-// Hover state
-.btn:hover {
- color: @grayDark;
- text-decoration: none;
- background-color: darken(@white, 10%);
- *background-color: darken(@white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */
- background-position: 0 -15px;
+ // Hover state
+ &:hover {
+ color: @grayDark;
+ text-decoration: none;
+ background-color: darken(@white, 10%);
+ *background-color: darken(@white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */
+ background-position: 0 -15px;
+
+ // transition is only when going to hover, otherwise the background
+ // behind the gradient (there for IE<=9 fallback) gets mismatched
+ .transition(background-position .1s linear);
+ }
- // transition is only when going to hover, otherwise the background
- // behind the gradient (there for IE<=9 fallback) gets mismatched
- .transition(background-position .1s linear);
-}
+ // Focus state for keyboard and accessibility
+ &:focus {
+ .tab-focus();
+ }
-// Focus state for keyboard and accessibility
-.btn:focus {
- .tab-focus();
-}
+ // Active state
+ &.active,
+ &:active {
+ background-color: darken(@white, 10%);
+ background-color: darken(@white, 15%) e("\9");
+ background-image: none;
+ outline: 0;
+ .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+ }
-// Active state
-.btn.active,
-.btn:active {
- background-color: darken(@white, 10%);
- background-color: darken(@white, 15%) e("\9");
- background-image: none;
- outline: 0;
- .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
-}
+ // Disabled state
+ &.disabled,
+ &[disabled] {
+ cursor: default;
+ background-color: darken(@white, 10%);
+ background-image: none;
+ .opacity(65);
+ .box-shadow(none);
+ }
-// Disabled state
-.btn.disabled,
-.btn[disabled] {
- cursor: default;
- background-color: darken(@white, 10%);
- background-image: none;
- .opacity(65);
- .box-shadow(none);
}
+
// Button Sizes
// --------------------------------------------------
View
10 less/carousel.less
@@ -105,6 +105,7 @@
}
}
+
// Caption for text below images
// -----------------------------
@@ -113,11 +114,18 @@
left: 0;
right: 0;
bottom: 0;
- padding: 10px 15px 5px;
+ padding: 15px;
background: @grayDark;
background: rgba(0,0,0,.75);
}
.carousel-caption h4,
.carousel-caption p {
color: @white;
+ line-height: @baseLineHeight;
+}
+.carousel-caption h4 {
+ margin: 0 0 5px;
+}
+.carousel-caption p {
+ margin-bottom: 0;
}
View
4 less/code.less
@@ -8,7 +8,7 @@ code,
pre {
padding: 0 3px 2px;
#font > #family > .monospace;
- font-size: @baseFontSize - 1;
+ font-size: @baseFontSize - 2;
color: @grayDark;
.border-radius(3px);
}
@@ -26,7 +26,7 @@ pre {
display: block;
padding: (@baseLineHeight - 1) / 2;
margin: 0 0 @baseLineHeight / 2;
- font-size: @baseFontSize * .925; // 13px to 12px
+ font-size: @baseFontSize - 2; // 14px to 12px
line-height: @baseLineHeight;
word-break: break-all;
word-wrap: break-word;
View
68 less/forms.less
@@ -149,12 +149,6 @@ input[type="checkbox"] {
width: auto; // Override of generic input selector
}
-// Make uneditable textareas behave like a textarea
-.uneditable-textarea {
- width: auto;
- height: auto;
-}
-
// Set the height of select and file controls to match text inputs
select,
input[type="file"] {
@@ -184,6 +178,41 @@ input[type="checkbox"]:focus {
}
+// Uneditable inputs
+// -------------------------
+
+// Make uneditable inputs look inactive
+.uneditable-input,
+.uneditable-textarea {
+ color: @grayLight;
+ background-color: darken(@inputBackground, 1%);
+ border-color: @inputBorder;
+ .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+ cursor: not-allowed;
+}
+
+// For text that needs to appear as an input but should not be an input
+.uneditable-input {
+ overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
+ white-space: nowrap;
+}
+
+// Make uneditable textareas behave like a textarea
+.uneditable-textarea {
+ width: auto;
+ height: auto;
+}
+
+
+// Placeholder
+// -------------------------
+
+// Placeholder text gets special styles; can't be bundled together though for some reason
+input,
+textarea {
+ .placeholder();
+}
+
// CHECKBOXES & RADIOS
// -------------------
@@ -277,7 +306,6 @@ select[readonly],
textarea[readonly] {
cursor: not-allowed;
background-color: @inputDisabledBackground;
- border-color: #ddd;
}
// Explicitly reset the colors here
input[type="radio"][disabled],
@@ -333,22 +361,6 @@ select:focus:required:invalid {
.clearfix(); // Adding clearfix to allow for .pull-right button containers
}
-// For text that needs to appear as an input but should not be an input
-.uneditable-input {
- overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
- white-space: nowrap;
- cursor: not-allowed;
- background-color: @inputBackground;
- border-color: #eee;
- .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
-}
-
-// Placeholder text gets special styles; can't be bundled together though for some reason
-input,
-textarea {
- .placeholder();
-}
-
// HELP TEXT
@@ -381,6 +393,8 @@ textarea {
.input-append {
margin-bottom: 5px;
font-size: 0;
+ white-space: nowrap; // Prevent span and input from separating
+
input,
select,
.uneditable-input {
@@ -395,9 +409,6 @@ textarea {
z-index: 2;
}
}
- .uneditable-input {
- border-left-color: #ccc;
- }
.add-on {
display: inline-block;
width: auto;
@@ -439,10 +450,6 @@ textarea {
.uneditable-input {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
}
- .uneditable-input {
- border-right-color: #ccc;
- border-left-color: #eee;
- }
.add-on:last-child,
.btn:last-child {
.border-radius(0 @inputBorderRadius @inputBorderRadius 0);
@@ -502,6 +509,7 @@ input.search-query {
display: inline-block;
.ie7-inline-block();
margin-bottom: 0;
+ vertical-align: middle;
}
// Re-hide hidden elements due to specifity
.hide {
View
6 less/mixins.less
@@ -403,7 +403,7 @@
background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
- background-image: linear-gradient(left, @startColor, @endColor); // Le standard, IE10
+ background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10
background-repeat: repeat-x;
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down
}
@@ -413,7 +413,7 @@
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
- background-image: linear-gradient(top, @startColor, @endColor); // The standard, IE10
+ background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10
background-repeat: repeat-x;
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down
}
@@ -423,7 +423,7 @@
background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+
background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10
- background-image: linear-gradient(@deg, @startColor, @endColor); // The standard, IE10
+ background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10
}
.vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
background-color: mix(@midColor, @endColor, 80%);
View
34 less/navbar.less
@@ -206,7 +206,7 @@
float: none;
// Vertically center the text given @navbarHeight
@elementHeight: 20px;
- padding: ((@navbarHeight - @elementHeight) / 2) 12px ((@navbarHeight - @elementHeight) / 2 + 1);
+ padding: ((@navbarHeight - @elementHeight) / 2) 15px ((@navbarHeight - @elementHeight) / 2 + 1);
line-height: 19px;
color: @navbarLinkColor;
text-decoration: none;
@@ -379,15 +379,19 @@
// Override the default .navbar
-.navbar-subnav {
-}
.navbar-subnav .navbar-inner {
- padding: 0;
- #gradient > .vertical(#f9f9f9, #f1f1f1);
+ #gradient > .vertical(#ffffff, #f1f1f1);
.box-shadow(none);
border: 1px solid #e5e5e5;
}
+// Lighten vertical dividers
+.navbar-subnav .divider-vertical {
+ background-color: #f1f1f1;
+ border-right-color: #ffffff;
+}
+
+
// Change link colors back
.navbar-subnav .nav > li > a {
color: @linkColor;
@@ -401,7 +405,10 @@
.navbar-subnav .nav > .active > a,
.navbar-subnav .nav > .active > a:hover {
color: #777;
- background-color: #e5e5e5;
+ background-color: #eee;
+ -webkit-box-shadow: -1px 0 0 rgba(255,255,255,.5), 1px 0 0 rgba(255,255,255,.5);
+ -moz-box-shadow: -1px 0 0 rgba(255,255,255,.5), 1px 0 0 rgba(255,255,255,.5);
+ box-shadow: -1px 0 0 rgba(255,255,255,.5), 1px 0 0 rgba(255,255,255,.5);
}
// Dropdown carets
@@ -411,6 +418,21 @@
border-bottom-color: @linkColor;
}
+// Reset search input form
+.navbar-subnav .search-query {
+ background-color: #fff;
+ border-color: #ccc;
+ .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.25)");
+
+ // On :focus, keep the same padding and border
+ &:focus,
+ &.focused {
+ padding: 4px 9px;
+ border: 1px solid rgba(82,168,236,.8);
+ .box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6)");
+ }
+}
+
// Open dropdown dropdown-toggle
.navbar-subnav .nav .open > a {
color: @linkColorHover;
View
3 less/pager.less
@@ -4,8 +4,7 @@
.pager {
- margin-left: 0;
- margin-bottom: @baseLineHeight;
+ margin: @baseLineHeight 0;
list-style: none;
text-align: center;
.clearfix();
View
2 less/progress-bars.less
@@ -54,7 +54,7 @@
// Bar of progress
.progress .bar {
width: 0%;
- height: 18px;
+ height: 100%;
color: @white;
font-size: 12px;
text-align: center;
View
5 less/thumbnails.less
@@ -27,10 +27,10 @@
.thumbnail {
display: block;
padding: 4px;
- line-height: 1;
+ line-height: 20px;
border: 1px solid #ddd;
.border-radius(4px);
- .box-shadow(0 1px 1px rgba(0,0,0,.075));
+ .box-shadow(0 1px 3px rgba(0,0,0,.055));
}
// Add a hover state for linked versions only
a.thumbnail:hover {
@@ -47,4 +47,5 @@ a.thumbnail:hover {
}
.thumbnail .caption {
padding: 9px;
+ color: @gray;
}
View
76 less/type.less
@@ -3,8 +3,8 @@
// --------------------------------------------------
-// BODY TEXT
-// ---------
+// Body text
+// -------------------------
p {
margin: 0 0 @baseLineHeight / 2;
@@ -20,73 +20,49 @@ p {
line-height: @baseLineHeight * 1.5;
}
-// HEADINGS
-// --------
+
+// Headings
+// -------------------------
h1, h2, h3, h4, h5, h6 {
- margin: 0;
+ margin: (@baseLineHeight / 2) 0;
font-family: @headingsFontFamily;
font-weight: @headingsFontWeight;
+ line-height: 1;
color: @headingsColor;
text-rendering: optimizelegibility; // Fix the character spacing for headings
small {
font-weight: normal;
+ line-height: 1;
color: @grayLight;
}
}
-h1 {
- font-size: 30px;
- line-height: @baseLineHeight * 2;
- small {
- font-size: 18px;
- }
-}
-h2 {
- font-size: 24px;
- line-height: @baseLineHeight * 2;
- small {
- font-size: 18px;
- }
-}
-h3 {
- font-size: 18px;
- line-height: @baseLineHeight * 1.5;
- small {
- font-size: 14px;
- }
-}
-h4, h5, h6 {
- line-height: @baseLineHeight;
-}
-h4 {
- font-size: 14px;
- small {
- font-size: 12px;
- }
-}
-h5 {
- font-size: 12px;
-}
-h6 {
- font-size: 11px;
- color: @grayLight;
- text-transform: uppercase;
-}
+h1 { font-size: 36px; line-height: 40px; }
+h2 { font-size: 30px; line-height: 40px; }
+h3 { font-size: 24px; line-height: 40px; }
+h4 { font-size: 18px; line-height: 20px; }
+h5 { font-size: 14px; line-height: 20px; }
+h6 { font-size: 12px; line-height: 20px; }
+
+h1 small { font-size: 24px; }
+h2 small { font-size: 18px; }
+h3 small { font-size: 14px; }
+h4 small { font-size: 14px; }
+
// Page header
+// -------------------------
+
.page-header {
- padding-bottom: @baseLineHeight - 1;
- margin: @baseLineHeight 0;
+ padding-bottom: (@baseLineHeight / 2) - 1;
+ margin: @baseLineHeight 0 (@baseLineHeight * 1.5);
border-bottom: 1px solid @grayLighter;
}
-.page-header h1 {
- line-height: 1;
-}
-// LISTS
-// -----
+// Lists
+// --------------------------------------------------
// Unordered and Ordered lists
ul, ol {
View
28 less/variables.less
@@ -46,11 +46,11 @@
// -------------------------
@sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif;
@serifFontFamily: Georgia, "Times New Roman", Times, serif;
-@monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace;
+@monoFontFamily: Monaco, Menlo, Consolas, "Courier New", monospace;
-@baseFontSize: 13px;
+@baseFontSize: 14px;
@baseFontFamily: @sansFontFamily;
-@baseLineHeight: 18px;
+@baseLineHeight: 20px;
@altFontFamily: @serifFontFamily;
@headingsFontFamily: inherit; // empty to use BS default, @baseFontFamily
@@ -73,7 +73,7 @@
@btnBorder: #ccc;
@btnPrimaryBackground: @linkColor;
-@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
+@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%);
@btnInfoBackground: #5bc0de;
@btnInfoBackgroundHighlight: #2f96b4;
@@ -87,7 +87,7 @@
@btnDangerBackground: #ee5f5b;
@btnDangerBackgroundHighlight: #bd362f;
-@btnInverseBackground: @gray;
+@btnInverseBackground: #444;
@btnInverseBackgroundHighlight: @grayDarker;
@@ -155,8 +155,8 @@
// Navbar
// -------------------------
@navbarHeight: 40px;
-@navbarBackground: @grayDarker;
-@navbarBackgroundHighlight: @grayDark;
+@navbarBackground: #111;
+@navbarBackgroundHighlight: #222;
@navbarText: @grayLight;
@navbarLinkColor: @grayLight;
@@ -213,21 +213,23 @@
// 1200px min
@gridColumnWidth1200: 70px;
@gridGutterWidth1200: 30px;
+@gridRowWidth1200: (@gridColumns * @gridColumnWidth1200) + (@gridGutterWidth1200 * (@gridColumns - 1));
// 768px-979px
@gridColumnWidth768: 42px;
@gridGutterWidth768: 20px;
+@gridRowWidth768: (@gridColumns * @gridColumnWidth768) + (@gridGutterWidth768 * (@gridColumns - 1));
// Fluid grid
// -------------------------
-@fluidGridColumnWidth: 6.382978723%;
-@fluidGridGutterWidth: 2.127659574%;
+@fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth);
+@fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth);
// 1200px min
-@fluidGridColumnWidth1200: 5.982905983%;
-@fluidGridGutterWidth1200: 2.564102564%;
+@fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200);
+@fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200);
// 768px-979px
-@fluidGridColumnWidth768: 5.801104972%;
-@fluidGridGutterWidth768: 2.762430939%;
+@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
+@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);
View
7 page-blog.php
@@ -43,10 +43,11 @@
<a href="<?php the_permalink(); ?>" title="<?php the_title();?>"><h3><?php the_title();?></h3></a>
<p class="meta"><?php echo bootstrapwp_posted_on();?></p>
<div class="row">
- <div class="span2"><?php // Checking for a post thumbnail
- if ( has_post_thumbnail() ) ?>
+ <div class="span2">
+
<a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" >
- <?php the_post_thumbnail();?></a>
+ <?php echo bootstrapwp_autoset_featured_img(); ?></a>
+
</div><!-- /.span2 -->
<div class="span6">
<?php the_excerpt();?>
View
2,370 page-styleguide.php
1,165 additions, 1,205 deletions not shown because the diff is too large. Please use a local Git client to view these changes.

0 comments on commit 0cb2a73

Please sign in to comment.
Something went wrong with that request. Please try again.