Skip to content

WIP: 3.0.0 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
noahbass wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: 3.0.0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bbe93d
New js, fonts, and sass for 3.0.0
May 26, 2013
46f2fef
Added new bootstrap containers, rows, and columns
Jun 4, 2013
ad03551
.ds_store is gone and style.css is now located in wp.scss
Jun 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions 404.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php get_header(); ?>

<div id="content" class="clearfix row-fluid">
<div id="content" class="clearfix row">

<div id="main" class="span12 clearfix" role="main">
<div id="main" class="col col-lg-12 clearfix" role="main">

<article id="post-not-found" class="clearfix">

Expand All @@ -21,8 +21,8 @@

<p><?php _e("Whatever you were looking for was not found, but maybe try looking again or search using the form below.","bonestheme"); ?></p>

<div class="row-fluid">
<div class="span12">
<div class="row">
<div class="col col-lg-12">
<?php get_search_form(); ?>
</div>
</div>
Expand Down
5 changes: 1 addition & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ Stuff you need to start a WordPress project with Bootstrap and Sass.

## Discrepancies from [WordPress Bootstrap](https://github.com/320press/wordpress-bootstrap)

* All `.DS_Store` files have been deleted and git ignored.
* `style.css` is no longer called in the `functions.php` (look below).
* LESS has been replaced by Sass...
* LESS has been replaced by Sass

## Discrepancies from [Sass Twitter Bootstrap](https://github.com/jlong/sass-twitter-bootstrap)

