Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port to Boostrap 4 #246

Open
wants to merge 4 commits into
base: master_v2
Choose a base branch
from
Open

Port to Boostrap 4 #246

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56f9349
Port to Boostrap 4
varnerac Dec 2, 2019
32611a0
Address reviewer comments.
varnerac Dec 17, 2019
7742dce
Merge branch 'master_v2' into migrate_to_bootstrap_4
varnerac Dec 17, 2019
52e5b76
Fix error caused by my merge commit
varnerac Dec 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions exampleSite/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,8 @@ paginate = 10
# Enable or disable top bar with social icons
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ line 85 you should update the comment about the default theme color (now turquoise instead of light-blue)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

[params.topbar]
enable = true
text = """<p class="hidden-sm hidden-xs">Contact us on +420 777 555 333 or [email protected].</p>
<p class="hidden-md hidden-lg"><a href="#" data-animate-hover="pulse"><i class="fas fa-phone"></i></a>
<a href="#" data-animate-hover="pulse"><i class="fas fa-envelope"></i></a>
</p>
"""
text = """<p>Contact us on +420 777 555 333 or [email protected].</p>
"""

# Enable and disable widgets for the right sidebar
[params.widgets]
Expand All @@ -143,35 +140,35 @@ paginate = 10
enable = true
# All carousel items are defined in their own files. You can find example items
# at 'exampleSite/data/carousel'.
# For more informtion take a look at the README.
# For more information take a look at the README.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@varnerac I would appreciate misspelling words to be in another PR directly to master branch.


[params.features]
enable = true
# All features are defined in their own files. You can find example items
# at 'exampleSite/data/features'.
# For more informtion take a look at the README.
# For more information take a look at the README.

[params.testimonials]
enable = true
# All testimonials are defined in their own files. You can find example items
# at 'exampleSite/data/testimonials'.
# For more informtion take a look at the README.
# For more information take a look at the README.
title = "Testimonials"
subtitle = "We have worked with many clients and we always like to hear they come out from the cooperation happy and satisfied. Have a look what our clients said about us."

[params.see_more]
enable = true
icon = "far fa-file-alt"
icon = "far fa-file-code"
title = "Do you want to see more?"
subtitle = "We have prepared for you more than 40 different HTML pages, including 5 variations of homepage."
link_url = "#"
link_text = "Check other homepages"
link_text = "See another homepage"

[params.clients]
enable = true
# All clients are defined in their own files. You can find example items
# at 'exampleSite/data/clients'.
# For more informtion take a look at the README.
# For more information take a look at the README.
title = "Our Clients"
subtitle = ""

Expand Down
25 changes: 12 additions & 13 deletions layouts/_default/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<div id="content">
<div class="container">
<div class="row">
<div class="row bar">
<!-- *** LEFT COLUMN *** -->

<div class="col-md-9" id="blog-listing-medium">
Expand All @@ -30,23 +30,22 @@
<div class="image">
<a href="{{ .Permalink }}">
{{ if .Params.banner }}
<img src="{{ .Params.banner | relURL }}" class="img-responsive" alt="">
<img src="{{ .Params.banner | relURL }}" class="img-fluid" alt="">
{{ else }}
<img src="{{ "img/placeholder.png" | relURL }}" class="img-responsive" alt="">
{{ end }}
<img src="{{ "img/placeholder.png" | relURL }}" class="img-fluid" alt=""> {{ end }}
</a>
</div>
</div>
<div class="col-md-8">
<h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
<div class="clearfix">
<h2 class="h3 mt-0"><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
<div class="d-flex flex-wrap justify-content-between text-xs">
<p class="author-category">
{{ if isset .Params "author" }}
{{ i18n "authorBy" }} <a href="#">{{ .Params.author }}</a>
{{ end }}
{{ if isset .Params "categories" }}
{{ if gt (len .Params.categories) 0 }}
in <a href="{{ "categories/" | relURL }}{{ index .Params.categories 0 | urlize | lower }}">{{ index .Params.categories 0 }}</a>
in <a href="{{ $.Site.BaseURL }}categories/{{ index .Params.categories 0 | urlize | lower }}">{{ index .Params.categories 0 }}</a>
{{ end }}
{{ end }}

Expand All @@ -56,24 +55,24 @@ <h2><a href="{{ .Permalink }}">{{ .Title }}</a></h2>
</p>
</div>
<p class="intro">{{ .Summary }}</p>
<p class="read-more"><a href="{{ .Permalink }}" class="btn btn-template-main">{{ i18n "continueReading" }}</a>
<p class="read-more text-right"><a href="{{ .Permalink }}" class="btn btn-template-outlined">{{ i18n "continueReading" }}</a>
</p>
</div>
</div>
</section>
{{ end }}

<ul class="pager">
<ul class="pager d-flex align-items-center justify-content-between list-unstyled">
{{ if .Paginator.HasPrev }}
<li class="previous"><a href="{{ .Paginator.Prev.URL | relURL }}">&larr; {{ i18n "newer" }}</a></li>
<li class="previous"><a class="btn btn-template-outlined" href="{{ .Paginator.Prev.URL | relURL }}">&larr; {{ i18n "newer" }}</a></li>
{{ else }}
<li class="previous disabled"><a href="#">&larr; {{ i18n "newer" }}</a></li>
<li class="previous disabled"><a class="btn btn-template-outlined" href="#">&larr; {{ i18n "newer" }}</a></li>
{{ end }}

