diff options
| author | Matúš Námešný <matus@namesny.com> | 2020-05-16 15:43:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-16 15:43:38 +0300 |
| commit | 1cb125f804257a269b1536546bd3e87e431c1b16 (patch) | |
| tree | 2d9be7062d4a50a3e9d26bf9373a29aa4c4eee7d | |
| parent | 9e42dc88f1b37580a35b266705ccc1700bc3d5b5 (diff) | |
| parent | 52f53210476c36ea2954740bcca49df27a9478c2 (diff) | |
Merge pull request #63 from LordMathis/fix/footer-mobile-view
Fix/footer mobile view
| -rw-r--r-- | layouts/_default/list.html | 47 | ||||
| -rw-r--r-- | layouts/_default/single.html | 27 | ||||
| -rw-r--r-- | layouts/index.html | 41 | ||||
| -rw-r--r-- | static/css/nix.css | 19 |
4 files changed, 72 insertions, 62 deletions
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 4cedabe..fed1e8a 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -9,31 +9,32 @@ <body> {{ partial "header.html" . }} - <div class="container wrapper"> - <div class="row"> - <div class="col-xs-12 text-center"> - <h1 id=>{{ .Title }}</h1> + <div class="flex-wrapper"> + <div class="container wrapper"> + <div class="row"> + <div class="col-xs-12 text-center"> + <h1 id=>{{ .Title }}</h1> + </div> </div> - </div> - <ul id="post-list"> - {{ range .Paginator.Pages }} - <li> - <div class="post-list-item"> - <div class="post-header"> - <h4 class="post-link"><a href="{{ .Permalink }}">{{ .Title }}</a></h4> - <h4 class="post-date">{{ .Date.Format "2006-01-02" }}</h4> - </div> - <div class="post-summary"><p>{{ .Summary }}</p></div> - <div class="post-list-footer text-center"> - <a href="{{ .Permalink }}">{{ i18n "read-more" }}</a> + <ul id="post-list"> + {{ range .Paginator.Pages }} + <li> + <div class="post-list-item"> + <div class="post-header"> + <h4 class="post-link"><a href="{{ .Permalink }}">{{ .Title }}</a></h4> + <h4 class="post-date">{{ .Date.Format "2006-01-02" }}</h4> + </div> + <div class="post-summary"><p>{{ .Summary }}</p></div> + <div class="post-list-footer text-center"> + <a href="{{ .Permalink }}">{{ i18n "read-more" }}</a> + </div> </div> - </div> - </li> - {{ end }} - </ul> - {{ partial "pagination" . }} - <div class="push"></div> + </li> + {{ end }} + </ul> + {{ partial "pagination" . }} + </div> + {{ partial "footer.html" . }} </div> - {{ partial "footer.html" . }} </body> </html> diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 1779dea..113b8c7 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -9,19 +9,20 @@ <body> {{ partial "header.html" . }} - <div class="container wrapper"> - <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> - <span class="post-date">{{ .Date.Format "2006-01-02 " }}</span> - <div class="post-content"> - {{ .Content }} + <div class="flex-wrapper"> + <div class="container wrapper"> + <h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1> + <span class="post-date">{{ .Date.Format "2006-01-02 " }}</span> + <div class="post-content"> + {{ .Content }} + </div> + {{ if (isset .Params "nocomments") }} + {{ else }} + <div class="post-comments"> + {{ template "_internal/disqus.html" . }} + </div> + {{ end }} </div> - {{ if (isset .Params "nocomments") }} - {{ else }} - <div class="post-comments"> - {{ template "_internal/disqus.html" . }} - </div> - {{ end }} - <div class="push"></div> + {{ partial "footer.html" . }} </div> - {{ partial "footer.html" . }} </body> diff --git a/layouts/index.html b/layouts/index.html index 903315c..0fc3f0e 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -8,31 +8,32 @@ </head> <body> {{ partial "header.html" . }} - <div class="container wrapper"> - {{ with .Site.Params.ProfilePicture }} - <div class="row"> - <div class="col-sm-3 col-centered"> - <img alt="profile-picture" class="img-responsive img-circle user-picture center-block" src="{{.}}"> + <div class="flex-wrapper"> + <div class="container wrapper"> + {{ with .Site.Params.ProfilePicture }} + <div class="row"> + <div class="col-sm-3 col-centered"> + <img alt="profile-picture" class="img-responsive img-circle user-picture center-block" src="{{.}}"> + </div> </div> - </div> - {{ end }} - <div class="row"> - <div class="col-xs-12 user-profile text-center"> - <h1 id="user-name">{{ .Site.Params.Name }}</h1> + {{ end }} + <div class="row"> + <div class="col-xs-12 user-profile text-center"> + <h1 id="user-name">{{ .Site.Params.Name }}</h1> + </div> </div> - </div> - <div class="row"> - <div class="col-xs-12 user-social text-center"> - {{ partial "social.html" . }} + <div class="row"> + <div class="col-xs-12 user-social text-center"> + {{ partial "social.html" . }} + </div> </div> - </div> - <div class="row"> - <div class="col-md-4 col-md-offset-4 user-description text-center"> - <p>{{ .Site.Params.About }}</p> + <div class="row"> + <div class="col-md-4 col-md-offset-4 user-description text-center"> + <p>{{ .Site.Params.About }}</p> + </div> </div> </div> - <div class="push"></div> + {{ partial "footer.html" . }} </div> - {{ partial "footer.html" . }} </body> </html> diff --git a/static/css/nix.css b/static/css/nix.css index 52a0791..f60e613 100644 --- a/static/css/nix.css +++ b/static/css/nix.css @@ -11,13 +11,19 @@ body { height: 100%; font-family: 'Open Sans', sans-serif; font-size: 1.5em; - padding-top: 70px; } img { max-width: 100%; } +.flex-wrapper { + display: flex; + min-height: 100vh; + flex-direction: column; + justify-content: space-between; + padding-top: 70px; +} #green-terminal { color: #00ff00; @@ -119,19 +125,20 @@ i { .wrapper { min-height: 100%; - margin: 0 auto -50px; + margin: 0 auto; } .footer { background-color: #F5F5F5; - display: block; + display: flex; + flex-direction: row; + justify-content: center; width: 100%; padding: 10px; - height: 50px; } -.push { - height: 50px; +.footer p { + margin: 0 !important; } .col-centered{ |