framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master, update to Bootstrap 2.2.1

Browse Source
This commit is contained in:
Ben Word
2012-11-01 09:28:34 -05:00
parent 85b0f59455 b843a0fee8
commit ac18e86fe8
22 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -1,4 +1,6 @@
### HEAD ### HEAD
* Update to Bootstrap 2.2.1
* Update conditional feed method
* Update to Bootstrap 2.2.0 * Update to Bootstrap 2.2.0
* Return instead of echo class names in `roots_main_class` and `roots_sidebar_class` * Return instead of echo class names in `roots_main_class` and `roots_sidebar_class`
* Move nav customizations into `lib/nav.php` * Move nav customizations into `lib/nav.php`

2
assets/css/less/bootstrap/bootstrap.less vendored
View File

@@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v2.2.0 * Bootstrap v2.2.1
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0

2
assets/css/less/bootstrap/responsive.less
View File

@@ -1,5 +1,5 @@
/*! /*!
* Bootstrap Responsive v2.2.0 * Bootstrap Responsive v2.2.1
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0

4
assets/css/main.css
View File

@@ -1,5 +1,5 @@
/*! /*!
* Bootstrap v2.2.0 * Bootstrap v2.2.1
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
@@ -5893,7 +5893,7 @@ a.badge:hover {
} }
/*! /*!
* Bootstrap Responsive v2.2.0 * Bootstrap Responsive v2.2.1
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0

4
assets/css/main.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
assets/js/plugins/bootstrap/bootstrap-affix.js vendored
View File

@@ -1,5 +1,5 @@
/* ========================================================== /* ==========================================================
* bootstrap-affix.js v2.2.0 * bootstrap-affix.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#affix * http://twitter.github.com/bootstrap/javascript.html#affix
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

2
assets/js/plugins/bootstrap/bootstrap-alert.js vendored
View File

@@ -1,5 +1,5 @@
/* ========================================================== /* ==========================================================
* bootstrap-alert.js v2.2.0 * bootstrap-alert.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#alerts * http://twitter.github.com/bootstrap/javascript.html#alerts
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

2
assets/js/plugins/bootstrap/bootstrap-button.js vendored
View File

@@ -1,5 +1,5 @@
/* ============================================================ /* ============================================================
* bootstrap-button.js v2.2.0 * bootstrap-button.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#buttons * http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

4
assets/js/plugins/bootstrap/bootstrap-carousel.js vendored
View File

@@ -1,5 +1,5 @@
/* ========================================================== /* ==========================================================
* bootstrap-carousel.js v2.2.0 * bootstrap-carousel.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#carousel * http://twitter.github.com/bootstrap/javascript.html#carousel
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@@ -168,7 +168,7 @@
$(document).on('click.carousel.data-api', '[data-slide]', function (e) { $(document).on('click.carousel.data-api', '[data-slide]', function (e) {
var $this = $(this), href var $this = $(this), href
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
, options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data()) , options = $.extend({}, $target.data(), $this.data())
$target.carousel(options) $target.carousel(options)
e.preventDefault() e.preventDefault()
}) })

2
assets/js/plugins/bootstrap/bootstrap-collapse.js vendored
View File

@@ -1,5 +1,5 @@
/* ============================================================= /* =============================================================
* bootstrap-collapse.js v2.2.0 * bootstrap-collapse.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#collapse * http://twitter.github.com/bootstrap/javascript.html#collapse
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

2
assets/js/plugins/bootstrap/bootstrap-dropdown.js vendored
View File

@@ -1,5 +1,5 @@
/* ============================================================ /* ============================================================
* bootstrap-dropdown.js v2.2.0 * bootstrap-dropdown.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns * http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

2
assets/js/plugins/bootstrap/bootstrap-modal.js vendored
View File

@@ -1,5 +1,5 @@
/* ========================================================= /* =========================================================
* bootstrap-modal.js v2.2.0 * bootstrap-modal.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#modals * http://twitter.github.com/bootstrap/javascript.html#modals
* ========================================================= * =========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

2
assets/js/plugins/bootstrap/bootstrap-popover.js vendored
View File

@@ -1,5 +1,5 @@
/* =========================================================== /* ===========================================================
* bootstrap-popover.js v2.2.0 * bootstrap-popover.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#popovers * http://twitter.github.com/bootstrap/javascript.html#popovers
* =========================================================== * ===========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

2
assets/js/plugins/bootstrap/bootstrap-scrollspy.js vendored
View File

@@ -1,5 +1,5 @@
/* ============================================================= /* =============================================================
* bootstrap-scrollspy.js v2.2.0 * bootstrap-scrollspy.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy * http://twitter.github.com/bootstrap/javascript.html#scrollspy
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

2
assets/js/plugins/bootstrap/bootstrap-tab.js vendored
View File

@@ -1,5 +1,5 @@
/* ======================================================== /* ========================================================
* bootstrap-tab.js v2.2.0 * bootstrap-tab.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#tabs * http://twitter.github.com/bootstrap/javascript.html#tabs
* ======================================================== * ========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

2
assets/js/plugins/bootstrap/bootstrap-tooltip.js vendored
View File

@@ -1,5 +1,5 @@
/* =========================================================== /* ===========================================================
* bootstrap-tooltip.js v2.2.0 * bootstrap-tooltip.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#tooltips * http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame * Inspired by the original jQuery.tipsy by Jason Frame
* =========================================================== * ===========================================================

2
assets/js/plugins/bootstrap/bootstrap-transition.js vendored
View File

@@ -1,5 +1,5 @@
/* =================================================== /* ===================================================
* bootstrap-transition.js v2.2.0 * bootstrap-transition.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#transitions * http://twitter.github.com/bootstrap/javascript.html#transitions
* =================================================== * ===================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

2
assets/js/plugins/bootstrap/bootstrap-typeahead.js vendored
View File

@@ -1,5 +1,5 @@
/* ============================================================= /* =============================================================
* bootstrap-typeahead.js v2.2.0 * bootstrap-typeahead.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#typeahead * http://twitter.github.com/bootstrap/javascript.html#typeahead
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

26
assets/js/scripts.js
View File

@@ -1,5 +1,5 @@
/* =================================================== /* ===================================================
* bootstrap-transition.js v2.2.0 * bootstrap-transition.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#transitions * http://twitter.github.com/bootstrap/javascript.html#transitions
* =================================================== * ===================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@@ -59,7 +59,7 @@
}(window.jQuery); }(window.jQuery);
/* ========================================================== /* ==========================================================
* bootstrap-alert.js v2.2.0 * bootstrap-alert.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#alerts * http://twitter.github.com/bootstrap/javascript.html#alerts
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@@ -147,7 +147,7 @@
}(window.jQuery); }(window.jQuery);
/* ============================================================ /* ============================================================
* bootstrap-button.js v2.2.0 * bootstrap-button.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#buttons * http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@@ -241,7 +241,7 @@
}(window.jQuery); }(window.jQuery);
/* ========================================================== /* ==========================================================
* bootstrap-carousel.js v2.2.0 * bootstrap-carousel.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#carousel * http://twitter.github.com/bootstrap/javascript.html#carousel
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@@ -410,14 +410,14 @@
$(document).on('click.carousel.data-api', '[data-slide]', function (e) { $(document).on('click.carousel.data-api', '[data-slide]', function (e) {
var $this = $(this), href var $this = $(this), href
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
, options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data()) , options = $.extend({}, $target.data(), $this.data())
$target.carousel(options) $target.carousel(options)
e.preventDefault() e.preventDefault()
}) })
}(window.jQuery); }(window.jQuery);
/* ============================================================= /* =============================================================
* bootstrap-collapse.js v2.2.0 * bootstrap-collapse.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#collapse * http://twitter.github.com/bootstrap/javascript.html#collapse
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@@ -573,7 +573,7 @@
}(window.jQuery); }(window.jQuery);
/* ============================================================ /* ============================================================
* bootstrap-dropdown.js v2.2.0 * bootstrap-dropdown.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns * http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@@ -721,7 +721,7 @@
}(window.jQuery); }(window.jQuery);
/* ========================================================= /* =========================================================
* bootstrap-modal.js v2.2.0 * bootstrap-modal.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#modals * http://twitter.github.com/bootstrap/javascript.html#modals
* ========================================================= * =========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@@ -956,7 +956,7 @@
}(window.jQuery); }(window.jQuery);
/* =========================================================== /* ===========================================================
* bootstrap-tooltip.js v2.2.0 * bootstrap-tooltip.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#tooltips * http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame * Inspired by the original jQuery.tipsy by Jason Frame
* =========================================================== * ===========================================================
@@ -1232,7 +1232,7 @@
}(window.jQuery); }(window.jQuery);
/* =========================================================== /* ===========================================================
* bootstrap-popover.js v2.2.0 * bootstrap-popover.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#popovers * http://twitter.github.com/bootstrap/javascript.html#popovers
* =========================================================== * ===========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@@ -1335,7 +1335,7 @@
}(window.jQuery); }(window.jQuery);
/* ============================================================= /* =============================================================
* bootstrap-scrollspy.js v2.2.0 * bootstrap-scrollspy.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy * http://twitter.github.com/bootstrap/javascript.html#scrollspy
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@@ -1486,7 +1486,7 @@
}(window.jQuery); }(window.jQuery);
/* ======================================================== /* ========================================================
* bootstrap-tab.js v2.2.0 * bootstrap-tab.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#tabs * http://twitter.github.com/bootstrap/javascript.html#tabs
* ======================================================== * ========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
@@ -1619,7 +1619,7 @@
}(window.jQuery); }(window.jQuery);
/* ============================================================= /* =============================================================
* bootstrap-typeahead.js v2.2.0 * bootstrap-typeahead.js v2.2.1
* http://twitter.github.com/bootstrap/javascript.html#typeahead * http://twitter.github.com/bootstrap/javascript.html#typeahead
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

2
assets/js/scripts.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
lib/scripts.php
View File

@@ -12,7 +12,7 @@
*/ */
function roots_scripts() { function roots_scripts() {
wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, 'f60c3bb06fe0e1fcf0f63cd76a4ec7c9'); wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, 'a66feb69f8e39965cd2a11e48a1448a6');
if (!is_admin()) { if (!is_admin()) {
wp_deregister_script('jquery'); wp_deregister_script('jquery');
@@ -23,7 +23,7 @@ function roots_scripts() {
wp_enqueue_script('comment-reply'); wp_enqueue_script('comment-reply');
} }
wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, 'f7de8c348d616069f4e6132e96518067', true); wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, '1c980f08acbf77c4709bea189d843756', true);
wp_enqueue_script('roots_scripts'); wp_enqueue_script('roots_scripts');
} }

4
templates/head.php
View File

@@ -15,7 +15,7 @@
<?php wp_head(); ?> <?php wp_head(); ?>
<?php if (have_posts()) : ?> <?php if (wp_count_posts()->publish > 0) : ?>
<link rel="alternate" type="application/rss+xml" title="<?php echo get_bloginfo('name'); ?> Feed" href="<?php echo home_url() ?>/feed/"> <link rel="alternate" type="application/rss+xml" title="<?php echo get_bloginfo('name'); ?> Feed" href="<?php echo home_url(); ?>/feed/">
<?php endif; ?> <?php endif; ?>
</head> </head>