Skip to content

Commit

Permalink
migration to BS3 first step
Browse files Browse the repository at this point in the history
  • Loading branch information
@shprink
shprink committed Aug 26, 2013
1 parent 98ffe79 commit 0c712c7
Show file tree
Hide file tree
Showing 37 changed files with 1,199 additions and 433 deletions.
16 changes: 0 additions & 16 deletions admin/functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,14 +315,6 @@ function shprinkone_get_theme_templates() {
'colors' => array('#EEEEEE', '#FFFFFF', '#09d', '#666666'),
'description' => __('Silvery and sleek.', 'shprinkone')
);
$templateList['spruce'] = array(
'name' => 'Spruce',
'value' => 'spruce',
'author' => 'http://bootswatch.com/',
'path' => '/css/spruce.bootswatch.min.css',
'colors' => array('#013435', '#FFFFFF', '#015B4E', '#555555'),
'description' => __('Camping in the woods.', 'shprinkone')
);
$templateList['simplex'] = array(
'name' => 'Simplex',
'value' => 'simplex',
Expand All @@ -339,14 +331,6 @@ function shprinkone_get_theme_templates() {
'colors' => array('#FFFFFF', '#FFFFFF', '#777777', '#777777'),
'description' => __('Crisp like a new sheet of paper.', 'shprinkone')
);
$templateList['geo'] = array(
'name' => 'Geo',
'value' => 'geo',
'author' => 'http://divshot.github.io/geo-bootstrap/',
'path' => '/css/geo.bootstrap.min.css',
'colors' => array('#000000', '#0000ff', '#00EEEE', '#ffff00'),
'description' => __('A special theme for April Fools\' Day', 'shprinkone')
);
$templateList['custom'] = array(
'name' => 'Custom',
'value' => 'custom',
Expand Down
10 changes: 5 additions & 5 deletions css/amelia.bootswatch.min.css
View file

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions css/bootstrap-responsive.min.css
View file

This file was deleted.

8 changes: 4 additions & 4 deletions css/bootstrap.min.css
100755 → 100644
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions css/cerulean.bootswatch.min.css
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions css/cosmo.bootswatch.min.css
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions css/cyborg.bootswatch.min.css
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions css/flaty.bootswatch.min.css
View file

Large diffs are not rendered by default.

406 changes: 384 additions & 22 deletions css/font-awesome-ie7.min.css
View file

Large diffs are not rendered by default.

436 changes: 403 additions & 33 deletions css/font-awesome.min.css
View file

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions css/geo.bootstrap.min.css
View file

This file was deleted.

10 changes: 5 additions & 5 deletions css/journal.bootswatch.min.css
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions css/readable.bootswatch.min.css
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions css/simplex.bootswatch.min.css
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions css/slate.bootswatch.min.css
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions css/spacelab.bootswatch.min.css
View file

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions css/spruce.bootswatch.min.css
View file

This file was deleted.

10 changes: 5 additions & 5 deletions css/united.bootswatch.min.css
View file

Large diffs are not rendered by default.

Binary file modified font/FontAwesome.otf
View file
Binary file not shown.
Binary file modified font/fontawesome-webfont.eot
View file
Binary file not shown.
191 changes: 153 additions & 38 deletions font/fontawesome-webfont.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified font/fontawesome-webfont.ttf
View file
Binary file not shown.
Binary file modified font/fontawesome-webfont.woff
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions footer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
<div class="footer-inner">
<div class="container">
<div class="row">
<div class="span3">
<div class="col-md-3 col-lg-3">
<?php if (is_active_sidebar('footer-widget-left')) : ?>
<?php dynamic_sidebar('footer-widget-left'); ?>
<?php endif; ?>
</div>
<div class="span3">
<div class="col-md-3 col-lg-3">
<?php if (is_active_sidebar('footer-widget-middle-left')) : ?>
<?php dynamic_sidebar('footer-widget-middle-left'); ?>
<?php endif; ?>
</div>
<div class="span3">
<div class="col-md-3 col-lg-3">
<?php if (is_active_sidebar('footer-widget-middle-right')) : ?>
<?php dynamic_sidebar('footer-widget-middle-right'); ?>
<?php endif; ?>
</div>
<div class="span3">
<div class="col-md-3 col-lg-3">
<?php if (is_active_sidebar('footer-widget-right')) : ?>
<?php dynamic_sidebar('footer-widget-right'); ?>
<?php endif; ?>
Expand All @@ -42,7 +42,7 @@
<div class="credit-inner">
<div class="container">
<div class="row">
<div class="span12">
<div class="col-md-12 col-lg-12">
<div class="pull-left">
&copy;
<?php echo date("Y"); ?>
Expand Down
8 changes: 4 additions & 4 deletions functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ function shprinkone_get_comments_number() {
* @since 1.0
*/
function shprinkone_get_post_meta( $inline = false, $author = true, $date = false, $category = true, $tag = true) {
$inline = ($inline) ? 'inline' : 'unstyled';
$inline = ($inline) ? 'list-inline' : 'list-unstyled';
$html = '<div class = "post-meta">';
$html .= '<ul class = "' . $inline . '">';
if ( $date ) {
Expand Down Expand Up @@ -502,7 +502,7 @@ function shprinkone_get_sidebar( $side ) {
$condition1 = ($side == 'left' && $layout == 'sidebar-content');
$condition2 = ($side == 'right' && $layout == 'content-sidebar');
if ( $condition1 || $condition2 ) {
echo '<div id="sidebar" class="span3"><div class="sidebar-inner">';
echo '<div id="sidebar" class="col-md-3 col-lg-3"><div class="sidebar-inner">';
get_sidebar();
echo '</div></div>';
}
Expand Down Expand Up @@ -532,10 +532,10 @@ function shprinkone_is_sidebar_active(){
*/
function shprinkone_get_contentspan() {
if ( !shprinkone_is_sidebar_active() ){
return 'span12';
return 'col-md-12 col-lg-12';
}
$options = shprinkone_get_theme_options();
return ($options['theme_layout'] == 'content') ? 'span12' : 'span9';
return ($options['theme_layout'] == 'content') ? 'col-md-12 col-lg-12' : 'col-md-9 col-lg-9';
}

/**
Expand Down
166 changes: 83 additions & 83 deletions header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,109 +10,109 @@
?>
<!DOCTYPE html>
<html <?php language_attributes(); ?>>
<head>
<meta charset="<?php bloginfo('charset'); ?>" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title><?php
/*
* Print the <title> tag based on what is being viewed.
*/
global $page, $paged;
<head>
<meta charset="<?php bloginfo('charset'); ?>" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title><?php
/*
* Print the <title> tag based on what is being viewed.
*/
global $page, $paged;

wp_title('|', true, 'right');
wp_title('|', true, 'right');

// Add the blog name.
bloginfo('name');
?>
</title>
<link rel="stylesheet" type="text/css"
href="<?php echo get_stylesheet_directory_uri() . $selectedTemplate['path']; ?>">
<link rel="stylesheet" type="text/css" media="all"
href="<?php bloginfo('stylesheet_url'); ?>" />
<script type="text/javascript"
src="<?php echo get_stylesheet_directory_uri(); ?>/js/jquery-1.8.3.min.js"></script>
<script type="text/javascript"
src="<?php echo get_stylesheet_directory_uri(); ?>/js/bootstrap.min.js"></script>
<script type="text/javascript"
src="<?php echo get_stylesheet_directory_uri(); ?>/js/jquery.masonry.min.js"></script>
<script type="text/javascript"
src="<?php echo get_stylesheet_directory_uri(); ?>/js/jquery.infinitescroll.min.js"></script>
bloginfo('name');
?>
</title>
<link rel="stylesheet" type="text/css"
href="<?php echo get_stylesheet_directory_uri() . $selectedTemplate['path']; ?>">
<link rel="stylesheet" type="text/css" media="all"
href="<?php bloginfo('stylesheet_url'); ?>" />
<script type="text/javascript"
src="<?php echo get_stylesheet_directory_uri(); ?>/js/jquery-1.8.3.min.js"></script>
<script type="text/javascript"
src="<?php echo get_stylesheet_directory_uri(); ?>/js/bootstrap.min.js"></script>
<script type="text/javascript"
src="<?php echo get_stylesheet_directory_uri(); ?>/js/jquery.masonry.min.js"></script>
<script type="text/javascript"
src="<?php echo get_stylesheet_directory_uri(); ?>/js/jquery.infinitescroll.min.js"></script>

<?php
/* We add some JavaScript to pages with the comment form
* to support sites with threaded comments (when in use).
*/
if ( is_singular() && get_option( 'thread_comments' ) )
wp_enqueue_script( 'comment-reply' );
<?php
/* We add some JavaScript to pages with the comment form
* to support sites with threaded comments (when in use).
*/
if (is_singular() && get_option('thread_comments'))
wp_enqueue_script('comment-reply');

/* Always have wp_head() just before the closing </head>
* tag of your theme, or you will break many plugins, which
* generally use this hook to add elements to <head> such
* as styles, scripts, and meta tags.
*/
wp_head();
?>
</head>
<body <?php body_class(); ?> data-spy="scroll" data-target=".navbar">
<header id="header">
<div class="navbar navbar-inverse navbar-header navbar-fixed-top">
<div class="navbar-inner">
/* Always have wp_head() just before the closing </head>
* tag of your theme, or you will break many plugins, which
* generally use this hook to add elements to <head> such
* as styles, scripts, and meta tags.
*/
wp_head();
?>
</head>
<body <?php body_class(); ?> data-spy="scroll" data-target=".navbar">
<header id="header">
<div class="navbar navbar-default navbar-fixed-top navbar-inverse" role="navigation">
<div class="container">
<a class="brand" href="<?php echo esc_url(home_url('/')); ?>"><i
class="icon-home icon-white"> </i> <?php echo bloginfo('name'); ?>
</a>
<!-- .btn-navbar is used as the toggle for collapsed navbar content -->
<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>
<!-- Everything you want hidden at 940px or less, place within here -->
<div class="nav-collapse collapse">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<?php echo esc_url(home_url('/')); ?>"><i
class="icon-home icon-white"> </i> <?php echo bloginfo('name'); ?>
</a>
</div>
<div class="collapse navbar-collapse navbar-ex1-collapse">
<?php
// Primary menu
$args = array(
'depth' => 3,
'container' => false,
'menu_class' => 'nav',
'walker' => new Bootstrap_Walker_Nav_Menu(),
'fallback_cb' => null
);
wp_nav_menu($args);
?>
<ul class="nav pull-right">
'depth' => 3,
'container' => false,
'menu_class' => 'nav navbar-nav',
'walker' => new Bootstrap_Walker_Nav_Menu(),
'fallback_cb' => null
);
wp_nav_menu($args);
?>

<ul class="nav navbar-nav pull-right">
<?php if (has_nav_menu('header-menu-right')): ?>
<li><?php
$args = array(
'theme_location' => 'header-menu-right',
'depth' => 3,
'container' => false,
'menu_class' => 'nav',
'walker' => new Bootstrap_Walker_Nav_Menu()
);
wp_nav_menu($args);
?>
</li>
<li><?php
$args = array(
'theme_location' => 'header-menu-right',
'depth' => 3,
'container' => false,
'menu_class' => 'nav',
'walker' => new Bootstrap_Walker_Nav_Menu()
);
wp_nav_menu($args);
?>
</li>
<?php endif; ?>
<li class="divider-vertical"></li>
<li><?php get_search_form(); ?>
</li>
<li><a href="<?php echo esc_url(home_url('?feed=rss2')); ?>"
title="<?php _e('Subscribe to the RSS feed', 'shprinkone') ?>">
<li><?php get_search_form(); ?></li>
<li>
<a href="<?php echo esc_url(home_url('?feed=rss2')); ?>"
title="<?php _e('Subscribe to the RSS feed', 'shprinkone') ?>">
<i class="icon-rss"> </i>
</a>
</a>
</li>
</ul>

</div>
</div>
</div>
</div>
<script>
$(function(){
<script>
$(function() {
// Add Bootstrap class to lists within the sidebar
$('#sidebar .widget ul').addClass('nav nav-pills nav-stacked');
$('footer .widget ul').addClass('nav nav-pills nav-stacked');
$('.widget_recent_comments ul').removeClass('nav nav-tabs nav-pills nav-stacked').addClass('unstyled');
});
</script>
</header>
</header>
2 changes: 1 addition & 1 deletion home.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class="container-slideshow well well-small">
<div class="container">
<div class="row">
<div class="span12">
<div class="col-md-12 col-lg-12">
<?php get_template_part('loop_home'); ?>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions image.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<?php if (have_posts()) while (have_posts()) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" <?php post_class('image-attachment'); ?>>
<?php if (has_post_thumbnail()): ?>
<div class="post-thumbnail img-polaroid">
<div class="post-thumbnail img-thumbnail">
<?php the_post_thumbnail('post-image-' . shprinkone_get_imagespan()); ?>
</div>
<?php endif; ?>
Expand Down Expand Up @@ -76,10 +76,10 @@
<?php shprinkone_link_pages(); ?>
<ul class="pager">
<li class="previous">
<?php previous_image_link(false, __( '<span class="span3"><i class="icon-chevron-left"></i> Previous</span>', 'shprinkone' )); ?>
<?php previous_image_link(false, __( '<span class="col-sm-3 col-md-3 col-lg-3"><i class="icon-chevron-left"></i> Previous</span>', 'shprinkone' )); ?>
</li>
<li class="next">
<?php next_image_link(false, __( '<span class="span3"><i class="icon-chevron-right"></i> Next</span>', 'shprinkone' )); ?>
<?php next_image_link(false, __( '<span class="col-sm-3 col-md-3 col-lg-3"><i class="icon-chevron-right"></i> Next</span>', 'shprinkone' )); ?>
</li>
</ul>
<?php comments_template('', true); ?>
Expand Down
10 changes: 5 additions & 5 deletions js/bootstrap.min.js
100755 → 100644
View file

Large diffs are not rendered by default.

Binary file modified lang/fr_FR.mo
View file
Binary file not shown.
Loading

0 comments on commit 0c712c7

Please sign in to comment.