* Organized `.scss` files in a `partials` folder.
* New file added named `_wp.scss` with stuff from `style.css` (with exception to the theme information).
* Added a [`_shame.scss`](http://csswizardry.com/2013/04/shame-css/).
4 changes: 2 additions & 2 deletions archive.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php get_header(); ?>

<div id="content" class="clearfix row-fluid">
<div id="content" class="clearfix row">

<div id="main" class="span8 clearfix" role="main">
<div id="main" class="col col-lg-8 clearfix" role="main">

<div class="page-header">
<?php if (is_category()) { ?>
Expand Down
4 changes: 2 additions & 2 deletions attachment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php get_header(); ?>

<div id="content" class="clearfix row-fluid">
<div id="content" class="clearfix row">

<div id="main" class="span8 clearfix" role="main">
<div id="main" class="col col-lg-8 clearfix" role="main">

<?php if (have_posts()) : while (have_posts()) : the_post(); ?>

Expand Down
4 changes: 2 additions & 2 deletions author.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php get_header(); ?>

<div id="content" class="clearfix row-fluid">
<div id="content" class="clearfix row">

<div id="main" class="span8 clearfix" role="main">
<div id="main" class="col col-lg-8 clearfix" role="main">

<div class="page-header"><h1 class="archive_title h2">
<span><?php _e("Posts By:", "bonestheme"); ?></span>
Expand Down
4 changes: 2 additions & 2 deletions footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<?php bones_footer_links(); // Adjust using Menus in Wordpress Admin ?>
</nav>

<p class="pull-right muted">Mashing together <a href="https://github.com/jlong/sass-twitter-bootstrap">Sass Twitter Bootstrap</a> and <a href="http://320press.com/wpbs">WordPress Bootstrap</a>.</p>
<p class="pull-right"><a href="http://320press.com" id="credit320" title="By the dudes of 320press">320press</a></p>

<p class="attribution muted">&copy; <?php bloginfo('name'); ?></p>
<p class="attribution">&copy; <?php bloginfo('name'); ?></p>

</div> <!-- end #inner-footer -->

Expand Down
3 changes: 0 additions & 3 deletions functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,10 +474,7 @@ function add_active_class($classes, $item) {
function theme_styles() {
// This is the compiled css file from LESS - this means you compile the LESS file locally and put it in the appropriate directory if you want to make any changes to the master bootstrap.css.
wp_register_style( 'bootstrap', get_template_directory_uri() . '/library/css/bootstrap.css', array(), '1.0', 'all' );
wp_register_style( 'bootstrap-responsive', get_template_directory_uri() . '/library/css/responsive.css', array(), '1.0', 'all' );

wp_enqueue_style( 'bootstrap' );
wp_enqueue_style( 'bootstrap-responsive' );
}
}
add_action( 'wp_enqueue_scripts', 'theme_styles' );
Expand Down
60 changes: 27 additions & 33 deletions header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!doctype html>

<!--[if IEMobile 7 ]> <html <?php language_attributes(); ?>class="no-js iem7"> <![endif]-->
<!--[if lt IE 7 ]> <html <?php language_attributes(); ?> class="no-js ie6"> <![endif]-->
Expand Down Expand Up @@ -39,39 +39,33 @@
<body <?php body_class(); ?>>

<header role="banner">

<div id="inner-header" class="clearfix">

<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid nav-container">
<nav role="navigation">
<a class="brand" id="logo" title="<?php echo get_bloginfo('description'); ?>" href="<?php echo home_url(); ?>"><?php bloginfo('name'); ?></a>

<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>

<div class="nav-collapse">
<?php bones_main_nav(); // Adjust using Menus in Wordpress Admin ?>
</div>

</nav>

<?php if(of_get_option('search_bar', '1')) {?>
<form class="navbar-search pull-right" role="search" method="get" id="searchform" action="<?php echo home_url( '/' ); ?>">
<input name="s" id="s" type="text" class="search-query" autocomplete="off" placeholder="<?php _e('Search','bonestheme'); ?>" data-provide="typeahead" data-items="4" data-source='<?php echo $typeahead_data; ?>'>
</form>
<?php } ?>

</div> <!-- end .nav-container -->
</div> <!-- end .navbar-inner -->
</div> <!-- end .navbar -->

</div> <!-- end #inner-header -->
<div class="navbar navbar-fixed-top">
<div class="container">

<a class="navbar-brand" title="<?php echo get_bloginfo('description'); ?>" href="<?php echo home_url(); ?>"><?php bloginfo('name'); ?></a>

<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>

<!--<a class="brand" id="logo" title="<?php echo get_bloginfo('description'); ?>" href="<?php echo home_url(); ?>"><?php bloginfo('name'); ?></a>-->

<div class="nav-collapse collapse navbar-responsive-collapse">
<?php bones_main_nav(); // Adjust using Menus in Wordpress Admin ?>
</div>

<?php if(of_get_option('search_bar', '1')) {?>
<form class="navbar-search pull-right" role="search" method="get" id="searchform" action="<?php echo home_url( '/' ); ?>">
<input name="s" id="s" type="text" class="search-query" autocomplete="off" placeholder="<?php _e('Search','bonestheme'); ?>" data-provide="typeahead" data-items="4" data-source='<?php echo $typeahead_data; ?>'>
</form>
<?php } ?>

</div> <!-- end .container -->
</div> <!-- end .navbar -->

</header> <!-- end header -->

<div class="container-fluid">
<div class="container">
6 changes: 3 additions & 3 deletions image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

get_header(); ?>

<div id="content" class="clearfix row-fluid">
<div id="content" class="clearfix row">

<div id="main" class="span8 clearfix" role="main">
<div id="main" class="col col-lg-8 clearfix" role="main">

<?php if (have_posts()) : while (have_posts()) : the_post(); ?>

Expand Down Expand Up @@ -77,7 +77,7 @@

</div> <!-- end #main -->

<div id="sidebar1" class="span4 fluid-sidebar sidebar" role="complementary">
<div id="sidebar1" class="col col-lg-4 fluid-sidebar sidebar" role="complementary">

<?php if ( !empty($post->post_excerpt) ) { ?>
<p class="alert alert-block success"><?php echo get_the_excerpt(); ?></p>
Expand Down
6 changes: 3 additions & 3 deletions index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$blog_hero = of_get_option('blog_hero');
if ($blog_hero){
?>
<div class="clearfix row-fluid">
<div class="clearfix row">
<div class="hero-unit">

<h1><?php bloginfo('title'); ?></h1>
Expand All @@ -17,9 +17,9 @@
}
?>

<div id="content" class="clearfix row-fluid">
<div id="content" class="clearfix row">

<div id="main" class="span8 clearfix" role="main">
<div id="main" class="col col-lg-8 clearfix" role="main">

<?php if (have_posts()) : while (have_posts()) : the_post(); ?>

Expand Down
Loading