Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename config.php to setup.php #1556

Merged
merged 1 commit into from
Oct 10, 2015
Merged

Rename config.php to setup.php #1556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
### HEAD
* Rename config.php to setup.php ([#1556](https://github.com/roots/sage/pull/1556))
* Move init.php to config.php ([#1555](https://github.com/roots/sage/pull/1555))
* Use Sass to style search form, remove search template ([#1545](https://github.com/roots/sage/pull/1545))
* Remove Modernizr ([#1541](https://github.com/roots/sage/pull/1541))
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ Install the [Soil](https://github.com/roots/soil) plugin to enable additional fe
* Google CDN jQuery snippet from [HTML5 Boilerplate](http://html5boilerplate.com/)
* Google Analytics snippet from [HTML5 Boilerplate](http://html5boilerplate.com/)

## Installation
## Theme installation

Clone the git repo - `git clone https://github.com/roots/sage.git` and then rename the directory to the name of your theme or website.

## Configuration
## Theme setup

Edit `lib/config.php` to enable or disable theme features, setup navigation menus, post thumbnail sizes, post formats, and sidebars.
Edit `lib/setup.php` to enable or disable theme features, setup navigation menus, post thumbnail sizes, post formats, and sidebars.

## Theme development

Expand Down
4 changes: 2 additions & 2 deletions base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

use Roots\Sage\Config;
use Roots\Sage\Setup;
use Roots\Sage\Wrapper;

?>
Expand All @@ -23,7 +23,7 @@
<main class="main">
<?php include Wrapper\template_path(); ?>
</main><!-- /.main -->
<?php if (Config\display_sidebar()) : ?>
<?php if (Setup\display_sidebar()) : ?>
<aside class="sidebar">
<?php include Wrapper\sidebar_path(); ?>
</aside><!-- /.sidebar -->
Expand Down
2 changes: 1 addition & 1 deletion functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
*/
$sage_includes = [
'lib/assets.php', // Scripts and stylesheets
'lib/config.php', // Configuration
'lib/extras.php', // Custom functions
'lib/setup.php', // Theme setup
'lib/titles.php', // Page titles
'lib/wrapper.php' // Theme wrapper class
];
Expand Down
4 changes: 2 additions & 2 deletions lib/extras.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Roots\Sage\Extras;

use Roots\Sage\Config;
use Roots\Sage\Setup;

/**
* Add <body> classes
Expand All @@ -16,7 +16,7 @@ function body_class($classes) {
}

// Add class if sidebar is active
if (Config\display_sidebar()) {
if (Setup\display_sidebar()) {
$classes[] = 'sidebar-primary';
}

Expand Down
2 changes: 1 addition & 1 deletion lib/config.php → lib/setup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Roots\Sage\Config;
namespace Roots\Sage\Setup;

use Roots\Sage\Assets;

Expand Down