{{ if .Paginator.HasNext }}
<li class="next"><a href="{{ .Paginator.Next.URL | relURL }}">{{ i18n "older" }} &rarr;</a></li>
<li class="next"><a class="btn btn-template-outlined" href="{{ .Paginator.Next.URL | relURL }}">{{ i18n "older" }} &rarr;</a></li>
{{ else }}
<li class="next disabled"><a href="#">{{ i18n "older" }} &rarr;</a></li>
<li class="next disabled"><a class="btn btn-template-outlined" href="#">{{ i18n "older" }} &rarr;</a></li>
{{ end }}
</ul>
</div>
Expand Down
36 changes: 20 additions & 16 deletions layouts/partials/carousel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,33 @@
{{ if isset .Site.Params "carousel" }}
{{ if .Site.Params.carousel.enable }}
{{ if gt (len .Site.Data.carousel) 0 }}
<section>
<div class="home-carousel">
<div class="dark-mask"></div>
<div class="container">
<div class="homepage owl-carousel">
{{ range sort .Site.Data.carousel "weight" }}
<div class="item">
<div class="row">
<div class="col-sm-5 right">
<h1>{{ .title }}</h1>
{{ .description | safeHTML }}
</div>
<div class="col-sm-7">
<img class="img-responsive" src="{{ .image }}" alt="">
<!-- carousel start -->
<section style="background: url('../img/photogrid.jpg') center center repeat; background-size: cover;" class="bar background-white relative-positioned">
<div class="container">
<div class="home-carousel">
<div class="dark-mask mask-primary"></div>
<div class="container">
<div class="homepage owl-carousel owl-loaded owl-drag">
{{ range sort .Site.Data.carousel "weight" }}
<div class="item">
<div class="row">
<div class="col-sm-5 right">
<h1>{{ .title }}</h1>
{{ .description | safeHTML }}
</div>
<div class="col-sm-7">
<img class="img-responsive" src="{{ .image }}" alt="">
</div>
</div>
</div>
{{ end }}
</div>
{{ end }}
<!-- /.project owl-slider -->
</div>
<!-- /.project owl-slider -->
</div>
</div>
</section>
<!-- carousel start -->
{{ end }}
{{ end }}
{{ end }}
46 changes: 21 additions & 25 deletions layouts/partials/clients.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,30 @@
{{ if isset .Site.Params "clients" }}
{{ if .Site.Params.clients.enable }}
{{ if gt (len .Site.Data.clients) 0 }}
<section class="bar background-gray no-mb">
<section class="bar bg-gray">
<div class="container">
<div class="row">
<div class="col-md-12">
<div class="heading text-center">
<h2>{{ .Site.Params.clients.title | markdownify }}</h2>
</div>
<div class="heading text-center">
<h2>{{ .Site.Params.clients.title | markdownify }}</h2>
</div>

<p class="lead">
{{ .Site.Params.clients.subtitle | markdownify }}
</p>
<p class="lead">
{{ .Site.Params.clients.subtitle | markdownify }}
</p>

<ul class="owl-carousel customers">
{{ range .Site.Data.clients }}
<li class="item" title="{{ .name }}">
{{ if .url }}
<a href="{{ .url }}" target="_blank">
<img src="{{ .image }}" alt="{{ .name }}" class="img-responsive" />
</a>
{{ else }}
<img src="{{ .image }}" alt="{{ .name }}" class="img-responsive" />
{{ end }}
</li>
{{ end }}
</ul>
<!-- /.owl-carousel -->
</div>
</div>
<ul class="list-unstyled owl-carousel customers no-mb">
{{ range .Site.Data.clients }}
<li class="item" title="{{ .name }}">
{{ if .url }}
<a href="{{ .url }}" target="_blank">
<img src="{{ .image }}" alt="{{ .name }}" class="img-responsive" />
</a>
{{ else }}
<img src="{{ .image }}" alt="{{ .name }}" class="img-responsive" />
{{ end }}
</li>
{{ end }}
</ul>
<!-- /.owl-carousel -->
</div>
</section>
{{ end }}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/contact.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="row">
<div class="col-md-8">

<section>
<section class="bar">

{{ .Content }}

Expand Down
4 changes: 2 additions & 2 deletions layouts/partials/features.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
{{ with $element.url }}
<a href="{{ $element.url }}">
{{ end }}
<div class="icon">
<div class="icon-outlined">
<i class="{{ .icon }}"></i>
</div>
{{ with $element.url }}
</a>
{{ end }}
<h3>{{ $element.name | markdownify }}</h3>
<h3 class="h4">{{ $element.name | markdownify }}</h3>
Copy link
Contributor

@ryanfox1985 ryanfox1985 Dec 11, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it sounds weird h3 and class h4.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. I just ripped this off from the Boostrapious live demo/raw distro. We download the raw distro from them and pay for a non-attribution license.

Copy link
Contributor

@ryanfox1985 ryanfox1985 Dec 13, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I leave the comment opened to remember this on the final check

<p>{{ $element.description | markdownify }}</p>
</div>
</div>
Expand Down
Loading