diff options
| -rw-r--r-- | site/public/css/custom.css | 40 | ||||
| -rw-r--r-- | site/public/css/sticky-footer-navbar.css | 36 | ||||
| -rw-r--r-- | site/resources/views/layouts/base.blade.php | 20 |
3 files changed, 53 insertions, 43 deletions
diff --git a/site/public/css/custom.css b/site/public/css/custom.css index 40b157f..b96d7ab 100644 --- a/site/public/css/custom.css +++ b/site/public/css/custom.css @@ -1,3 +1,28 @@ +html { + position: relative; + min-height: 100%; +} +body > .container { + padding: 30px 15px 0; +} + +.card-img-right { + height: 100%; + border-radius: 0 3px 3px 0; +} +.footer > .container { + margin-top: 10px; + padding-right: 15px; + padding-left: 15px; +} +.footer { + bottom: 0; + width: 100%; + /* Set the fixed height of the footer here */ + height: auto; + line-height: 60px; /* Vertically center the text there */ + background-color: #f5f5f5; + } .custom-flex-child { min-width: 0; } @@ -124,3 +149,18 @@ footer { .s-link:hover { color: inherit; } + +.flex-auto { + -ms-flex: 0 0 auto; + -webkit-box-flex: 0; + flex: 0 0 auto; +} + +.h-250 { height: 250px; } +@media (min-width: 768px) { + .h-md-250 { height: 250px; } +} + +.border-top { border-top: 1px solid #e5e5e5; } +.border-bottom { border-bottom: 1px solid #e5e5e5; } + diff --git a/site/public/css/sticky-footer-navbar.css b/site/public/css/sticky-footer-navbar.css deleted file mode 100644 index 3e26103..0000000 --- a/site/public/css/sticky-footer-navbar.css +++ /dev/null @@ -1,36 +0,0 @@ -/* Sticky footer styles --------------------------------------------------- */ -html { - position: relative; - min-height: 100%; -} -body { - /* Margin bottom by footer height */ - margin-bottom: 300px; -} -.footer { - position: absolute; - bottom: 0; - width: 100%; - /* Set the fixed height of the footer here */ - height: 300px; - line-height: 60px; /* Vertically center the text there */ - background-color: #f5f5f5; -} - - -/* Custom page CSS --------------------------------------------------- */ -/* Not required for template or sticky footer method. */ - -/* -*/ -body > .container { - padding: 30px 15px 0; -} - -.footer > .container { - margin-top: 10px; - padding-right: 15px; - padding-left: 15px; -} diff --git a/site/resources/views/layouts/base.blade.php b/site/resources/views/layouts/base.blade.php index 5ced27e..32404d3 100644 --- a/site/resources/views/layouts/base.blade.php +++ b/site/resources/views/layouts/base.blade.php @@ -7,15 +7,8 @@ <meta name="author" content=""> <link rel="icon" href="https://files.fuselkoenig.de/favicon.ico"> <title>@yield('header') | Fuselkoenig.de</title> - -<!-- - <link href="/css/bootstrap.css" rel="stylesheet"> -<link rel="stylesheet" href="https://unpkg.com/bootstrap-material-design@4.1.1/dist/css/bootstrap-material-design.min.css"> ---> <link href="/css/bootstrap-material-design.min.css" rel="stylesheet"> <link href="/font/css/open-iconic-bootstrap.css" rel="stylesheet"> - <link href="/css/sticky-footer-navbar.css" rel="stylesheet"> - <link href="/css/blog.css" rel="stylesheet"> <link href="/css/custom.css" rel="stylesheet"> <link href="/css/colors.css" rel="stylesheet"> @@ -24,6 +17,9 @@ @yield('feed') @yield('css') +<?php +if ( "" != env('PIWIK_URL') && "" != env('PIWIK_ID') ) { +?> <script type="text/javascript"> var _paq = _paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ @@ -39,12 +35,22 @@ g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'js/'; s.parentNode.insertBefore(g,s); })(); </script> +<?php +} +?> </head> <body> + +<?php +if ( "" != env('PIWIK_URL') && "" != env('PIWIK_ID') ) { +?> <noscript> <img src="{{ env('PIWIK_URL') }}js/?idsite={{ env('PIWIK_ID') }}&rec=1" style="border:0" alt="" /> </noscript> +<?php +} +?> @include('snippets.navbar') |