diff options
| -rw-r--r-- | inc/config.php | 4 | ||||
| -rw-r--r-- | inc/functions.php | 12 | ||||
| -rw-r--r-- | stylesheets/default.css (renamed from default.css) | 0 | ||||
| -rw-r--r-- | stylesheets/style.css (renamed from style.css) | 0 | ||||
| -rw-r--r-- | stylesheets/yotsuba.css (renamed from yotsuba.css) | 0 |
5 files changed, 8 insertions, 8 deletions
diff --git a/inc/config.php b/inc/config.php index e495e4da..8e09ce90 100644 --- a/inc/config.php +++ b/inc/config.php @@ -682,7 +682,7 @@ 'Yotsuba' => 'yotsuba.css' ); - // The prefix for each stylesheet URI. Defaults to $config['root'] + // The prefix for each stylesheet URI. Defaults to $config['root']/stylesheets/ //$config['uri_stylesheets'] = 'http://static.example.org/stylesheets/'; // The default stylesheet to use @@ -700,7 +700,7 @@ // Set custom locations for stylesheets, scripts and maybe a banner. // This can be good for load balancing across multiple servers or hostnames. - // $config['url_stylesheet'] = 'http://static.example.org/style.css'; + // $config['url_stylesheet'] = 'http://static.example.org/style.css'; // main/base stylesheet // $config['url_javascript'] = 'http://static.example.org/main.js'; // $config['url_banner'] = '/banner.php'; // $config['url_favicon'] = '/favicon.gif'; diff --git a/inc/functions.php b/inc/functions.php index fb395686..698ad973 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -28,11 +28,6 @@ date_default_timezone_set($config['timezone']); - if(!isset($config['url_stylesheet'])) - $config['url_stylesheet'] = $config['root'] . 'style.css'; - if(!isset($config['url_javascript'])) - $config['url_javascript'] = $config['root'] . 'main.js'; - if(!isset($config['post_url'])) $config['post_url'] = $config['root'] . $config['file_post']; @@ -81,7 +76,12 @@ $config['uri_img'] = sprintf($config['uri_img'], $board['dir']); if(!isset($config['uri_stylesheets'])) - $config['uri_stylesheets'] = &$config['root']; + $config['uri_stylesheets'] = $config['root'] . 'stylesheets/'; + + if(!isset($config['url_stylesheet'])) + $config['url_stylesheet'] = $config['uri_stylesheets'] . 'style.css'; + if(!isset($config['url_javascript'])) + $config['url_javascript'] = $config['root'] . 'main.js'; if($config['root_file']) { chdir($config['root_file']); diff --git a/default.css b/stylesheets/default.css index e69de29b..e69de29b 100644 --- a/default.css +++ b/stylesheets/default.css diff --git a/style.css b/stylesheets/style.css index d8d18379..d8d18379 100644 --- a/style.css +++ b/stylesheets/style.css diff --git a/yotsuba.css b/stylesheets/yotsuba.css index 8a150157..8a150157 100644 --- a/yotsuba.css +++ b/stylesheets/yotsuba.css |