diff --git a/src/client/less/layout.less b/src/client/less/layout.less index a93016b..5b1e649 100644 --- a/src/client/less/layout.less +++ b/src/client/less/layout.less @@ -28,6 +28,15 @@ table { // See: https://github.com/less/less.js/issues/1903 @small-screen-breakpoint: (@contentMaxWidth + 2 * @contentMinMarginX); +html, body { + height: 100%; +} + +#wrapper { + position: relative; + min-height: 100%; +} + .main-column { width: @contentMaxWidth; margin: 0 auto; @@ -44,3 +53,14 @@ table { top: 0; width: 100%; } + +.content { + padding: 30px 0 150px; +} + +footer { + position: absolute; + left: 0; + bottom: 0; + width: 100%; +} diff --git a/src/client/less/markdown.less b/src/client/less/markdown.less index 1716c68..7bfb320 100644 --- a/src/client/less/markdown.less +++ b/src/client/less/markdown.less @@ -2,7 +2,6 @@ font-size: 16px; color: @colorText; line-height: 1.4; - padding-top: 30px; p, h5, h6 { margin: 15px 0; diff --git a/src/client/less/view.less b/src/client/less/view.less index b2495aa..cbcdd8c 100644 --- a/src/client/less/view.less +++ b/src/client/less/view.less @@ -26,3 +26,14 @@ a:hover, a:active { border-bottom: 1px solid #ddd; } } + +footer { + height: 50px; + padding-top: 30px; + border-top: 1px solid #ddd; + color: #666; + background: #f5f5f5; + + font-size: 13px; + text-shadow: 0 1px 0 #fff; +} diff --git a/src/config-example.php b/src/config-example.php index e891feb..d6f16f6 100644 --- a/src/config-example.php +++ b/src/config-example.php @@ -1,3 +1,9 @@ - -
+ ?> + diff --git a/src/server/logic/Main.php b/src/server/logic/Main.php index de4a735..d04c710 100644 --- a/src/server/logic/Main.php +++ b/src/server/logic/Main.php @@ -21,7 +21,10 @@ class Main { $data = array(); $data['baseUrl'] = $baseUrl; $data['basePath'] = $basePath; - $data['wikiName'] = $config['wikiName']; + + foreach (array('wikiName', 'footerHtml') as $key) { + $data[$key] = $config[$key]; + } $data['breadcrumbs'] = $this->createBreadcrumbs($articleBaseDir, $requestPathArray, $config['wikiName']);