diff options
-rw-r--r-- | application/Thumbnailer.php | 2 | ||||
-rw-r--r-- | assets/default/scss/shaarli.scss | 3 | ||||
-rw-r--r-- | doc/md/Shaarli-configuration.md | 6 |
3 files changed, 7 insertions, 4 deletions
diff --git a/application/Thumbnailer.php b/application/Thumbnailer.php index a23f98e9..d5f5ac28 100644 --- a/application/Thumbnailer.php +++ b/application/Thumbnailer.php | |||
@@ -55,7 +55,7 @@ class Thumbnailer | |||
55 | $this->conf = $conf; | 55 | $this->conf = $conf; |
56 | 56 | ||
57 | if (! $this->checkRequirements()) { | 57 | if (! $this->checkRequirements()) { |
58 | $this->conf->set('thumbnails.enabled', false); | 58 | $this->conf->set('thumbnails.mode', Thumbnailer::MODE_NONE); |
59 | $this->conf->write(true); | 59 | $this->conf->write(true); |
60 | // TODO: create a proper error handling system able to catch exceptions... | 60 | // TODO: create a proper error handling system able to catch exceptions... |
61 | die(t( | 61 | die(t( |
diff --git a/assets/default/scss/shaarli.scss b/assets/default/scss/shaarli.scss index 760d8d6a..691b2b37 100644 --- a/assets/default/scss/shaarli.scss +++ b/assets/default/scss/shaarli.scss | |||
@@ -544,7 +544,10 @@ body, | |||
544 | color: $dark-grey; | 544 | color: $dark-grey; |
545 | font-size: .9em; | 545 | font-size: .9em; |
546 | 546 | ||
547 | |||
547 | a { | 548 | a { |
549 | display: inline-block; | ||
550 | margin: 3px 0; | ||
548 | padding: 5px 8px; | 551 | padding: 5px 8px; |
549 | text-decoration: none; | 552 | text-decoration: none; |
550 | } | 553 | } |
diff --git a/doc/md/Shaarli-configuration.md b/doc/md/Shaarli-configuration.md index 8787f59d..a931ab1e 100644 --- a/doc/md/Shaarli-configuration.md +++ b/doc/md/Shaarli-configuration.md | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | Once your Shaarli instance is installed, the file `data/config.json.php` is generated: | 5 | Once your Shaarli instance is installed, the file `data/config.json.php` is generated: |
6 | * it contains all settings in JSON format, and can be edited to customize values | 6 | * it contains all settings in JSON format, and can be edited to customize values |
7 | * it defines which [plugins](Plugin-System) are enabled[](.html) | 7 | * it defines which [plugins](Plugin-System) are enabled |
8 | * its values override those defined in `index.php` | 8 | * its values override those defined in `index.php` |
9 | * it is wrap in a PHP comment to prevent anyone accessing it, regardless of server configuration | 9 | * it is wrap in a PHP comment to prevent anyone accessing it, regardless of server configuration |
10 | 10 | ||
@@ -32,13 +32,13 @@ On a Linux distribution: | |||
32 | - to give it access to Shaarli, either: | 32 | - to give it access to Shaarli, either: |
33 | - unzip Shaarli in the default web server location (usually `/var/www/`) and set the web server user as the owner | 33 | - unzip Shaarli in the default web server location (usually `/var/www/`) and set the web server user as the owner |
34 | - put users in the same group as the web server, and set the appropriate access rights | 34 | - put users in the same group as the web server, and set the appropriate access rights |
35 | - if you have a domain / subdomain to serve Shaarli, [configure the server](Server-configuration) accordingly[](.html) | 35 | - if you have a domain / subdomain to serve Shaarli, [configure the server](Server-configuration) accordingly |
36 | 36 | ||
37 | ## Configuration | 37 | ## Configuration |
38 | 38 | ||
39 | In `data/config.json.php`. | 39 | In `data/config.json.php`. |
40 | 40 | ||
41 | See also [Plugin System](Plugin-System.html). | 41 | See also [Plugin System](Plugin-System). |
42 | 42 | ||
43 | ### Credentials | 43 | ### Credentials |
44 | 44 | ||