diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..85d8eff --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,5 @@ +# Main website, config, and theme is managed by Infra team +* @leigh-hackspace/infra + +# Website content is managed by the Web Editors team +content/* @leigh-hackspace/web-editors \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index e04a1e9..edb812a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,5 +4,9 @@ "language": "markdown", "scheme": "file" } + ], + "cSpell.words": [ + "hackspace", + "makerspace" ] } \ No newline at end of file diff --git a/assets/js/calendar.js b/assets/js/calendar.js new file mode 100644 index 0000000..4a39add --- /dev/null +++ b/assets/js/calendar.js @@ -0,0 +1,26 @@ + +var events = []; +$(document).ready(function () { + $.getJSON('https://api.leighhack.org/events', function (data) { + data.forEach(function (event) { + events.push({ + id: event['uid'], + title: event['summary'], + body: event['description'], + state: 'Free', + dueDateClass: '', + start: event['start']['dateTime'], + end: event['end']['dateTime'], + }) + }); + let ec = new EventCalendar(document.getElementById('calendar'), { + view: 'listMonth', + events: events, + headerToolbar: { + start: 'prev,next today', + center: 'title', + end: 'dayGridMonth, listMonth' + }, + }); + }); +}); diff --git a/config.toml b/config.toml index 874297e..303c623 100644 --- a/config.toml +++ b/config.toml @@ -10,19 +10,16 @@ filename = 'sitemap.xml' priority = -1 [imaging] - bgColor = '#ffffff' - hint = 'photo' - quality = 85 - resampleFilter = 'MitchellNetravali' +bgColor = '#ffffff' +resampleFilter = 'CatmullRom' [params] company = "Leigh Hackspace CIC" company_number = "09404083" copyright_years = "2023" +contact_email = "info@leighhack.org" description = "Leigh Hackspace is a hackspace located in the north-west of England." - -[params.social] -twitter = 'leigh_hackspace' +calendarUrl = "https://api.leighhack.org/events.ics" # Header links [menu] @@ -43,7 +40,7 @@ weight = 3 [[menu.main]] name = "Blog" -pageRef = "/blog" +pageRef = "blog" weight = 4 [[menu.main]] @@ -56,38 +53,53 @@ name = "Events" pageRef = "events" weight = 6 +[[menu.policies]] +name = "Code of Conduct" +pageRef = "policies/code_of_conduct" +weight = 1 + +[[menu.policies]] +name = "Disputes" +pageRef = "policies/disputes" +weight = 2 + +[[menu.policies]] +name = "CCTV Policy" +pageRef = "policies/cctv_policy" +weight = 3 + # Social links [[params.social_links]] name = "mastodon" url = "https://mastodon.social/@leigh_hackspace" -icon = "fa-mastodon" +icon = "fab fa-mastodon" [[params.social_links]] name = "twitter" url = "https://twitter.com/leigh_hackspace" -icon = "fa-twitter" +icon = "fab fa-twitter" [[params.social_links]] name = "instagram" url = "https://www.instagram.com/leighhackspace" -icon = "fa-instagram" +icon = "fab fa-instagram" [[params.social_links]] name = "facebook" -url = "https://www.facebook.com/groups/leighhackspace/" -icon = "fa-facebook-square" +url = "https://www.facebook.com/LeighHackspace" +icon = "fab fa-facebook-square" [[params.social_links]] name = "slack" url = "https://join.slack.com/t/leighhack/shared_invite/enQtNDYzMjEyMDMxNDExLTE1MWY5N2IwMzdhMzQ0ZWFiNDkyNzJmMGM1ZmFkODcwMGM5ODFmYmI4MjhmM2JiMWEyY2E3NTRjMTQzMzljZWU" -icon = "fa-slack" +icon = "fab fa-slack" [[params.social_links]] name = "github" url = "https://github.com/leigh-hackspace" -icon = "fa-github-alt" +icon = "fab fa-github-alt" [[params.social_links]] name = "discourse" url = "https://discourse.leighhack.org" -icon = "fa-discourse" +icon = "fab fa-discourse" diff --git a/content/blog/2023/powerbook-g4-disk-replacement/index.md b/content/blog/2023/powerbook-g4-disk-replacement/index.md index 098db03..ae09f1f 100644 --- a/content/blog/2023/powerbook-g4-disk-replacement/index.md +++ b/content/blog/2023/powerbook-g4-disk-replacement/index.md @@ -25,7 +25,7 @@ The initial disassembly took about an hour, and most of that time was spent tryi The replacement hard drive I purchased was a '[Bingogo 2.5" IDE 128GB](https://www.ebay.co.uk/itm/392852308254)'. Chris, the member with the iBook G4, had chosen to buy a cheaper mSATA to IDE converter to replace his iBook drive and when my drive turned up it just turned out to also be a mSATA converter with a disk included. -Chris has come prepared. In advance of reinstalling his own device, he had downloaded a community-created full disk image of a working Leopard (10.5) install. He was able to write the image onto my drive, saving me from having to fight with physical media and a long installation process. After cobbling together a working system I hit the power for the first time and crossed my fingers. Initially, it look like the image didn't work. The useful 'folder with a question mark' appeared, but at least it was better than when the faulty hard drive was in it. After a little bit of research on Google, we came across the [Openfirmware Wiki](https://forums.macrumors.com/threads/the-open-firmware-wiki.2225024/) on MacRumors, which at least got us to a prompt that we could start investigating what was going on. +Chris has come prepared. In advance of reinstalling his device, he had downloaded a community-created full disk image of a working Leopard (10.5) install. He was able to write the image onto my drive, saving me from having to fight with physical media and a long installation process. After cobbling together a working system I hit the power for the first time and crossed my fingers. Initially, it looked like the image didn't work. The useful 'folder with a question mark' appeared, but at least it was better than when the faulty hard drive was in it. After a little bit of research on Google, we came across the [Openfirmware Wiki](https://forums.macrumors.com/threads/the-open-firmware-wiki.2225024/) on MacRumors, which at least got us to a prompt that we could start investigating what was going on. {{< image src="openfirmware.jpg" width="400x" class="is-pulled-left" title="We have a working Openfirmware prompt">}} diff --git a/content/facilities/craft_space/index.md b/content/facilities/craft_space/index.md index 115aee2..2dda211 100644 --- a/content/facilities/craft_space/index.md +++ b/content/facilities/craft_space/index.md @@ -5,7 +5,7 @@ subtitle: "A working area for sewing, textiles and other crafts." {{< image src="sewing.jpg" width="400x" class="is-pulled-right" >}} -Bring your textile creations to life at Leigh Hackspace. Our range of sewing and knitting tools and accessories are available to you whether you want to sew a button, stich a hem, or knit a hat. +Bring your textile creations to life at Leigh Hackspace. Our range of sewing and knitting tools and accessories are available to you whether you want to sew a button, stitch a hem, or knit a hat. ### What is available? diff --git a/content/facilities/fabrication/index.md b/content/facilities/fabrication/index.md index fe0192c..ca59762 100644 --- a/content/facilities/fabrication/index.md +++ b/content/facilities/fabrication/index.md @@ -7,16 +7,16 @@ subtitle: Use 3D printers and laser cutters to bring your creations to life. 3D printers, vinyl cutters, and laser engraving. If this sounds interesting to you then fabrication is the place you'll want to check out. -Leigh Hackspace currently operates three 3D printers, a [Anycubic Vyper](https://www.anycubic.com/products/anycubic-vyper), a [Ender 3 Pro](https://www.creality.com/products/ender-3-pro-3d-printer), and a Makerbot Replicator 2. Between them they're able to print most things you can think of. We also hold a stock of filament that is available for use by members. +Leigh Hackspace currently operates three 3D printers, an [Anycubic Vyper](https://www.anycubic.com/products/anycubic-vyper), an [Ender 3 Pro](https://www.creality.com/products/ender-3-pro-3d-printer), and a Makerbot Replicator 2. Between them they're able to print most things you can think of. We also hold a stock of filament that is available for use by members. For engraving, we have a hackspace built laser engraver that can work with a variety of materials. While it isn't powerful enough to cut it can handle any engraving and etching job with ease. -Our vinyl cutter is a A3 GCC Lynx S-30 desktop cutter, a small industrial machine that can handle roll and sheet material, and can do most jobs without issue. +Our vinyl cutter is an A3 GCC Lynx S-30 desktop cutter, a small industrial machine that can handle roll and sheet material, and can do most jobs without issue. -We also have a CAD system available for member use, everything needed to get you started on the 3D printers, laser engraver, and the vinyl cutter is ready to go on the system. No extra setup of your PC required. +We also have a CAD system available for member use, everything needed to get you started on the 3D printers, laser engraver, and the vinyl cutter is ready to go on the system. No extra setup of your PC is required. ### 3D Printer Status -Our 3D printers are all connected and can be tracked remotely by member, allowing you to leave long running jobs going. Here is live look at what our printers are currently doing: +Our 3D printers are all connected and can be tracked remotely by members, allowing you to leave long running jobs going. Here is a live look at what our printers are currently doing: {{< printers >}} \ No newline at end of file diff --git a/content/facilities/pi_room/index.md b/content/facilities/pi_room/index.md index 1c4b382..e4f3324 100644 --- a/content/facilities/pi_room/index.md +++ b/content/facilities/pi_room/index.md @@ -5,8 +5,8 @@ subtitle: "Open access computers, and co-working space." {{< image src="pc_reinstall.jpg" width="400x" class="is-pulled-right" >}} -Welcome to the Pi Room, affectionately named after our Unit number of 3.14. It serves as our collaborative workspace and computer hub, equipped with a set of public use PCs exclusively for our members. +Welcome to the Pi Room, affectionately named after our Unit number 3.14. It serves as our collaborative workspace and computer hub, equipped with a set of public use PCs for use by members and visitors. -Beyond its functional role, the Pi Room doubles as a social hotspot, hosting small events like [Manchester Grey Hats](https://manchestergreyhats.co.uk) Hats. Weekends often see a gathering of members immersed in various projects, engaging in lively conversations. +Beyond its functional role, the Pi Room doubles as a social hotspot, hosting small events like [Manchester Grey Hats](https://manchestergreyhats.co.uk) Hats. Weekends often see a gathering of members immersed in various projects and engaging in lively conversations. -During quieter periods, the Pi Room transforms into an ideal co-working space. Complete with WiFi, a reliable internet connection, coffee and tea amenities, as well as a convenient tuck shop for your snack cravings. \ No newline at end of file +During quieter periods, the Pi Room transforms into an ideal co-working space, complete with WiFi and a reliable internet connection. \ No newline at end of file diff --git a/content/facilities/social_space/index.md b/content/facilities/social_space/index.md index 7f2fe4f..e76d1a5 100644 --- a/content/facilities/social_space/index.md +++ b/content/facilities/social_space/index.md @@ -5,6 +5,6 @@ subtitle: "A social area to relax and run events from." {{< image src="social_space.jpg" width="400x" class="is-pulled-right" >}} -Our social space is the open area that can be used to relax, play some games, or even run an event. The space is fitted with a small stage, a bar, seats, and tables. +Our social space is an open area that can be used to relax, play some games, or even run an event. The space is fitted with a small stage, a bar, seats, and tables. The space is available for members and the public (with member support) to run events in. If you're interested in running a regular event or using the space then please get in contact. \ No newline at end of file diff --git a/content/facilities/workshop/index.md b/content/facilities/workshop/index.md index 90dd883..04b9271 100644 --- a/content/facilities/workshop/index.md +++ b/content/facilities/workshop/index.md @@ -10,8 +10,7 @@ Our woodwork shop is the home of everything loud and dusty, along with a stock o ### What is available? #### Hand Tools - -* Screw drivers, bits of various types and sizes. +* Screwdrivers, bits of various types and sizes. * Chisels for general use. * Craft knives. * Wood and metal saws. diff --git a/content/history/index.md b/content/history/index.md index 535b8a8..bb7b7ca 100644 --- a/content/history/index.md +++ b/content/history/index.md @@ -32,7 +32,7 @@ The initial build-out happened during November 2019, but was paused early 2020 d ### Leigh Hackspace '3.0' -The '3.0' hackspace opened Feburary 2023 and now consists of three units on the third floor of the mill. A shared main space, a workshop and craft area, and a social space. Some areas were still being built out, but the space was now open for members to use. +The '3.0' hackspace opened February 2023 and now consists of three units on the third floor of the mill. A shared main space, a workshop and craft area, and a social space. Some areas were still being built out, but the space was now open for members to use. In early July the [electronics bay]({{< ref "/facilities#electronics-bay" >}}) was completed giving members a wide selection of tools and components for any projects they are created. Then in November the [darkroom]({{< ref "/facilities#dark-room" >}}) was finally fitted for power and could be used by our members. @@ -40,4 +40,4 @@ In early July the [electronics bay]({{< ref "/facilities#electronics-bay" >}}) w ## Looking to the future -The hackspace will always be in a fluid state as we think of additional ways to utilize the space available to us. Our on-going aim is to foster relationships with the mill residents and the wider Leigh community. \ No newline at end of file +The hackspace will always be in a fluid state as we think of additional ways to utilize the space available to us. Our ongoing aim is to foster relationships with the mill residents and the wider Leigh community. \ No newline at end of file diff --git a/content/policies/cctv_policy.md b/content/policies/cctv_policy.md index d139a2a..10e8ad8 100644 --- a/content/policies/cctv_policy.md +++ b/content/policies/cctv_policy.md @@ -10,7 +10,7 @@ subtitle: How we manage our CCTV facility ## Introduction -The hackspace uses closed circuit television (CCTV) images to protect the hackspace’s property and to provide a safe and secure environment for employees and visitors to the hackspace’s premises. This policy sets out the details of how the hackspace will collect, use and store CCTV images. +The hackspace uses closed circuit television (CCTV) images to protect the hackspace’s property and to provide a safe and secure environment for members and visitors to the hackspace’s premises. This policy sets out the details of how the hackspace will collect, use and store CCTV images. The hackspace’s CCTV facility will only record images. There is no audio recording i.e. conversations are not recorded on CCTV. @@ -63,7 +63,7 @@ All requests for disclosure and access to images will be documented, including t Under the UK’s data protection laws, including the General Data Protection Regulation (GDPR), individuals have the right on request to receive a copy of the personal data that the hackspace holds about them, including CCTV images if they are recognisable from the image. -If you wish to access any CCTV images relating to you, you must make a written request to the hackspace’s directors. This can be done by using this email address [info@leighhack.org](mailto:info@leighhack.org). The hackspace will usually not make a charge for such a request, but we may charge a reasonable fee if you make a request which is manifestly unfounded or excessive, or is repetitive. Your request must include the date and approximate time when the images were recorded and the location of the particular CCTV camera, so that the images can be easily located and your identity can be established as the person in the images. +If you wish to access any CCTV images relating to you, you must make a written request to the hackspace’s directors. This can be done by using this email address [info@leighhack.org](mailto:info@leighhack.org). The hackspace will usually not make a charge for such a request, but we may charge a reasonable fee if you make a request which is manifestly unfounded, excessive, or is repetitive. Your request must include the date and approximate time when the images were recorded and the location of the particular CCTV camera, so that the images can be easily located and your identity can be established as the person in the images. The hackspace will usually respond promptly and in any case within one month of receiving a request. However, where a request is complex or numerous the hackspace may extend the one month to respond by a further two months. @@ -81,7 +81,6 @@ Covert recording is specifically barred by Leigh Hackspace CIC and its directors The hackspace will ensure that all members handling CCTV images or recordings are trained in the operation and administration of the CCTV system and on the impact of the laws regulating data protection and privacy with regard to that system. - ## Data Protection The hackspace will process the personal data collected in connection with the operation of the CCTV policy in accordance with its data protection policy and any internal privacy notices in force at the relevant time. Inappropriate access or disclosure of this data will constitute a data breach and should be reported immediately to the directors in accordance with the hackspace's data protection policy. \ No newline at end of file diff --git a/content/policies/code_of_conduct.md b/content/policies/code_of_conduct.md index 50cf5af..cd5acf3 100644 --- a/content/policies/code_of_conduct.md +++ b/content/policies/code_of_conduct.md @@ -1,6 +1,6 @@ --- title: Code of Conduct -subtitle: +subtitle: Rules for our community --- Leigh Hackspace is a shared community workspace that offers the @@ -86,5 +86,5 @@ you report it by emailing [info@leighack.org](mailto:info@leighhack.org). ## Questions? If you have questions, please feel free to [contact us](mailto:info@leighhack.org). -Text derived from the GCC project Code of Conduct, used under -the Creative Commons Attribution license. \ No newline at end of file +Text derived from the [GCC project Code of Conduct](https://gcc.gnu.org/conduct.html), used under +the [Creative Commons Attribution-ShareAlike license](https://creativecommons.org/licenses/by-sa/4.0/). \ No newline at end of file diff --git a/content/visit.md b/content/visit.md index 24c0428..44c04f9 100644 --- a/content/visit.md +++ b/content/visit.md @@ -1,6 +1,7 @@ --- title: Visit Us subtitle: Come take a look around. +layout: visit --- Leigh Hackspace is located inside [Leigh Spinners Mill](https://www.spinnersmill.co.uk), a [Grade II* listed](https://historicengland.org.uk/advice/heritage-at-risk/search-register/list-entry/48399) former cotton spinning mill, restored by Leigh Building Preservation Trust and now hosting [multiple business and community projects](https://www.spinnersmill.co.uk). @@ -18,7 +19,9 @@ Leigh WN7 2LB ``` -{{< map >}} +{{< rawhtml >}} +
+{{}} What3Words: [//escape.shot.cleansed](https://what3words.com/escape.shots.cleansed) - This is for the main entrance of Mill 2. @@ -30,7 +33,7 @@ Leigh Spinners Mill is located at the end of Park Road, use the postcode `WN7 2L ### Car Parking -The mill has a large gravel public car-park and additional overflow areas. Parking is free but may become busy during popular times. The car park is open from **8 am** until **10 pm**, if you are visiting outside of these hours then it is recommended you park elsewhere. Please, **do not park on Park Lane**, as this is residents-only parking. +The mill has a large gravel public car park and additional overflow areas. Parking is free but may become busy during popular times. The car park is open from **8 am** until **10 pm**, if you are visiting outside of these hours then it is recommended you park elsewhere. Please, **do not park on Park Lane**, as this is residents-only parking. ## Travelling by bike diff --git a/layouts/page/calendar.html b/layouts/page/calendar.html index 73b86e6..07c50f5 100644 --- a/layouts/page/calendar.html +++ b/layouts/page/calendar.html @@ -8,38 +8,13 @@ {{ define "extra_css" }} - {{ end }} {{ define "extra_js" }} - +{{ $js := resources.Get "js/calendar.js" | resources.Minify }} +{{ $secureJS := $js | resources.Fingerprint "sha512" }} + {{ end }} {{ define "content" }} diff --git a/layouts/page/visit.html b/layouts/page/visit.html new file mode 100644 index 0000000..68485d7 --- /dev/null +++ b/layouts/page/visit.html @@ -0,0 +1,19 @@ +{{ define "title" }} +{{ .Title }} +{{ end }} + +{{ define "subtitle" }} +{{ .Params.subtitle }} +{{ end }} + +{{ define "extra_css" }} + +{{ end }} + +{{ define "extra_js" }} + +{{ end }} + +{{ define "content" }} +{{ .Content }} +{{ end }} \ No newline at end of file diff --git a/layouts/shortcodes/map.html b/layouts/shortcodes/map.html deleted file mode 100644 index 571cc7e..0000000 --- a/layouts/shortcodes/map.html +++ /dev/null @@ -1,2 +0,0 @@ -
-{{ .Page.Store.Set "hasMap" true }} diff --git a/themes/lhs-retro/assets/images/rose_logo.svg b/themes/lhs-retro/assets/images/rose_logo.svg deleted file mode 100644 index 10ae3cb..0000000 --- a/themes/lhs-retro/assets/images/rose_logo.svg +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - diff --git a/themes/lhs-retro/layouts/blog/single.html b/themes/lhs-retro/layouts/blog/single.html index 1b61812..4080437 100644 --- a/themes/lhs-retro/layouts/blog/single.html +++ b/themes/lhs-retro/layouts/blog/single.html @@ -12,6 +12,7 @@ {{ $avatar := resources.GetRemote (print "https://www.gravatar.com/avatar/" (sha256 .Params.author_email)) | resources.Copy (print "images/avatars/" (sha256 .Params.author_email) ".jpg") }} + {{ $avatar = $avatar.Resize "50x photo" }} {{ .Params.author }}'s avatar diff --git a/themes/lhs-retro/layouts/partials/footer.html b/themes/lhs-retro/layouts/partials/footer.html index c21c0ac..ce1e1e8 100644 --- a/themes/lhs-retro/layouts/partials/footer.html +++ b/themes/lhs-retro/layouts/partials/footer.html @@ -6,6 +6,16 @@ WN7 2LB
info@leighhack.org

+ +

+ Policies: + {{ $menu_items := add (len .Site.Menus.policies) -1 }} + {{- range $i, $e := .Site.Menus.policies }} + {{ .Name }}{{ if lt $i + $menu_items }} / {{ end }} + {{- end }} +

+

Socials: {{ $menu_items := add (len .Site.Params.social_links) -1 }} @@ -28,7 +38,7 @@ alt="Valid HTML 4.01 Transitional" height="31" width="88"> {{ end }} {{ with resources.Get "images/leigh-hackspace-button.gif" }} - Leigh Hackspace + Leigh Hackspace {{ end }}

\ No newline at end of file diff --git a/themes/lhs-retro/layouts/shortcodes/image.html b/themes/lhs-retro/layouts/shortcodes/image.html index c4599be..4d93dda 100644 --- a/themes/lhs-retro/layouts/shortcodes/image.html +++ b/themes/lhs-retro/layouts/shortcodes/image.html @@ -1,7 +1,5 @@ {{ $img := .Page.Resources.GetMatch (printf "*%s*" (.Get "src")) }} {{ $width := .Get "width" }} -{{ $img = $img.Resize (print (default "640x" $width) " jpeg picture") }} +{{ $rimg := $img.Resize (print (default "640x" $width) " jpeg picture") }} {{ $title := .Get "title" }} -{{ $class := .Get "class" }} -{{ $title }} \ No newline at end of file +{{ $title }} \ No newline at end of file diff --git a/archetypes/blog/index.md b/themes/lhs/archetypes/blog/index.md similarity index 100% rename from archetypes/blog/index.md rename to themes/lhs/archetypes/blog/index.md diff --git a/themes/lhs/assets/sass/leighhack.scss b/themes/lhs/assets/sass/leighhack.scss index 53acb6f..8145061 100644 --- a/themes/lhs/assets/sass/leighhack.scss +++ b/themes/lhs/assets/sass/leighhack.scss @@ -33,16 +33,16 @@ $body-font-size: 1.25em; // ------------------------------------------------------- // Preloader -.js div#preloader { - position: fixed; - left: 0; - top: 0; - z-index: 999; - width: 100%; - height: 100%; - overflow: visible; - background: white no-repeat center center; - background-size: 20%; +.js div#preloader { + position: fixed; + left: 0; + top: 0; + z-index: 999; + width: 100%; + height: 100%; + overflow: visible; + background: white no-repeat center center; + background-size: 20%; } // Modifiers @@ -61,8 +61,8 @@ $body-font-size: 1.25em; .hover-item { // min-height:10em; transition: all 0.3s; - - &:hover{ + + &:hover { box-shadow: 0 0px 30px rgba($black, 0.1), 0 0 0 1px rgba($black, 0.1); // border-color: $primary; // box-shadow: 0 10px 1px rgba($black, 0.2); @@ -76,10 +76,10 @@ $body-font-size: 1.25em; p { line-height: $body-line-height; - margin-bottom:1.5em!important; + margin-bottom: 1.5em !important; - &:last-child{ - margin-bottom:0!important; + &:last-child { + margin-bottom: 0 !important; } } @@ -92,22 +92,22 @@ p { // ------------------------------------------------------- a { text-decoration: underline; - + .navbar-item { &:hover { - color:$primary; + color: $primary; border-bottom: solid 2px $primary; } } } address { - font-style:normal; + font-style: normal; } .button { - height:3em; + height: 3em; text-decoration: none; transition: all 0.2s; } @@ -118,34 +118,34 @@ address { .navbar { &-item { - text-decoration:none; + text-decoration: none; } &--social-links { a { - color:white; - + color: white; + &:hover { - color:$primary; + color: $primary; } } } &-burger { - + &:hover { - color:white; + color: white; } } } .site-logo { - max-height:3rem!important; + max-height: 3rem !important; &-text { - font-size: 1.4rem; - line-height: 1.1; + font-size: 1.4rem; + line-height: 1.1; font-family: 'Transport Medium'; } } @@ -172,22 +172,22 @@ address { } .subtitle { - font-size:1.375rem; + font-size: 1.375rem; } } .work-img { - max-width:90%; + max-width: 90%; } .cta { - &-container{ - margin-top:4em; - padding:2em 1em; + &-container { + margin-top: 4em; + padding: 2em 1em; } - + &-img { margin-top: -10rem; } @@ -200,15 +200,15 @@ address { .facility { &-hero { - padding:2em 0.5em; + padding: 2em 0.5em; } &-container { - padding:2em 1em; + padding: 2em 1em; } &-gallery { - padding-top:1em; + padding-top: 1em; } &--icon { @@ -220,17 +220,17 @@ address { @include from($tablet) { border-left: solid 1px; border-color: hsl(0, 0%, 86%); - } + } } - &-description { - min-height: 180px; + &-description { + min-height: 180px; } } .small_cta { - background-color:$accent; - padding:0 1em; + background-color: $accent; + padding: 0 1em; } // ------------------------------------------------------- @@ -239,16 +239,17 @@ address { .pricing { - &-tiers, &-facilities{ - padding:2em 0; + &-tiers, + &-facilities { + padding: 2em 0; } &-price { line-height: 1; } - &-description { - min-height: 120px; + &-description { + min-height: 120px; } } @@ -259,7 +260,7 @@ address { // ------------------------------------------------------- .team { - &-join{ + &-join { background-color: $accent; } @@ -276,13 +277,13 @@ address { // ------------------------------------------------------- #map { - width:100%; - min-height:25em; - margin-bottom:2em; + width: 100%; + min-height: 25em; + margin-bottom: 2em; } .map { - + // -webkit-filter: grayscale(100%); // filter: grayscale(100%); @@ -293,10 +294,10 @@ address { } &-container { - padding:2em 1em; + padding: 2em 1em; .is-spaced { - margin:1.5em auto; + margin: 1.5em auto; } } } @@ -306,7 +307,7 @@ address { // ------------------------------------------------------- .policy-content { - padding:1.375em 0; + padding: 1.375em 0; } // ------------------------------------------------------- @@ -316,31 +317,31 @@ address { footer { a { - color:$footer-link-color; - text-decoration:underline; + color: $footer-link-color; + text-decoration: underline; &:hover { - color:$primary; + color: $primary; } } } .footer { - padding-bottom:2em; + padding-bottom: 2em; &-weblink { - - background-color:$primary; + + background-color: $primary; } - &--sticky { - position: absolute; - width: 100%; - bottom: 0; - overflow: hidden; - } + &--sticky { + position: absolute; + width: 100%; + bottom: 0; + overflow: hidden; + } } // ------------------------------------------------------- @@ -350,3 +351,12 @@ footer { .map { height: 500px; } + +// ------------------------------------------------------- +// Blog pages +// ------------------------------------------------------- + +.blog-avatar { + margin-left: 0 !important; + margin-right: 1em !important; +} diff --git a/themes/lhs/layouts/blog/single.html b/themes/lhs/layouts/blog/single.html index 72a022d..8183b5f 100644 --- a/themes/lhs/layouts/blog/single.html +++ b/themes/lhs/layouts/blog/single.html @@ -8,7 +8,7 @@ {{ define "content" }}
-
+

{{ $avatar := resources.GetRemote (print "https://www.gravatar.com/avatar/" (sha256 .Params.author_email)) | resources.Copy (print "images/avatars/" (sha256 .Params.author_email) ".jpg") }} diff --git a/themes/lhs/layouts/partials/foot.html b/themes/lhs/layouts/partials/foot.html index 7254526..66bc30f 100644 --- a/themes/lhs/layouts/partials/foot.html +++ b/themes/lhs/layouts/partials/foot.html @@ -8,11 +8,6 @@ {{ end }} -{{ if .Page.Store.Get "hasMap" }} - - -{{ end }} - {{ $theme := resources.Get "js/theme.js" }} {{ $site := resources.Get "js/site.js" }} {{ $js := slice $site $theme | resources.Concat "js/bundle.js" | resources.Minify }} diff --git a/themes/lhs/layouts/partials/footer.html b/themes/lhs/layouts/partials/footer.html index f3a5a6f..43c3782 100644 --- a/themes/lhs/layouts/partials/footer.html +++ b/themes/lhs/layouts/partials/footer.html @@ -1,10 +1,9 @@