diff options
| author | Adam Carpenter <gitlab@53hor.net> | 2019-06-03 20:19:48 -0400 | 
|---|---|---|
| committer | Adam Carpenter <gitlab@53hor.net> | 2019-06-03 20:19:48 -0400 | 
| commit | a2a168223078198e72dbcfa6c4d755819fe07b83 (patch) | |
| tree | 2e02df5b0f4d5aa13b71878722a1998bf7a7f116 /_layouts | |
| parent | fc2e0aced5013b50ecdbcfcf8ed3fd055ab63da5 (diff) | |
| parent | cd1969f17742d9d72b1502cb2a6baa62e8be5c3e (diff) | |
| download | cobalt-site-a2a168223078198e72dbcfa6c4d755819fe07b83.tar.xz cobalt-site-a2a168223078198e72dbcfa6c4d755819fe07b83.zip | |
Merge branch 'construction'
Diffstat (limited to '_layouts')
| -rw-r--r-- | _layouts/index.liquid | 80 | ||||
| -rw-r--r-- | _layouts/journal.liquid | 72 | ||||
| -rw-r--r-- | _layouts/page.liquid | 28 | ||||
| -rw-r--r-- | _layouts/post.liquid | 48 | 
4 files changed, 173 insertions, 55 deletions
| diff --git a/_layouts/index.liquid b/_layouts/index.liquid index 6b53922..39c0084 100644 --- a/_layouts/index.liquid +++ b/_layouts/index.liquid @@ -1,21 +1,17 @@  <!DOCTYPE html>  <html>      <head> -        <meta charset="utf-8"> -        <meta name="viewport" content="width=device-width, initial-scale=1"> -        <title>{{ page.title }}</title> -        <link rel="stylesheet" href="/bulma.css"> -        <link rel="stylesheet" href="/animate.css"> +        {% include "head.liquid" %} +        <link rel="stylesheet" href="/public/css/animate.css">      </head>      <body>          <!-- begin hero --> -        <section class=" -        hero -        is-primary -        is-fullheight -        is-fullheight-with-navbar -        "> +        <section class="hero +                           is-primary +                           is-fullheight +                           is-fullheight-with-navbar +                           ">              <!-- begin hero head -->              <div class="hero-head">                  {% include "nav.liquid" %} @@ -24,38 +20,76 @@              <!-- begin hero body -->              <div class="hero-body"> -                <div class="container is-fluid"> +                <div class="container">                      <div class="columns"> -                        <div class="column"> +                        <div class="column is-two-fifths">                              <!-- begin content -->                              <div class="column"> -                                <h1 class="title animated fadeInLeft"> -                                    {{ page.title }} -                                </h1> +                                <p class="subtitle is-3"> +                                Greetings, my name is +                                </p> +                                <p class="title is-1"> +                                Adam Carpenter +                                </p> -                                <div class="content animated fadeInLeft"> -                                    {{ page.content }} +                                <div class="content"> +                                    <p> +                                    and I am a... +                                    <ul> +                                        <li> +                                            Computer programmer at ADP +                                        </li> +                                        <li> +                                            Amateur Hudson driver, mechanic, and caretaker +                                        </li> +                                        <li> +                                            Loving fiancé and puppy parent +                                        </li> +                                    </ul> +                                    </p>                                  </div> + +                                <p> +                                and this is my website. +                                </p> + +                                <p class="has-text-centered animated jello delay-1s"> +                                ↓ Keep reading below ↓  +                                </p>                              </div>                              <!-- end content -->                          </div>                          <div class="column"> -                            <div class="box animated delay-1s fadeInRight"> -                                <img src="https://nextcloud.53hor.net/s/WA4MokYXXGJHf6n/preview"> +                            <div class="box animated fadeIn"> +                                <figure class="image"> +                                    <img src="https://nextcloud.53hor.net/s/JybL4rc3AQZb3Hk/preview"> +                                </figure>                              </div>                          </div>                      </div> -                </div> +                </div>              </div>              <!-- end hero body -->          </section>          <!-- end hero --> -        {% include "footer.liquid" %} -  </body> +        <!-- begin main content --> +        <section class="section"> +            <div class="container"> +                <div class="content"> +                    {{ page.content }} +                </div> +            </div> +        </section> +        <!-- end main content --> + +        <footer class="footer"> +            {% include "footer.liquid" %} +        </footer> +    </body>  </html> diff --git a/_layouts/journal.liquid b/_layouts/journal.liquid new file mode 100644 index 0000000..e3f5ae4 --- /dev/null +++ b/_layouts/journal.liquid @@ -0,0 +1,72 @@ +<!DOCTYPE html> +<html> +    <head> +        {% include "head.liquid" %} +        <script src="/public/js/lunr.js"></script> +    </head> + +    <body> +        <!-- begin hero --> +        <section class=" +                        hero +                        is-primary +                        "> +            <!-- begin hero head --> +            <div class="hero-head"> +                {% include "nav.liquid" %} +            </div> +            <!-- end hero head --> + +            <!-- begin hero body --> +            <div class="hero-body"> +                <div class="container"> +                    <h1 class="title"> +                        {{ page.title }} +                    </h1> +                </div> +            </div> +            <!-- end hero body --> + +        </section> +        <!-- end hero --> + +        <!-- begin main content --> +        <section class="section"> +            <div class="container"> + +                <div class="content"> +                    {{ page.content }} +                </div> + +            </div> +        </section> +        <!-- end main content --> + +        <!-- begin blog posts --> +        <section class="section"> +            <div class="container"> +                <div class="columns"> + +                    <!-- begin short post list --> +                    <div class="column is-narrow"> +                        {% include all-posts.liquid %} +                    </div> +                    <!-- end short post list --> + +                    <!-- begin long post list --> +                    <div class="column"> +                        {% include post-list.liquid %} +                    </div> +                    <!-- end long post list --> + +                </div> +            </div> +        </section> +        <!-- end blog posts --> + +        <footer class="footer"> +            {% include "footer.liquid" %} +        </footer> +    </body> + +</html> diff --git a/_layouts/page.liquid b/_layouts/page.liquid index b97dc7e..28e8e20 100644 --- a/_layouts/page.liquid +++ b/_layouts/page.liquid @@ -1,18 +1,12 @@  <!DOCTYPE html>  <html>      <head> -        <meta charset="utf-8"> -        <meta name="viewport" content="width=device-width, initial-scale=1"> -        <title>{{ page.title }}</title> -        <link rel="stylesheet" href="/bulma.css"> +        {% include "head.liquid" %}      </head>      <body>          <!-- begin hero --> -        <section class=" -        hero -        is-primary -        "> +        <section class="hero is-primary">              <!-- begin hero head -->              <div class="hero-head">                  {% include "nav.liquid" %} @@ -21,7 +15,7 @@              <!-- begin hero body -->              <div class="hero-body"> -                <div class="container is-fluid"> +                <div class="container">                      <h1 class="title">                          {{ page.title }}                      </h1> @@ -34,15 +28,19 @@          <!-- begin main content -->          <section class="section"> -            <div class="container is-fluid"> +            <div class="container">                  <div class="columns">                      <div class="column"> -                        {{ page.content }} +                        <div class="content"> +                            {{ page.content }} +                        </div>                      </div>                      <div class="column is-narrow"> -                        {% include "toc.liquid" %} +                        <aside> +                            {% include "toc.liquid" %} +                        </aside>                      </div>                  </div> @@ -50,7 +48,9 @@          </section>          <!-- end main content --> -        {% include "footer.liquid" %} -  </body> +        <footer class="footer"> +            {% include "footer.liquid" %} +        </footer> +    </body>  </html> diff --git a/_layouts/post.liquid b/_layouts/post.liquid index 54bf211..80831a2 100644 --- a/_layouts/post.liquid +++ b/_layouts/post.liquid @@ -1,18 +1,12 @@  <!DOCTYPE html>  <html>      <head> -        <meta charset="utf-8"> -        <meta name="viewport" content="width=device-width, initial-scale=1"> -        <title>{{ page.title }}</title> -        <link rel="stylesheet" href="/bulma.css"> +        {% include "head.liquid" %}      </head>      <body>          <!-- begin hero --> -        <section class=" -        hero -        is-primary -        "> +        <section class="hero is-primary">              <!-- begin hero head -->              <div class="hero-head">                  {% include "nav.liquid" %} @@ -21,33 +15,41 @@              <!-- begin hero body -->              <div class="hero-body"> -                <div class="container is-fluid"> +                <div class="container">                      <!-- begin title and date -->                      <h1 class="title">                          {{ page.title }}                      </h1>                      <h2 class="subtitle"> -                        {{ page.published_date | date: "%A, %b %e, %Y" }} +                        {% if page.published_date %} +                            {{ page.published_date | date: "%A, %b %e, %Y" }} +                        {% else %} +                            Unpublished! +                        {% endif %}                      </h2>                      <!-- end title and date -->                      <!-- begin categories and tags --> +                    <p>                      {% if page.categories %} +                        Categories:                           {% for category in page.categories %} -                            <span class="tag"> +                            <span class="tag is-rounded">                                  {{ category | downcase }}                              </span>                          {% endfor %}                      {% endif %}                      {% if page.tags %} +                        Tags:                           {% for tag in page.tags %} -                            <span class="tag"> -                                {{ tag | downcase }} +                            <span class="tag is-rounded"> +                                #{{ tag | downcase }}                              </span>                          {% endfor %}                      {% endif %} +                    </p>                      <!-- end categories and tags -->                  </div> @@ -59,15 +61,25 @@          <!-- begin main content -->          <section class="section"> -            <div class="container is-fluid"> -                <div class="content"> -                    {{ page.content }} +            <div class="container"> +                <div class="columns"> +                    <div class="column"> +                        <div class="content"> +                            {{ page.content }} +                        </div> +                    </div> + +                    <div class="column is-narrow"> +                        {% include similar-posts.liquid %} +                    </div>                  </div>              </div>          </section>          <!-- end main content --> -        {% include "footer.liquid" %} -  </body> +        <footer class="footer"> +            {% include "footer.liquid" %} +        </footer> +    </body>  </html> |