add in complete link shortcode, other minor fixes

master
David Kebler 2017-04-01 19:59:26 -07:00
parent 56ccec99c7
commit 9fa4b1149e
12 changed files with 115 additions and 58 deletions

View File

@ -1,27 +1,25 @@
<!-- CSS External Libraries --> <!-- CSS External Libraries -->
<!-- Light Gallery--> <!-- Light Gallery-->
<link href="https://cdn.jsdelivr.net/lightgallery/1.3.9/css/lightgallery.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/lightgallery/1.3.9/css/lightgallery.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/lightgallery/1.3.9/css/lg-transitions.min.css" rel="stylesheet"> <link href="https://cdn.jsdelivr.net/lightgallery/1.3.9/css/lg-transitions.min.css" rel="stylesheet">
<!-- Modal-->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-modal/0.8.0/jquery.modal.min.css" type="text/css" media="screen" />
<!-- Site Base CSS --> <!-- Site Base CSS -->
<link href="/css/base.css" rel="stylesheet"> <link href="/css/base.css" rel="stylesheet">
<!-- Site CSS --> <!-- Site CSS -->
<link href="/css/page.css" rel="stylesheet"> <link href="/css/page.css" rel="stylesheet">
<!-- Site Navigation CSS --> <!-- Site Navigation CSS -->
<link href="/css/navbar.css" rel="stylesheet"> <link href="/css/navbar.css" rel="stylesheet">
<!-- Photo Gallery Styling with thumbsup --> <!-- Responsive Media Queries -->
<!-- <link href="/css/thumbsup.css" rel="stylesheet"> --> <link href="/css/responsive.css" rel="stylesheet">
<!-- Responsive Media Queries --> <!-- configurable styles -->
<link href="/css/responsive.css" rel="stylesheet"> {{ partial "head/styles.html" . }}
<!-- configurable styles --> <!-- Custom/Override CSS files -->
{{ partial "head/styles.html" . }} {{ range .Site.Params.custom_css }}
<link rel="stylesheet" href="/css/{{ . }}"> {{ end }}
<!-- Custom/Override CSS files -->
{{ range .Site.Params.custom_css }}
<link rel="stylesheet" href="{{ . }}">
{{ end }}

View File

@ -2,32 +2,32 @@
<link href="https://cdn.jsdelivr.net/fontawesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css"> <link href="https://cdn.jsdelivr.net/fontawesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<!-- base font --> <!-- base font -->
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Roboto:300,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
<!-- Configurable Fonts --> <!-- Configurable Fonts -->
{{ with .Site.Params }} {{ with .Site.Params }}
{{ with .font }} {{ with .font }}
<link href="//fonts.googleapis.com/css?family={{ . }}:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family={{ . }}:300,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
{{ end }} {{ end }}
{{ with .navbar.font }} {{ with .navbar.font }}
<link href="//fonts.googleapis.com/css?family={{ . }}:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family={{ . }}:300,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
{{ end }} {{ end }}
{{ with .hero.font }} {{ with .hero.font }}
<link href="//fonts.googleapis.com/css?family={{ . }}:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family={{ . }}:300,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
{{ end }} {{ end }}
{{ with .hero.headline_font }} {{ with .hero.headline_font }}
<link href="//fonts.googleapis.com/css?family={{ . }}:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family={{ . }}:300,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
{{ end }} {{ end }}
{{ with .sections.font }} {{ with .sections.font }}
<link href="//fonts.googleapis.com/css?family={{ . }}:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family={{ . }}:300,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
{{ end }} {{ end }}
{{ with .sections.font_headline }} {{ with .sections.font_headline }}
<link href="//fonts.googleapis.com/css?family={{ . }}:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family={{ . }}:300,700,300italic,400italic,700italic" rel="stylesheet" type="text/css">
{{ end }} {{ end }}
{{ end }} {{ end }}

View File

@ -152,7 +152,7 @@
{{ end }} {{ end }}
{{ with .bullet_icon }} {{ with .bullet_icon }}
.section__content li::before { .section__content ul > li::before {
content: "{{ . }}"; content: "{{ . }}";
} }

