Skip to content

Commit

Permalink
Merge pull request #60 from jdmdigital/development
Browse files Browse the repository at this point in the history
Small Fixes
  • Loading branch information
jdmdigital committed Apr 7, 2016
2 parents 7b1114c + 372d793 commit c6d19a5
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 21 deletions.
4 changes: 2 additions & 2 deletions css/parent.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
Bootplate Parent CSS is just the basics
This (simplified) stylesheet is only loaded when a child theme is in use.
v0.6
v1.1
*/

@-webkit-viewport { width: device-width; }
Expand Down Expand Up @@ -278,7 +278,7 @@ article h4, article .h4{font-size:24px;}
.jumbotron .display-3{font-size:400%;font-size: 6rem; }
.jumbotron .h2{font-size:50px;}
.flexbox .full-height h1{margin-top:-100px;}
.hidden-md-up, .nav > li.hidden-md-up{display:none;}{display:none;}
.hidden-md-up, .nav > li.hidden-md-up{display:none;}
.hidden-sm{display:block;}
.category .subsection .row article{min-height:200px; margin-bottom:1rem;}
.text-input.small{width:15%;}
Expand Down
6 changes: 3 additions & 3 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* ///
* (o 0)
* ======o00o-(_)-o00o======
* Bootplate v1.0 Main Functions
* Bootplate v1.1 Main Functions
* @link https://github.com/jdmdigital/bootplate
* Made with love by @jdmdigital
* =========================
Expand All @@ -22,7 +22,7 @@
* GNU General Public License for more details.
*/

define('VERSION', 1.0);
define('VERSION', 1.1);
define("REPO", 'https://github.com/jdmdigital/bootplate');
define("BRANCH", '');

Expand Down Expand Up @@ -77,7 +77,7 @@ function bootplate_setup(){
register_nav_menus( array(
'primary' => __( 'Primary Menu', 'bootplate' ),
'primary-left' => __( 'Primary Menu (left)', 'bootplate' ),
'blogcats' => __( 'Blog Categories Menu', 'bootplate' ),
//'blogcats' => __( 'Blog Categories Menu', 'bootplate' ), - Not using this since v1.1
'footer' => __( 'Footer Links Menu', 'bootplate' ),
'social' => __( 'Social Links Menu', 'bootplate' ),
) );
Expand Down
25 changes: 16 additions & 9 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,25 @@

<?php if ( have_posts() ) : ?>

<?php
while ( have_posts() ) : the_post();
get_template_part( 'content', get_post_format() );
endwhile;
?>
<?php while ( have_posts() ) : the_post() ; ?>
<header class="<?php echo header_classes(); ?>">
<div class="container">
<?php the_title( '<h1>', '</h1>' ); ?>
<?php if(have_bootplate_subtitle()) { bootplate_subtitle(); } ?>
</div><!--/.container-->
</header>
<section>
<div class="container">
<div class="row">
<?php get_template_part( 'content', get_post_format() ); ?>
</div>
</div>
</section>
<?php endwhile; ?>

<?php else : ?>

<?php
// No Posts Found
get_template_part( 'content', 'none' );
?>
<?php get_template_part( 'content', 'none' ); ?>

<?php endif; // if posts ?>

Expand Down
4 changes: 2 additions & 2 deletions js/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Main JS functions and function settings
v 0.5
v 1.1
*/

// for .full-height when VH CSS until not understood.
Expand All @@ -18,7 +18,7 @@ $( document ).ready(function() {

// Hamberger Cross
if($('nav.hamburger-cross').length) {
var trigger = $('.navbar-toggler'), isClosed = false;
var trigger = $('.hamburger-cross .navbar-toggler'), isClosed = false;
trigger.click(function () {
hamburger_cross();
});
Expand Down
10 changes: 7 additions & 3 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Contributors: jdm-labs
Requires at least: WordPress 4.1
Tested up to: WordPress 4.4.2
Version: 1.0
Version: 1.1
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Tags: black, blue, gray, purple, white, dark, light, left-sidebar, right-sidebar, full-width, responsive-layout, Twitter Bootstrap, HTML5, editor-style, featured-images, post-formats
Expand Down Expand Up @@ -69,11 +69,15 @@ Source: http://modernizr.com/download/?-borderradius-boxshadow-cssremunit-cssvhu

== Upgrade Notice ==

= 0.9 =
Security patch in customizer function fixed.
= 1.1 =
Small syntax fixes

== Changelog ==

= 1.1 =
* syntax fixes in style.css and parent.css
* main.js hamberger-cross selector fixed

= 0.9 =
* Security patch

Expand Down
4 changes: 2 additions & 2 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Theme Name: Bootplate
Theme URI: http://bootplate.jdmdigital.co
Description: A wicked-fast, mobile-first, Bootstrap v4 theme framework for building awesome WordPress websites.
Version: 1.0
Version: 1.1
License: GNU General Public License version 2.0
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Author: JDM Digital
Expand Down Expand Up @@ -660,7 +660,7 @@ article h4, article .h4{font-size:24px;}
.jumbotron .display-3{font-size:400%;font-size: 6rem; }
.jumbotron .h2{font-size:50px;}
.flexbox .full-height h1{margin-top:-100px;}
.hidden-md-up, .nav > li.hidden-md-up{display:none;}{display:none;}
.hidden-md-up, .nav > li.hidden-md-up{display:none;}
.hidden-sm{display:block;}
.category .subsection .row article{min-height:200px; margin-bottom:1rem;}
.text-input.small{width:15%;}
Expand Down

0 comments on commit c6d19a5

Please sign in to comment.