diff options
| author | czaks <marcin@6irc.net> | 2013-07-23 10:25:33 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-23 10:25:33 -0400 |
| commit | 1aa522e138d45b7e06223d0cebb4a4363d9dda5b (patch) | |
| tree | 880a1adfe1a66ead083f66b00720bb1c5175f674 /inc | |
| parent | 88c1205e422b314cae2c0410ce21f9c8283f0f0e (diff) | |
| parent | 46edec0f2d8c31b55e36e160c7d9bac8bf4d3aa4 (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
templates/index.html
templates/post_thread.html
templates/thread.html
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/config.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/inc/config.php b/inc/config.php index 5417b55e..a4914252 100644 --- a/inc/config.php +++ b/inc/config.php @@ -575,6 +575,15 @@ // The default stylesheet to use $config['default_stylesheet'] = array('Yotsuba B', $config['stylesheets']['Yotsuba B']); + // Make stylesheet selections board-specific + $config['stylesheets_board'] = false; + + // Use Font-Awesome for displaying lock and pin icons, instead of the images in static/. + // http://fortawesome.github.io/Font-Awesome/icon/pushpin/ + // http://fortawesome.github.io/Font-Awesome/icon/lock/ + $config['font_awesome'] = false; + $config['font_awesome_css'] = 'stylesheets/font-awesome/css/font-awesome.min.css'; + // Boardlinks // You can group, order and place the boardlist at the top of every page, using the following template. //$config['boards'] = array( |