Skip to content

Commit

Permalink
Merge pull request #41 from win-site/master
Browse files Browse the repository at this point in the history
V1.8.0
  • Loading branch information
AmitT authored Jun 15, 2017
2 parents c375385 + a6ecf39 commit b5363ca
Show file tree
Hide file tree
Showing 25 changed files with 994 additions and 693 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ node_modules
npm-debug.log
*_MACOSX/
*.DS_Store
*.idea/
3 changes: 0 additions & 3 deletions .jshintignore

This file was deleted.

27 changes: 0 additions & 27 deletions .jshintrc

This file was deleted.

17 changes: 7 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,22 @@ language:

php:
- nightly
- 5.6
#- 5.5
#- 5.4
- 7
- 7.1
#- hhvm

node_js:
- "6"
- "8"

cache:
yarn: true
apt: true
directories:
- bower_components
- node_modules

env:
- TRAVIS_NODE_VERSION="6" CXX="g++-4.8"
- WP_VERSION=latest WP_MULTISITE=0
- WP_VERSION=latest WP_MULTISITE=1
- TRAVIS_NODE_VERSION="8" WP_VERSION=latest WP_MULTISITE=0
- TRAVIS_NODE_VERSION="8" WP_VERSION=latest WP_MULTISITE=1

matrix:
fast_finish: true
Expand All @@ -44,8 +41,8 @@ install:
- nvm install node stable
- nvm use node stable
- node -v && npm -v
- npm install -g npm@latest
- npm install -g bower gulp
#- npm install -g npm@latest
- npm install -g gulp
- npm install
- export PATH="$HOME/.composer/vendor/bin:$PATH"
- composer global require squizlabs/php_codesniffer
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Podium
Podium [![Build Status](https://travis-ci.org/win-site/podium.svg?branch=master)](https://travis-ci.org/win-site/podium)
===
The project is in its initial stage, your welcome to Contribute.
Podium is a simple, flexible & powerful starter theme for wordpress, foundation and gulp support

Requirements
---
- [PHP >= 7.x](http://php.net).
- [Node.js >= 6.10.x](https://nodejs.org).
- [Node.js >= 8.x](https://nodejs.org).
- [Composer >= 1.4.x](https://getcomposer.org).
- [gulp >= 3.9.x](http://gulpjs.com).
- [yarn >= 0.23.x](https://yarnpkg.com).
- [yarn >= 0.24.x](https://yarnpkg.com).

Features
---
Expand All @@ -20,7 +20,7 @@ Installation

### Install gulp

Building the theme requires [node.js](http://nodejs.org/download/). We recommend you update to the latest version of yarn: `yarn self-update`.
Building the theme requires [node.js](http://nodejs.org/download/). We recommend you update to the latest version of yarn: [`yarn self-update`](https://yarnpkg.com/lang/en/docs/cli/self-update/).

From the command line:

Expand Down
Empty file removed acf-json/index.html
Empty file.
5 changes: 5 additions & 0 deletions acf-json/index.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?php

// Silence is golden.

?>
28 changes: 14 additions & 14 deletions assets/scripts/custom.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ $( document ).foundation();
// });

//top bar sticky since foundation was buggy
if ( $( '.top-bar' ).length > 0 ) {
var headerTop = $( '.top-bar' ).offset().top;
$( window ).scroll( function() {
// console.log(headerTop);
if ( $( window ).scrollTop() > headerTop ) {
$( '.top-bar' ).addClass( 'sticky' );
$( 'body' ).addClass( 'sticky-header' );
}
else {
$( '.top-bar' ).removeClass( 'sticky' );
$( 'body' ).removeClass( 'sticky-header' );
}
});
}
// if ( $( '.top-bar' ).length > 0 ) {
// var headerTop = $( '.top-bar' ).offset().top;
// $( window ).scroll( function() {
// // console.log(headerTop);
// if ( $( window ).scrollTop() > headerTop ) {
// $( '.top-bar' ).addClass( 'sticky' );
// $( 'body' ).addClass( 'sticky-header' );
// }
// else {
// $( '.top-bar' ).removeClass( 'sticky' );
// $( 'body' ).removeClass( 'sticky-header' );
// }
// });
// }
4 changes: 1 addition & 3 deletions assets/styles/_mixins.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
$base-font-size: 16px;

// Set a rem font size with pixel fallback
@function calculate-rem($size) {
$rem-size: $size / $base-font-size;
$rem-size: $size / $global-font-size;
@return $rem-size * 1rem;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/styles/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
// 1. Global
// ---------

$global-font-size: 100%;
$global-font-size: 16px;
$global-width: rem-calc(1200);
$global-lineheight: 1.5;
$foundation-palette: (
Expand Down
2 changes: 1 addition & 1 deletion assets/styles/common/_general.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
}

body {
font-size: $base-font-size; // Please edit in _mixins.scss
font-size: $global-font-size; // Please edit in _mixins.scss
}
6 changes: 2 additions & 4 deletions assets/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
//# Base
//--------------------------------------------------------------

$global-text-direction: ltr;

@import 'variables';
@import 'includes';

//--------------------------------------------------------------
//#
//--------------------------------------------------------------
//#
//--------------------------------------------------------------
5 changes: 3 additions & 2 deletions assets/styles/rtl.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
//# Base
//--------------------------------------------------------------

$global-text-direction: rtl;

@import 'includes';
@import 'variables';
$global-text-direction: rtl;
@import 'includes';


//--------------------------------------------------------------
//# RTL Overides
Expand Down
6 changes: 4 additions & 2 deletions functions.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
/**
*
* podium functions and definitions
*
* @package podium
Expand All @@ -23,8 +24,9 @@
'/inc/config.php', // get the settings for the wordpress theme.
'/inc/media.php', // Media functions.
'/inc/vendor/autoload.php', // Load Composer packages
'/inc/tgm.php' // Plugin installation and activation for Podium based themes.

'/inc/tgm.php', // Plugin installation and activation for Podium based themes.
'/inc/editor-caps.php' // Configure editor role capabilities

// '/inc/disable-feeds.php' // Remove fedds content and links
];

Expand Down
40 changes: 5 additions & 35 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ const gulp = require( 'gulp' ),
sourcemaps = require( 'gulp-sourcemaps' ),
del = require( 'del' ),
gutil = require( 'gulp-util' ),
jshint = require( 'gulp-jshint' ),
stylish = require( 'jshint-stylish' ),
eslint = require( 'gulp-eslint' ),
browserSync = require( 'browser-sync' ).create( );

Expand All @@ -35,13 +33,7 @@ gulp.task( 'styles', function ( ) {
);
} )
)
.pipe( autoprefixer( {
browsers: [
'last 2 versions',
'android 4',
'opera 12'
]
} ) )
.pipe( autoprefixer() )
.pipe( sourcemaps.write( ) )
.pipe( gulp.dest( 'dist/styles' ) )
.pipe( browserSync.stream( ) )
Expand All @@ -61,13 +53,7 @@ gulp.task( 'styles-min', function ( ) {
);
} )
)
.pipe( autoprefixer( {
browsers: [
'last 2 versions',
'android 4',
'opera 12'
]
} ) )
.pipe( autoprefixer() )
.pipe( rename( {
suffix: '.min'
} ) )
Expand Down Expand Up @@ -96,13 +82,7 @@ gulp.task( 'rtl-styles', function ( ) {
);
} )
)
.pipe( autoprefixer( {
browsers: [
'last 2 versions',
'android 4',
'opera 12'
]
} ) )
.pipe( autoprefixer() )
.pipe( sourcemaps.write( ) )
.pipe( gulp.dest( 'dist/styles' ) )
.pipe( browserSync.stream( ) )
Expand All @@ -123,13 +103,7 @@ gulp.task( 'rtl-styles-min', function ( ) {
);
} )
)
.pipe( autoprefixer( {
browsers: [
'last 2 versions',
'android 4',
'opera 12'
]
} ) )
.pipe( autoprefixer() )
.pipe( rename( {
suffix: '.min'
} ) )
Expand All @@ -146,10 +120,6 @@ gulp.task( 'rtl-styles-min', function ( ) {
gulp.task( 'custom-scripts', function ( ) {

return gulp.src( 'assets/scripts/**/*.js' )

.pipe( jshint( ) )
.pipe( jshint.reporter( 'jshint-stylish' ) )

.pipe( eslint( {
fix: true
} ) )
Expand Down Expand Up @@ -184,7 +154,7 @@ gulp.task( 'scripts-min', function ( ) {
} );

let php_files = [
'{lib,template-parts}/**/*.php',
'{inc,template-parts}/**/*.php',
'*.php'
];

Expand Down
16 changes: 10 additions & 6 deletions header.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

<?php wp_head();

$imagesFolder = get_template_directory_uri() . '/dist/images/';
$imagesFolder = get_template_directory_uri() . '/dist/images/';

// Please create favicon files with http://iconogen.com/
// and put them in assets/images/favicon directory
?>
?>

<link rel="shortcut icon" href="<?php echo $imagesFolder; ?>favicon/favicon.ico" type="image/x-icon" />
<link rel="apple-touch-icon" sizes="57x57" href="<?php echo $imagesFolder; ?>favicon/apple-touch-icon-57x57.png">
Expand Down Expand Up @@ -53,16 +53,18 @@
<?php esc_html_e('Skip to content', 'podium');?>
</a>

<header id="masthead" class="site-header" role="banner">
<header id="masthead" class="site-header" role="banner" data-sticky-container>

<div class="show-for-medium top-bar">
<div class="show-for-medium top-bar" data-sticky data-margin-top="0">
<div class="row">
<div class="small-12 columns">
<div class="top-bar-left">
<?php $settings->getMenu(new Top_Bar_Walker(), 'onCanvass'); // print menu (source config.php) ?>
</div>
<div class="top-bar-right">
<span class="title-bar-title"><?php echo get_bloginfo('name'); ?></span>
<a href="<?php echo get_home_url(); ?>">
<span class="title-bar-title"><?php echo get_bloginfo('name'); ?></span>
</a>
</div>
</div>
</div>
Expand All @@ -74,7 +76,9 @@
<button class="menu-icon" type="button" data-open="offCanvas"></button>
</div>
<div class="title-bar-right">
<span class="title-bar-title"><?php echo get_bloginfo('name'); ?></span>
<a href="<?php echo get_home_url(); ?>">
<span class="title-bar-title"><?php echo get_bloginfo('name'); ?></span>
</a>
</div>
</div>
</div>
Expand Down
15 changes: 1 addition & 14 deletions inc/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function podium_custom_dashboard_widgets()
{
wp_add_dashboard_widget('podium_rss_dashboard_widget', __('Recently on Winsite', 'podiumtheme'), 'podium_rss_dashboard_widget');

/*
/*
Be sure to drop any other created Dashboard Widgets
in this function and they will all load.
*/
Expand All @@ -101,19 +101,6 @@ function podium_custom_admin_footer()
// adding it to the admin area
add_filter('admin_footer_text', 'podium_custom_admin_footer');

// get the the role object
$role_object = get_role('editor');

// add $cap capability to this role object
$role_object->add_cap('edit_theme_options');

function disable_feed_generator()
{
return '';
}

add_filter('the_generator', 'disable_feed_generator');

//ADD featured image thumbnail to WordPress admin columns

add_filter('manage_posts_columns', 'tcb_add_post_thumbnail_column', 5);
Expand Down
Loading

0 comments on commit b5363ca

Please sign in to comment.