Skip to content
This repository has been archived by the owner on Sep 16, 2019. It is now read-only.

Fix Category page breadcrumb #984

Merged
merged 2 commits into from
May 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ before_script:
# Create WordPress database.
- mysql -e 'CREATE DATABASE wordpress_test;' -uroot
# Install CodeSniffer for WordPress Coding Standards checks.
- git clone https://github.com/squizlabs/PHP_CodeSniffer.git php-codesniffer --depth=1
- git clone -b 2.9 --single-branch https://github.com/squizlabs/PHP_CodeSniffer.git php-codesniffer --depth=1
# Install WordPress Coding Standards.
- git clone https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git wordpress-coding-standards --depth=1
# Hop into CodeSniffer directory.
Expand Down
55 changes: 27 additions & 28 deletions 404.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,34 @@

get_header(); ?>

<div class="row">
<div class="small-12 large-8 columns" role="main">

<article <?php post_class() ?> id="post-<?php the_ID(); ?>">
<header>
<h1 class="entry-title"><?php _e( 'File Not Found', 'foundationpress' ); ?></h1>
</header>
<div class="entry-content">
<div class="error">
<p class="bottom"><?php _e( 'The page you are looking for might have been removed, had its name changed, or is temporarily unavailable.', 'foundationpress' ); ?></p>
</div>
<p><?php _e( 'Please try the following:', 'foundationpress' ); ?></p>
<ul>
<li><?php _e( 'Check your spelling', 'foundationpress' ); ?></li>
<li>
<?php
/* translators: %s: home page url */
printf( __(
'Return to the <a href="%s">home page</a>', 'foundationpress' ),
home_url()
);
?>
</li>
<li><?php _e( 'Click the <a href="javascript:history.back()">Back</a> button', 'foundationpress' ); ?></li>
</ul>
<div class="main-wrap" role="main">
<article <?php post_class('main-content') ?> id="post-<?php the_ID(); ?>">
<header>
<h1 class="entry-title"><?php _e( 'File Not Found', 'foundationpress' ); ?></h1>
</header>
<div class="entry-content">
<div class="error">
<p class="bottom"><?php _e( 'The page you are looking for might have been removed, had its name changed, or is temporarily unavailable.', 'foundationpress' ); ?></p>
</div>
</article>
<p><?php _e( 'Please try the following:', 'foundationpress' ); ?></p>
<ul>
<li><?php _e( 'Check your spelling', 'foundationpress' ); ?></li>
<li>
<?php
/* translators: %s: home page url */
printf( __(
'Return to the <a href="%s">home page</a>', 'foundationpress' ),
home_url()
);
?>
</li>
<li><?php _e( 'Click the <a href="javascript:history.back()">Back</a> button', 'foundationpress' ); ?></li>
</ul>
</div>
</article>

<?php get_sidebar(); ?>

</div>
<?php get_sidebar(); ?>
</div>

<?php get_footer();
2 changes: 1 addition & 1 deletion archive.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

get_header(); ?>

<div id="page" role="main">
<div class="main-wrap" role="main">
<article class="main-content">
<?php if ( have_posts() ) : ?>

Expand Down
2 changes: 1 addition & 1 deletion assets/javascript/custom/stickyfooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

(function($) {

var $footer = $('#footer-container'); // only search once
var $footer = $('[data-sticky-footer]'); // only search once

$(window).bind('load resize orientationChange', function () {

Expand Down
2 changes: 1 addition & 1 deletion assets/scss/components/_featured-image.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#featured-hero {
.featured-hero {
background-size: cover;
background-position: center;
background-repeat: no-repeat;
Expand Down
6 changes: 1 addition & 5 deletions assets/scss/foundation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@

// Modules
@import "modules/navigation";
@import "modules/content";
@import "modules/footer";
@import "modules/sidebar";
@import "modules/editor-style";

// Components
Expand All @@ -90,7 +90,3 @@
// Templates
@import "templates/front";
@import "templates/kitchen-sink";
@import "templates/page-default";
@import "templates/page-sidebar-left";
@import "templates/page-full-width";
@import "templates/single-post";
19 changes: 9 additions & 10 deletions assets/scss/global/_settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,9 @@ $medium-gray: #cacaca;
$dark-gray: #8a8a8a;
$black: #0a0a0a;
$white: #fefefe;
$outer-space: #2c3840;
$body-background: $white;
$body-font-color: $black;
$body-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
$body-font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;
$body-antialiased: true;
$global-margin: 1rem;
$global-padding: 1rem;
Expand Down Expand Up @@ -434,7 +433,7 @@ $meter-fill-bad: $alert-color;

$offcanvas-size: 250px;
$offcanvas-vertical-size: 250px;
$offcanvas-background: $outer-space;
$offcanvas-background: $light-gray;
$offcanvas-shadow: 0 0 10px rgba($black, 0.7);
$offcanvas-push-zindex: 1;
$offcanvas-overlap-zindex: 10;
Expand Down Expand Up @@ -589,12 +588,12 @@ $thumbnail-radius: $global-radius;
// 35. Title Bar
// -------------

$titlebar-background: $outer-space;
$titlebar-color: $white;
$titlebar-background: $light-gray;
$titlebar-color: $body-font-color;
$titlebar-padding: 0.5rem;
$titlebar-text-font-weight: bold;
$titlebar-icon-color: $white;
$titlebar-icon-color-hover: $medium-gray;
$titlebar-icon-color: $body-font-color;
$titlebar-icon-color-hover: $black;
$titlebar-icon-spacing: 0.25rem;

// 36. Tooltip
Expand All @@ -613,9 +612,9 @@ $tooltip-radius: $global-radius;
// 37. Top Bar
// -----------

$topbar-padding: 0;
$topbar-background: $outer-space;
$topbar-submenu-background: $outer-space;
$topbar-padding: 0.5rem;
$topbar-background: $light-gray;
$topbar-submenu-background: $topbar-background;
$topbar-title-spacing: 0.5rem 1rem 0.5rem 0;
$topbar-input-width: 200px;
$topbar-unstack-breakpoint: medium;
51 changes: 51 additions & 0 deletions assets/scss/modules/_content.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
.main-wrap {
@include grid-row();
margin-top: 1rem;

@include breakpoint(medium) {
margin-top: 3rem;
}
}

.main-content {

// default 2 column
@include grid-column(12);
@include breakpoint(medium) {
@include grid-column(8);
}

// 1 column
.full-width.main-wrap & {
@include breakpoint(medium) {
@include grid-column(12);
}
}

// 2 column sidebar left
.sidebar-left.main-wrap & {
@include breakpoint(medium) {
@include grid-column(8);
@include grid-col-pos(4);
}
}
}

.sidebar {

// default 2 column
@include grid-column(12);
@include breakpoint(medium) {
@include grid-column(4);
margin-top: 1rem;
}

// 2 column sidebar left
.sidebar-left.main-wrap & {
@include breakpoint(medium) {
@include grid-column(4);
@include grid-col-pos(-8);
margin-top: 1rem;
}
}
}
22 changes: 11 additions & 11 deletions assets/scss/modules/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#footer-container {
.footer-container {
max-width: 100%;
width: 100%;
margin: 0 auto;
border-top: 1px solid #ccc;
border-top: 1px solid $medium-gray;
margin-top: rem-calc(60);
}

#footer {
@include grid-row();
padding: rem-calc(30) 0;
.footer {
@include grid-row();
padding: rem-calc(30) 0;

ul {
list-style-type: none;
margin: 0;
padding: 0;
}
ul {
list-style-type: none;
margin: 0;
padding: 0;
}
}
}
Loading