diff --git a/CHANGELOG.md b/CHANGELOG.md index 61485aedd8..1d94f61394 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)) diff --git a/README.md b/README.md index 8708fe6e10..2cbe69335c 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/base.php b/base.php index 422c1d9fb2..e9d714e645 100644 --- a/base.php +++ b/base.php @@ -1,6 +1,6 @@ @@ -20,11 +20,11 @@ ?>

-

+

- -

+ + diff --git a/functions.php b/functions.php index 97b3299552..e44777b024 100644 --- a/functions.php +++ b/functions.php @@ -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 ]; diff --git a/lib/extras.php b/lib/extras.php index fdf8d9dd05..dc551563ef 100644 --- a/lib/extras.php +++ b/lib/extras.php @@ -2,7 +2,7 @@ namespace Roots\Sage\Extras; -use Roots\Sage\Config; +use Roots\Sage\Setup; /** * Add classes @@ -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'; } diff --git a/lib/config.php b/lib/setup.php similarity index 99% rename from lib/config.php rename to lib/setup.php index c2838cc63b..ae4fc16378 100644 --- a/lib/config.php +++ b/lib/setup.php @@ -1,6 +1,6 @@ +