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

Commit

Permalink
Merge pull request #1023 from olefredrik/xy-grid-in-footer
Browse files Browse the repository at this point in the history
Xy grid in footer
  • Loading branch information
olefredrik authored Aug 5, 2017
2 parents 71d16cf + d5f4b7e commit e7e0329
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
6 changes: 3 additions & 3 deletions library/enqueue-scripts.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
function foundationpress_scripts() {

// Enqueue the main Stylesheet.
wp_enqueue_style( 'main-stylesheet', get_template_directory_uri() . '/dist/assets/css/app.css', array(), '2.10.0', 'all' );
wp_enqueue_style( 'main-stylesheet', get_template_directory_uri() . '/dist/assets/css/app.css', array(), '2.10.1', 'all' );

// Deregister the jquery version bundled with WordPress, as we're injecting the version we need with Webpack.
wp_deregister_script( 'jquery' );

// Enqueue Founation scripts
wp_enqueue_script( 'foundation', get_template_directory_uri() . '/dist/assets/js/app.js', array(), '2.10.0', true );
wp_enqueue_script( 'foundation', get_template_directory_uri() . '/dist/assets/js/app.js', array(), '2.10.1', true );

// Enqueue FontAwesome from CDN. Uncomment the line below if you don't need FontAwesome.
wp_enqueue_script( 'jquery', 'https://use.fontawesome.com/5016a31c8c.js', array(), '4.7.0', true );


// Add the comment-reply library on pages where it is necessary
if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "foundationpress",
"title": "FoundationPress",
"version": "2.10.0",
"version": "2.10.1",
"description": "FoundationPress is a WordPress starter theme based on Foundation 6 by Zurb",
"license": "MIT",
"main": "gulpfile.js",
Expand Down
8 changes: 6 additions & 2 deletions src/assets/scss/modules/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
.footer-container {
max-width: 100%;
width: 100%;
margin: 0 auto;
border-top: 1px solid $medium-gray;
margin-top: rem-calc(60);
}

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

article {
@include xy-cell(auto);
margin: 0;
}

ul {
list-style-type: none;
margin: 0;
Expand Down
2 changes: 1 addition & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Theme Name: FoundationPress
Theme URI: http://foundationpress.olefredrik.com
Github Theme URI: https://github.com/olefredrik/FoundationPress
Description: FoundationPress is a WordPress starter theme based on Foundation 6 by Zurb
Version: 2.10.0
Version: 2.10.1
Author: Ole Fredrik Lie
Author URI: http://olefredrik.com/
Expand Down

0 comments on commit e7e0329

Please sign in to comment.