View File

@ -1,9 +1,10 @@
<!-- CDNs --> <!-- CDNs -->
<!-- jQuery --> <!-- jQuery -->
<script src="https://cdn.jsdelivr.net/jquery/3.1.1/jquery.min.js"></script> <script src="https://cdn.jsdelivr.net/jquery/3.1.1/jquery.min.js"></script>
<!-- light gallery and modules/plugins --> <!-- light gallery and modules/plugins -->
<script src="https://cdn.jsdelivr.net/g/lightgallery,lg-autoplay,lg-pager,lg-thumbnail,lg-video"></script> <script src="https://cdn.jsdelivr.net/g/lightgallery,lg-autoplay,lg-pager,lg-thumbnail,lg-video"></script>
<!-- modal -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-modal/0.8.0/jquery.modal.min.js"></script>
<!-- LOCAL --> <!-- LOCAL -->
@ -22,3 +23,18 @@
<!-- Document Ready - Initialize - Window resize calls --> <!-- Document Ready - Initialize - Window resize calls -->
<script src="/js/docready.js"></script> <script src="/js/docready.js"></script>
<!-- Custom/Override js files -->
{{ range .Site.Params.custom_js }}
<script src="/js/{{ . }}"></script>
{{ end }}
<!-- Initialize Photo Galleries with a Lightbox -->
{{ if .Site.Params.galleries }}
<script>
$(document).ready(function () {
{{ range.Site.Params.galleries }}
{{ $.Site.Params.lightbox | safeJS }}('#{{ . }}'){{ end }}
});
</script>
{{ end }}

View File

@ -6,7 +6,7 @@
<div class="section__headline section__headline--{{ .File.BaseFileName }}"> <div class="section__headline section__headline--{{ .File.BaseFileName }}">
<h1>{{ .Title }}</h1> <h1>{{ .Title }}</h1>
</div> </div>
<div class="section__content section-content--{{ .File.BaseFileName }}"> <div class="section__content section-content--{{ .File.BaseFileName }}" {{ with .Params.align }} style="align-items: {{.}};"{{ end }} >
{{ .Content }} {{ .Content }}
</div> </div>
</div> </div>

View File

@ -1,4 +1,24 @@
<!-- parameters, jotformID,text for button--> {{ .Scratch.Set "url" (.Get "url") }}
<div class ="box box--btn"> {{ .Scratch.Set "height" (.Get "height") }}
<a class="btn" href="{{.Get 0 }}">{{ .Get 1 }}</a> {{ .Scratch.Set "width" (.Get "width" | default "1000") }}
</div> {{ if .Get "height" }}
{{ .Scratch.Set "height" ( printf ", height=%s" ( .Scratch.Get "height" ) ) }}
{{else}}
{{ .Scratch.Set "height" "" }}
{{ end }}
{{ if eq (.Get "display") "window" }}
{{ .Scratch.Set "url" ( printf "javascript:void( window.open('%s', 'blank', 'scrollbars=yes, toolbar=no, width=%s %s' ))" (.Scratch.Get "url") (.Scratch.Get "width") (.Scratch.Get "height") ) }}
{{ end }}
<a
{{ if eq (.Get "display") "tab" }}target="_blank"{{ end }}
{{ if eq (.Get "display") "modal" }}rel="modal:open"{{ end }}
{{ if eq (.Get "type") "btn" }}class="box box--btn btn btn--{{ .Get "size" | default "regular" }}"{{ end }}
{{ printf "href=%q" (.Scratch.Get "url") | safeHTMLAttr }}
>
{{ with .Get "icon" }}<i class="btn__icon fa fa-{{ . }}"></i>{{ end }}
{{ if eq (.Get "type") "btn" }}<div class="btn__text">{{ .Get "text" }}</div>
{{ else }}
{{ .Get "text" }}
{{ end }}
</a>

View File

@ -1,3 +0,0 @@
<div style="text-align: {{ .Get 0 }}">
{{ .Inner }}
</div>

View File

