Merge branch 'HrBingR-master' into master

See https://github.com/timvisee/send/pull/100

server/config.js

@@ -168,6 +168,16 @@ const conf = convict({
     default: 'https://send.firefox.com',
     env: 'BASE_URL'
   },
+  custom_title: {
+	format: String,
+	default: 'Send',
+	env: 'CUSTOM_TITLE'
+  },
+  custom_description: {
+	format: String,
+	default: 'Encrypt and send files with a link that automatically expires to ensure your important documents don’t stay online forever.',
+	env: 'CUSTOM_DESCRIPTION'
+  },
   detect_base_url: {
     format: Boolean,
     default: false,
@@ -303,6 +313,11 @@ const conf = convict({
       format: String,
       default: '',
       env: 'UI_CUSTOM_ASSETS_WORDMARK'
+    },
+	custom_css: {
+	  format: String,
+	  default: '',
+	  env: 'UI_CUSTOM_CSS'
 	}
   }
 });

server/layout.js

@@ -40,6 +40,16 @@ module.exports = function(state, body = '') {
           type="text/css"
           href="${assets.get('app.css')}"
         />
+        <script>
+        var custom_css_file = '${state.ui.assets.custom_css}';
+          if (custom_css_file!="undefined") {
+            var custom_css_enabled = document.createElement('link');
+            custom_css_enabled.rel = 'stylesheet';
+            custom_css_enabled.type = 'text/css';
+            custom_css_enabled.href = '${state.ui.assets.custom_css}';
+            document.head.appendChild(custom_css_enabled);
+          }
+        </script>
         <link
           rel="apple-touch-icon"
           sizes="180x180"

server/state.js

@@ -34,7 +34,8 @@ module.exports = async function(req) {
     safari_pinned_tab: assets.get('safari-pinned-tab.svg'),
     facebook: baseUrl + '/' + assets.get('send-fb.jpg'),
     twitter: baseUrl + '/' + assets.get('send-twitter.jpg'),
-    wordmark: assets.get('wordmark.svg') + '#logo'
+    wordmark: assets.get('wordmark.svg') + '#logo',
+    custom_css: assets.get('undefined')
   };
   Object.keys(uiAssets).forEach(index => {
     if (config.ui_custom_assets[index] !== '')
@@ -47,9 +48,8 @@ module.exports = async function(req) {
     locale,
     capabilities: { account: false },
     translate: getTranslator(locale),
-    title: 'Send',
+    title: config.custom_title,
-    description:
+    description: config.custom_description,
-      'Encrypt and send files with a link that automatically expires to ensure your important documents don’t stay online forever.',
     baseUrl,
     ui: {
       colors: {