Merge branch 'testing'

This commit is contained in:
Holger Könemann 2015-09-09 11:01:01 +02:00
commit 78535999bd
10 changed files with 156 additions and 91 deletions

126
css/theme.min.css vendored
View File

@ -1,27 +1,127 @@
@charset "UTF-8";
/*!
Theme Name: _s
Theme URI: http://underscores.me/
Author: Automattic
Author URI: http://automattic.com/
Description: Hi. I'm a starter theme called <code>_s</code>, or <em>underscores</em>, if you like. I'm a theme meant for hacking so don't use me as a <em>Parent Theme</em>. Instead try turning me into the next, most awesome, WordPress theme out there. That's what I'm here for.
Version: 1.0.0
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: _s
Tags:
This theme, like WordPress, is licensed under the GPL.
Use it to make something cool, have fun, and share what you've learned with others.
_s is based on Underscores http://underscores.me/, (C) 2012-2015 Automattic, Inc.
Underscores is distributed under the terms of the GNU GPL v2 or later.
Normalizing styles have been helped along thanks to the fine work of
Nicolas Gallagher and Jonathan Neal http://necolas.github.com/normalize.css/
*/
.screen-reader-text,.sr-only,svg:not(:root){overflow:hidden}
.clear:after,.comment-content:after,.dl-horizontal dd:after,.entry-content:after,.page-links,.site-content:after,.site-footer:after,.site-header:after,h1,h2,h3,h4,h5,h6{clear:both}
.comment-content a,pre{word-wrap:break-word}
.widget select,.wp-caption,embed,iframe,img,object,pre{max-width:100%}
cite,dfn,em,i{font-style:italic}
.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.pre-scrollable{max-height:340px}
.fa,.glyphicon{-moz-osx-font-smoothing:grayscale}
article,aside,details,figcaption,figure,footer,header,main,menu,nav,section,summary{display:block}
p{margin-bottom:1.5em}
address{margin:0 0 1.5em}
pre{background:#eee;margin-bottom:1.6em}
code,kbd,tt,var{font-family:Monaco,Consolas,"Andale Mono","DejaVu Sans Mono",monospace;font-size:15px;font-size:.9375rem}
abbr,acronym{border-bottom:1px dotted #666;cursor:help}
ins,mark{background:#fff9c0;text-decoration:none}
big{font-size:125%}
body{background:#fff}
blockquote,q{quotes:"" ""}
blockquote:after,blockquote:before,q:after,q:before{content:""}
hr{background-color:#ccc}
ol,ul{margin:0 0 1.5em 3em}
ul{list-style:disc}
ol{list-style:decimal}
li>ol,li>ul{margin-bottom:0;margin-left:1.5em}
dd{margin:0 1.5em 1.5em}
img{height:auto}
table{margin:0 0 1.5em;width:100%;border-collapse:collapse;border-spacing:0}
button,input[type=button],input[type=reset],input[type=submit]{border:1px solid;border-color:#ccc #ccc #bbb;border-radius:3px;background:#e6e6e6;box-shadow:inset 0 1px 0 rgba(255,255,255,.5),inset 0 15px 17px rgba(255,255,255,.5),inset 0 -5px 12px rgba(0,0,0,.05);color:rgba(0,0,0,.8);font-size:12px;font-size:.75rem;line-height:1;padding:.6em 1em .4em;text-shadow:0 1px 0 rgba(255,255,255,.8)}
button:hover,input[type=button]:hover,input[type=reset]:hover,input[type=submit]:hover{border-color:#ccc #bbb #aaa;box-shadow:inset 0 1px 0 rgba(255,255,255,.8),inset 0 15px 17px rgba(255,255,255,.8),inset 0 -5px 12px rgba(0,0,0,.02)}
button:active,button:focus,input[type=button]:active,input[type=button]:focus,input[type=reset]:active,input[type=reset]:focus,input[type=submit]:active,input[type=submit]:focus{border-color:#aaa #bbb #bbb;box-shadow:inset 0 -1px 0 rgba(255,255,255,.5),inset 0 2px 5px rgba(0,0,0,.15)}
input[type=text],input[type=email],input[type=url],input[type=password],input[type=search],textarea{color:#666;border:1px solid #ccc;border-radius:3px}
input[type=text]:focus,input[type=email]:focus,input[type=url]:focus,input[type=password]:focus,input[type=search]:focus,textarea:focus{color:#111}
input[type=text],input[type=email],input[type=url],input[type=password],input[type=search]{padding:3px}
textarea{padding-left:3px;width:100%}
a:visited{color:purple}
a:active,a:focus,a:hover{color:#191970}
.main-navigation{clear:both;display:block;float:left;width:100%}
.main-navigation ul{display:none;list-style:none;margin:0;padding-left:0}
.main-navigation ul ul{box-shadow:0 3px 3px rgba(0,0,0,.2);float:left;position:absolute;top:1.5em;left:-999em;z-index:99999}
.main-navigation ul ul ul{left:-999em;top:0}
.main-navigation ul ul li.focus>ul,.main-navigation ul ul li:hover>ul{left:100%}
.main-navigation ul ul a{width:200px}
.main-navigation ul li.focus>ul,.main-navigation ul li:hover>ul{left:auto}
.main-navigation li{float:left;position:relative}
.main-navigation a{display:block;text-decoration:none}
.main-navigation.toggled ul,.menu-toggle{display:block}
@media screen and (min-width:37.5em){.menu-toggle{display:none}
.main-navigation ul{display:block}
}
.site-main .comment-navigation,.site-main .post-navigation,.site-main .posts-navigation{margin:0 0 1.5em;overflow:hidden}
.comment-navigation .nav-previous,.post-navigation .nav-previous,.posts-navigation .nav-previous{float:left;width:50%}
.comment-navigation .nav-next,.post-navigation .nav-next,.posts-navigation .nav-next{float:right;text-align:right;width:50%}
.gallery-item,.wp-caption-text{text-align:center}
.screen-reader-text{clip:rect(1px,1px,1px,1px);position:absolute!important;height:1px;width:1px}
.screen-reader-text:active,.screen-reader-text:focus,.screen-reader-text:hover{background-color:#f1f1f1;border-radius:3px;box-shadow:0 0 2px 2px rgba(0,0,0,.6);clip:auto!important;color:#21759b;display:block;font-size:14px;font-size:.875rem;font-weight:700;height:auto;left:5px;line-height:normal;padding:15px 23px 14px;text-decoration:none;top:5px;width:auto;z-index:100000}
.alignleft{display:inline;float:left;margin-right:1.5em}
.alignright{display:inline;float:right;margin-left:1.5em}
.btn-group>.btn-group,.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.dropdown-menu{float:left}
.aligncenter{display:block;margin-left:auto;margin-right:auto}
.hentry,.widget{margin:0 0 1.5em}
.clear:after,.clear:before,.comment-content:after,.comment-content:before,.entry-content:after,.entry-content:before,.site-content:after,.site-content:before,.site-footer:after,.site-footer:before,.site-header:after,.site-header:before{content:"";display:table}
.widget_search .search-submit{display:none}
.sticky{display:block}
.byline,.updated:not(.published){display:none}
.group-blog .byline,.single .byline{display:inline}
.entry-content,.entry-summary,.page-content{margin:1.5em 0 0}
.page-links{margin:0 0 1.5em}
.archive .format-aside .entry-title,.blog .format-aside .entry-title{display:none}
.bypostauthor{display:block}
.infinite-scroll .posts-navigation,.infinite-scroll.neverending .site-footer{display:none}
.infinity-end.neverending .site-footer{display:block}
.comment-content .wp-smiley,.entry-content .wp-smiley,.page-content .wp-smiley{border:none;margin-bottom:0;margin-top:0;padding:0}
hr,img{border:0}
.wp-caption{margin-bottom:1.5em}
.wp-caption img[class*=wp-image-]{display:block;margin-left:auto;margin-right:auto}
.wp-caption .wp-caption-text{margin:.8075em 0}
.gallery{margin-bottom:1.5em}
body,figure{margin:0}
.gallery-item{display:inline-block;vertical-align:top;width:100%}
.gallery-caption,article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}
.label,sub,sup{vertical-align:baseline}
.btn,.btn-group,.btn-group-vertical,.caret,.checkbox-inline,.radio-inline,img{vertical-align:middle}
.gallery-columns-2 .gallery-item{max-width:50%}
.gallery-columns-3 .gallery-item{max-width:33.33%}
.gallery-columns-4 .gallery-item{max-width:25%}
.gallery-columns-5 .gallery-item{max-width:20%}
.gallery-columns-6 .gallery-item{max-width:16.66%}
.gallery-columns-7 .gallery-item{max-width:14.28%}
.gallery-columns-8 .gallery-item{max-width:12.5%}
.gallery-columns-9 .gallery-item{max-width:11.11%}
/*!
* Bootstrap v3.3.5 (http://getbootstrap.com)
* Copyright 2011-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
.label,sub,sup{vertical-align:baseline}
.btn,.btn-group,.btn-group-vertical,.caret,.checkbox-inline,.radio-inline,img{vertical-align:middle}
.sr-only,svg:not(:root){overflow:hidden}
hr,img{border:0}
body,figure{margin:0}
.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.pre-scrollable{max-height:340px}
.btn-group>.btn-group,.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.dropdown-menu{float:left}
.fa,.glyphicon{-moz-osx-font-smoothing:grayscale}
html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;font-size:10px;-webkit-tap-highlight-color:transparent}
article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}
html{box-sizing:border-box;font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;font-size:10px;-webkit-tap-highlight-color:transparent}
audio,canvas,progress,video{display:inline-block;vertical-align:baseline}
audio:not([controls]){display:none;height:0}
[hidden],template{display:none}
a{background-color:transparent}
a:active,a:hover{outline:0}
b,optgroup,strong{font-weight:700}
dfn{font-style:italic}
h1{margin:.67em 0}
mark{background:#ff0;color:#000}
sub,sup{font-size:75%;line-height:0;position:relative}
@ -39,7 +139,6 @@ button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}
input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}
input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}
table{border-collapse:collapse;border-spacing:0}
td,th{padding:0}
/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
@media print{blockquote,img,pre,tr{page-break-inside:avoid}
@ -397,7 +496,6 @@ dl{margin-bottom:20px}
dd,dt{line-height:1.42857}
dd{margin-left:0}
.dl-horizontal dd:after,.dl-horizontal dd:before{content:" ";display:table}
.dl-horizontal dd:after{clear:both}
@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
.dl-horizontal dd{margin-left:180px}
}
@ -418,7 +516,7 @@ code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}
code{color:#c7254e;background-color:#f9f2f4;border-radius:4px}
kbd{color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}
kbd kbd{padding:0;font-size:100%;box-shadow:none}
pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}
pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857;word-break:break-all;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}
.container-fluid:after,.container-fluid:before,.container:after,.container:before,.row:after,.row:before{display:table;content:" "}
.container,.container-fluid{margin-right:auto;margin-left:auto}
pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;border-radius:0}

View File

@ -57,3 +57,8 @@ require get_template_directory() . '/inc/jetpack.php';
* Load custom WordPress nav walker.
*/
require get_template_directory() . '/inc/bootstrap-wp-navwalker.php';
/**
* Load WooCommerce functions.
*/
require get_template_directory() . '/inc/woocommerce.php';

View File

@ -13,6 +13,7 @@
* Author: Edward McIntyre - @twittem
* License: GPL-2.0+
* License URI: http://www.gnu.org/licenses/gpl-2.0.txt
* @package understrap
*/
//exit if accessed directly
if(!defined('ABSPATH')) exit;

View File

@ -4,13 +4,13 @@
* http://codex.wordpress.org/Custom_Headers
*
* You can add an optional custom header image to header.php like so ...
<?php if ( get_header_image() ) : ?>
<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
<img src="<?php header_image(); ?>" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="">
</a>
<?php endif; // End header image check. ?>
*
* <?php if ( get_header_image() ) : ?>
* <a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
* <img src="<?php header_image(); ?>" width="<?php echo esc_attr( get_custom_header()->width ); ?>" height="<?php echo esc_attr( get_custom_header()->height ); ?>" alt="">
* </a>
* <?php endif; // End header image check. ?>
*
*
* @package understrap
*/

View File

@ -1,4 +1,9 @@
<?php
/**
* understrap enqueue scripts
*
* @package understrap
*/
function understrap_scripts() {
wp_enqueue_style( 'understrap-theme', get_stylesheet_directory_uri() . '/css/theme.min.css', array(), '0.2.8', false );

View File

@ -1,4 +1,9 @@
<?php
/**
* understrap - load the scripts
*
* @package understrap
*/
function understrap_scripts() {
wp_enqueue_style( 'understrap-theme', get_stylesheet_directory_uri() . '/css/theme.css', array(), '0.1', false );

View File

@ -1,6 +1,7 @@
<?php
/**
* Set the content width based on the theme's design and stylesheet.
* @package understrap
*/
if ( ! isset( $content_width ) ) {
$content_width = 640; /* pixels */
@ -78,12 +79,12 @@ endif; // understrap_setup
add_action( 'after_setup_theme', 'understrap_setup' );
/**
/* Removes Adminbar - Comment out if you want see the bar.
* Removes Adminbar - Comment out if you want see the bar.
*/
add_filter('show_admin_bar', '__return_false');
/**
/* Adding the Read more link to excerpts
* Adding the Read more link to excerpts
*/
/*function new_excerpt_more( $more ) {
return ' <p><a class="read-more btn btn-default" href="'. get_permalink( get_the_ID() ) . '">' . __('Read More', 'understrap') . '</a></p>';

View File

@ -1,4 +1,10 @@
<?php
/**
* Declaring widgets
*
*
* @package understrap
*/
function understrap_widgets_init() {
register_sidebar( array(
'name' => __( 'Sidebar', 'understrap' ),

12
inc/woocommerce.php Normal file
View File

@ -0,0 +1,12 @@
<?php
/**
* Add WooCommerce support
*
*
* @package understrap
*/
add_action( 'after_setup_theme', 'woocommerce_support' );
function woocommerce_support() {
add_theme_support( 'woocommerce' );
}

View File

@ -1,68 +0,0 @@
<?php
/*
WPUpdates Theme Updater Class
http://wp-updates.com
v2.0
Example Usage:
require_once('wp-updates-theme.php');
new WPUpdatesThemeUpdater_1114( 'http://wp-updates.com/api/2/theme', basename(get_template_directory()) );
*/
if( !class_exists('WPUpdatesThemeUpdater_1114') ) {
class WPUpdatesThemeUpdater_1114 {
var $api_url;
var $theme_id = 1114;
var $theme_slug;
var $license_key;
function __construct( $api_url, $theme_slug, $license_key = null ) {
$this->api_url = $api_url;
$this->theme_slug = $theme_slug;
$this->license_key = $license_key;
add_filter( 'pre_set_site_transient_update_themes', array(&$this, 'check_for_update') );
// This is for testing only!
//set_site_transient('update_themes', null);
}
function check_for_update( $transient ) {
if (empty($transient->checked)) return $transient;
$request_args = array(
'id' => $this->theme_id,
'slug' => $this->theme_slug,
'version' => $transient->checked[$this->theme_slug]
);
if ($this->license_key) $request_args['license'] = $this->license_key;
$request_string = $this->prepare_request( 'theme_update', $request_args );
$raw_response = wp_remote_post( $this->api_url, $request_string );
$response = null;
if( !is_wp_error($raw_response) && ($raw_response['response']['code'] == 200) )
$response = unserialize($raw_response['body']);
if( !empty($response) ) // Feed the update data into WP updater
$transient->response[$this->theme_slug] = $response;
return $transient;
}
function prepare_request( $action, $args ) {
global $wp_version;
return array(
'body' => array(
'action' => $action,
'request' => serialize($args),
'api-key' => md5(home_url())
),
'user-agent' => 'WordPress/'. $wp_version .'; '. home_url()
);
}
}
}