@ -110,6 +110,7 @@ a,
outline: 0; outline: 0;
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
font-weight: bold;
} }
a:hover, a:hover,
@ -157,6 +158,7 @@ hr {
border-style: solid; border-style: solid;
} }
.flex-col-center { .flex-col-center {
display: flex; display: flex;
align-items: center; align-items: center;
@ -180,3 +182,15 @@ hr {
.hide { .hide {
visibility: hidden; visibility: hidden;
} }
.text-center p {
text-align: center;
}
.text-left p {
text-align: left;
}
.text-right p {
text-align: right;
}

View File

@ -1,6 +1,6 @@
/* sections */ /* sections */
.section-headline { .section__headline {
text-align: center; text-align: center;
} }
@ -25,14 +25,14 @@
padding-bottom: 0.7em; padding-bottom: 0.7em;
} }
.section__content li::before { .section__content ul > li::before {
font-family: FontAwesome; font-family: FontAwesome;
content: "\f18e"; content: "\f18e";
padding-right: 0.5em; padding-right: 0.5em;
padding-left: 0; padding-left: 0;
} }
.section__content ul li { .section__content ul > li {
text-indent: -1.2rem; text-indent: -1.2rem;
} }
@ -74,14 +74,12 @@
Components/Shortcodes Styling Components/Shortcodes Styling
---------------- */ ---------------- */
/* box creates a flexbox wrapper */ /* box creates a flexbox wrapper, row default */
.box { .box {
display: flex; display: flex;
flex-direction: row; flex-flow: wrap;
flex-wrap: wrap;
align-content: center; align-content: center;
justify-content: center; justify-content: center;
/*padding: 0.0em;*/
} }
.box--column { .box--column {
@ -101,13 +99,30 @@
} }
.box--btn { .box--btn {
padding: 1rem; padding: 0.5rem;
margin-bottom: 0.5rem;
} }
.box--avatar { .box--btn-bar > .box--btn {
flex margin-right: 0.2em;
margin-bottom: 0.5em;
} }
.btn__text {
align-self: center;
}
.btn__icon {
align-self: center;
padding-right: 0.2em;
}
.btn--large .btn__text,
.btn--large .btn__icon {
font-size: 3rem;
}
.box--avatar > img, .box--avatar > img,
img.avatar { img.avatar {
@ -115,7 +130,7 @@ img.avatar {
border-radius: 50%; border-radius: 50%;
width: 100px; width: 100px;
height: 100px; height: 100px;
padding: .5em; padding: 0.5em;
} }
.box--avatar > a { .box--avatar > a {
@ -136,19 +151,16 @@ img.avatar {
max-width: 800px; max-width: 800px;
} }
.box__contact-info > * { .box__contact-info > * {
padding: 0.1em; padding: 0.1em;
align-self: center; align-self: center;
} }
.box__contact-info > * > * { .box__contact-info > * > * {
margin : 0.2em; margin: 0.2em;
align-self: center; align-self: center;
} }
/*turn off default bullets*/ /*turn off default bullets*/
.box--gallery { .box--gallery {
list-style: none; list-style: none;

View File

@ -2,8 +2,9 @@
/* small tablets */ /* small tablets */
@media only screen and (min-width: 600px) { @media only screen and (min-width: 600px) {
.section__content ul li { /* undo indent of small screens */
text-indent: -2rem; .section__content ul > li {
text-indent: 1rem;
} }
} }

View File

@ -5,7 +5,6 @@ $(document).ready(function () {
heroResize(); heroResize();
itemResize('iframe'); itemResize('iframe');
typeResize(); // for section content typeResize(); // for section content
lightbox('#4005') // TODO put this in template instead of hard coding using parameter
// resize elements on change // resize elements on change
$(window).resize(function () { $(window).resize(function () {

View File

@ -79,7 +79,7 @@ function typeResize() {
// Lightbox for Gallery // Lightbox for Gallery
function lightbox(id) { function lightgallery(id) {
// Intialize all the media i.e. photos with "media" id // Intialize all the media i.e. photos with "media" id
// TODO use Hugo params to initialize multiple galleries/albums // TODO use Hugo params to initialize multiple galleries/albums
var lg = $(id).lightGallery({ var lg = $(id).lightGallery({