aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--composer.json11
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css2
2 files changed, 11 insertions, 2 deletions
diff --git a/composer.json b/composer.json
index 8fc5ce5b..26608cdc 100644
--- a/composer.json
+++ b/composer.json
@@ -86,6 +86,9 @@
86 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", 86 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
87 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", 87 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
88 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" 88 "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
89 ],
90 "build-parameters": [
91 "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
89 ] 92 ]
90 }, 93 },
91 "extra": { 94 "extra": {
@@ -93,7 +96,13 @@
93 "symfony-web-dir": "web", 96 "symfony-web-dir": "web",
94 "symfony-assets-install": "relative", 97 "symfony-assets-install": "relative",
95 "incenteev-parameters": { 98 "incenteev-parameters": {
96 "file": "app/config/parameters.yml" 99 "file": "app/config/parameters.yml",
100 "env-map": {
101 "mailer_host": "WALLABAG_MAILER_HOST",
102 "mailer_user": "WALLABAG_MAILER_USER",
103 "mailer_password": "WALLABAG_MAILER_PASSWORD",
104 "secret": "WALLABAG_SECRET"
105 }
97 } 106 }
98 }, 107 },
99 "autoload": { 108 "autoload": {
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
index 4aeadb4f..0ba1ec27 100755
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
@@ -771,7 +771,7 @@ a.add-to-wallabag-link-after:after {
771/* Diaspora */ 771/* Diaspora */
772.icon-image--diaspora { 772.icon-image--diaspora {
773 background-image: url('../../_global/img/icons/diaspora-icon--black.png'); 773 background-image: url('../../_global/img/icons/diaspora-icon--black.png');
774}} 774}
775 775
776/* ========================================================================== 776/* ==========================================================================
777 Icon selected 777 Icon selected