Merge branch 'master' of github.com:devcows/hugo-universal-theme

* 'master' of github.com:devcows/hugo-universal-theme:
  Fixed styles. Added GoogleMaps at contact page.

4 files changed, 94 insertions, 3 deletions

diff --git a/exampleSite/config.toml b/exampleSite/config.toml
index a4f51e1..3411ca9 100644
--- a/exampleSite/config.toml
+++ b/exampleSite/config.toml
@@ -65,6 +65,12 @@ theme = "universal"
 [social]
     github = "devcows"
 
+[params.contact]
+    map = true
+    mapLat = 41.1333037
+    mapLng = 1.2467193
+    mapTitle = "DevCows"
+
 # Enable and disable widgets for the right sidebar
 [params.widgets]
     categories = true
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 1a0691e..9b84ff1 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -21,7 +21,7 @@
                 {{ range first 3 (where .Site.Pages "Type" "post") }}
                 <div class="item same-height-row clearfix">
                     <div class="image same-height-always">
-                        <a href="#">
+                        <a href="{{ .Permalink }}">
                           {{ if isset .Params "banner" }}
                             <img src="{{ .Site.BaseURL}}{{ .Params.banner }}" class="img-responsive" alt="">
                           {{ else }}
@@ -75,7 +75,7 @@ _________________________________________________________ -->
             {{ end }}
             <p class="pull-right">
               Template by <a href="http://bootstrapious.com/free-templates">Bootstrapious</a>.
-              Ported by <a href="http://devcows.com">DevCows</a>
+              Ported by <a href="https://github.com/devcows/hugo-universal-theme">DevCows</a>
                 <!-- Not removing these links is part of the licence conditions of the template. Thanks for understanding :) -->
             </p>
         </div>
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
index fb1085e..6ea0bee 100644
--- a/layouts/partials/scripts.html
+++ b/layouts/partials/scripts.html
@@ -12,3 +12,79 @@
 
 <!-- owl carousel -->
 <script src="{{ .Site.BaseURL }}js/owl.carousel.min.js"></script>
+
+<!-- gmaps -->  
+<script src="https://maps.googleapis.com/maps/api/js?v=3.exp&amp;sensor=false" data-turbolinks-eval="false"></script>
+<script src="{{ .Site.BaseURL }}js/gmaps.js"></script>
+
+{{ if isset .Site.Params "contact" }}
+{{ if .Site.Params.contact.map }}
+  <!-- gmaps -->
+  <script type="text/javascript">
+    $(document).ready(ready);
+    $(document).on('page:load', ready);
+
+    /* map */
+    function ready() {
+        if ($("#map").length > 0) {
+            var styles = [{
+                "featureType": "landscape",
+                "stylers": [{"saturation": -100}, {"lightness": 65}, {"visibility": "on"}]
+            }, {
+                "featureType": "poi",
+                "stylers": [{"saturation": -100}, {"lightness": 51}, {"visibility": "simplified"}]
+            }, {
+                "featureType": "road.highway",
+                "stylers": [{"saturation": -100}, {"visibility": "simplified"}]
+            }, {
+                "featureType": "road.arterial",
+                "stylers": [{"saturation": -100}, {"lightness": 30}, {"visibility": "on"}]
+            }, {
+                "featureType": "road.local",
+                "stylers": [{"saturation": -100}, {"lightness": 40}, {"visibility": "on"}]
+            }, {
+                "featureType": "transit",
+                "stylers": [{"saturation": -100}, {"visibility": "simplified"}]
+            }, {"featureType": "administrative.province", "stylers": [{"visibility": "off"}]}, {
+                "featureType": "water",
+                "elementType": "labels",
+                "stylers": [{"visibility": "on"}, {"lightness": -25}, {"saturation": -100}]
+            }, {
+                "featureType": "water",
+                "elementType": "geometry",
+                "stylers": [{"hue": "#ffff00"}, {"lightness": -25}, {"saturation": -97}]
+            }];
+            map = new GMaps({
+                el: '#map',
+                lat: {{ .Site.Params.contact.mapLat }},
+                lng: {{ .Site.Params.contact.mapLng }},
+                zoomControl: true,
+                zoomControlOpt: {
+                    style: 'SMALL',
+                    position: 'TOP_LEFT'
+                },
+                panControl: false,
+                streetViewControl: false,
+                mapTypeControl: false,
+                overviewMapControl: false,
+                scrollwheel: false,
+                draggable: false,
+                styles: styles
+            });
+
+            var image = '{{ .Site.BaseURL }}img/marker.png';
+
+            map.addMarker({
+                lat: {{ .Site.Params.contact.mapLat }},
+                lng: {{ .Site.Params.contact.mapLng }},
+                icon: image,
+                title: '{{ .Site.Params.contact.mapTitle }}',
+                 /*infoWindow: {
+                 content: '<p>HTML Content</p>'
+                }*/
+            });
+        }
+    }
+  </script>
+{{ end }}
+{{ end }}
diff --git a/static/css/custom.css b/static/css/custom.css
index a4b5576..95c3097 100644
--- a/static/css/custom.css
+++ b/static/css/custom.css
@@ -1 +1,10 @@
-/* your styles go here */
\ No newline at end of file
+/* your styles go here */
+
+.box-image-text .image {
+  min-height: 200px;
+  max-height: 200px;
+}
+
+.box-simple {
+  min-height: 230px;
+}