Merge pull request #33 from leigh-hackspace/design-tweaks

Design tweaks
This commit is contained in:
2024-02-20 10:11:44 +00:00
committed by GitHub
28 changed files with 234 additions and 224 deletions

5
.github/CODEOWNERS vendored Normal file
View File

@@ -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

View File

@@ -4,5 +4,9 @@
"language": "markdown",
"scheme": "file"
}
],
"cSpell.words": [
"hackspace",
"makerspace"
]
}

26
assets/js/calendar.js Normal file
View File

@@ -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'
},
});
});
});

View File

@@ -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"

View File

@@ -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">}}

View File

@@ -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?

View File

@@ -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 >}}

View File

@@ -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.
During quieter periods, the Pi Room transforms into an ideal co-working space, complete with WiFi and a reliable internet connection.

View File

@@ -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.

View File

@@ -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.

View File

@@ -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.
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.

View File

@@ -10,7 +10,7 @@ subtitle: How we manage our CCTV facility
## Introduction
The hackspace uses closed circuit television (CCTV) images to protect the hackspaces property and to provide a safe and secure environment for employees and visitors to the hackspaces 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 hackspaces property and to provide a safe and secure environment for members and visitors to the hackspaces premises. This policy sets out the details of how the hackspace will collect, use and store CCTV images.
The hackspaces 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 UKs 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 hackspaces 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 hackspaces 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.

View File

@@ -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.
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/).

View File

@@ -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 >}}
<div id="map" class="map"></div>
{{</ 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

View File

@@ -8,38 +8,13 @@
{{ define "extra_css" }}
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@event-calendar/build@2.4.1/event-calendar.min.css">
{{ end }}
{{ define "extra_js" }}
<script src="https://cdn.jsdelivr.net/npm/@event-calendar/build@2.4.1/event-calendar.min.js" type="application/javascript"></script>
<script type="application/javascript">
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'
},
});
});
});
</script>
{{ $js := resources.Get "js/calendar.js" | resources.Minify }}
{{ $secureJS := $js | resources.Fingerprint "sha512" }}
<script src="{{ $secureJS.Permalink }}" integrity="{{ $secureJS.Data.Integrity }}"></script>
{{ end }}
{{ define "content" }}

19
layouts/page/visit.html Normal file
View File

@@ -0,0 +1,19 @@
{{ define "title" }}
{{ .Title }}
{{ end }}
{{ define "subtitle" }}
{{ .Params.subtitle }}
{{ end }}
{{ define "extra_css" }}
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v8.2.0/ol.css">
{{ end }}
{{ define "extra_js" }}
<script src="https://cdn.jsdelivr.net/npm/ol@v8.2.0/dist/ol.js"></script>
{{ end }}
{{ define "content" }}
{{ .Content }}
{{ end }}

View File

@@ -1,2 +0,0 @@
<div id="map" class="map"></div>
{{ .Page.Store.Set "hasMap" true }}

View File

@@ -1,51 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 27.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1"
id="svg14" xmlns:svg="http://www.w3.org/2000/svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 725.5 699.5"
style="enable-background:new 0 0 725.5 699.5;" xml:space="preserve">
<style type="text/css">
.st0{fill:#D31246;}
.st1{fill:#FFFFFF;}
</style>
<path class="st0" d="M335.2,698.4c5.2,0.8,62.5-0.2,69.6-1.3c36.4-5.3,76.1-17.1,90.5-26.9c14.7-10,23.5-26.7,23.5-44.8
c0-8.1-1.7-15.7-6-26.1c-1.7-4.1-3-8.3-3-9.5c0-2.1,1.1-4.2,3-5.6c2-1.5,4.6-2.1,6.9-1.4c1.5,0.4,6,3.9,9.5,7.1
c7.9,7.1,15.1,12.2,21.2,15c3.6,1.6,5,1.8,12.6,1.8c7.2,0,9.5-0.3,14.2-1.9c9.2-3.1,11.1-4.4,22.5-15.6
c38.2-37.4,65.5-89,76.9-145.5c4.5-22.7,5.8-33.8,6.2-56.9c0.5-25.1-0.3-36-3.1-44.9c-2.7-8.4-6.6-14.7-13.6-21.8
c-5.3-5.4-7.1-6.7-13.8-9.8c-13.5-6.4-24.2-7.3-39.3-3.4c-9.6,2.5-14,2.5-16.5-0.1c-2.1-2.1-2.6-6.4-1.1-9.1
c1.2-2.2,6.1-4.8,15.4-8.3c4.5-1.7,9.8-3.9,11.8-5.1c5.5-3,12.6-11,16.2-18.2c3.7-7.5,4.8-13.8,4.3-24.1c-0.4-7-0.6-8.1-4.2-16.4
c-6.6-15.3-18-33.5-34-54.2c-7.6-9.8-29.7-32.1-40.2-40.6c-36.1-29.2-77.1-50.1-118.5-60.6c-10.4-2.6-12.7-2.9-20.6-2.9
c-10.9,0-17.8,1.6-26.5,6.1c-10.9,5.7-21.3,17.9-24.3,28.5c-0.5,1.6-1.3,7.6-1.9,13.3c-1.2,11.2-2.1,13.8-5.6,15.1
c-4.3,1.6-9.5,0.1-11.3-3.4c-0.6-1.1-1.2-7-1.5-12c-0.5-8.5-0.9-11-2.7-15.7c-4.4-11.3-12.3-20-22.8-25.2c-5.2-2.6-8.7-3.5-17-4.7
c-5.5-0.8-32.3,3.5-46.2,7.4c-9.9,2.8-26.4,8.3-31.5,10.6c-21,9.3-49.8,25.5-61.7,34.7c-28.3,21.7-46.5,39.8-65.1,64.3
c-14.8,19.6-21,30.3-23.6,40.9c-2.4,9.9-2.6,14-0.9,22.7c3.6,18.6,13.9,30.7,34.5,40.6c7.2,3.4,10.8,6.5,11.3,9.6
c0.3,2-0.5,4-2.7,6.1c-3.2,3.3-4.8,3.3-14.7,0.6c-10.5-2.9-23.2-3.2-30.1-0.9c-15.9,5.3-26.9,16.9-31.2,32.7
c-3.2,12-4.9,29.5-4.9,52c0,27.7,2.2,45.5,8.6,70.4c10.7,41.7,28,77.5,54.6,112.9c14.4,19.2,23.5,26.5,37.4,30.2
c7.4,2,24.9,1.8,31.1-0.3c6.7-2.3,13.6-6.7,22.9-14.8c9-7.8,13.7-10.6,16.2-9.7c3.1,1.1,5.8,4.4,5.8,7.2c0,3.2-0.7,4.7-5.7,10.9
c-6.6,8.4-8.3,12.2-10.1,22.8c-0.8,4.4-0.7,6.2,0.4,11.4c2.5,12.3,6.2,19.8,13.2,26.6c9.2,8.9,28.6,18.3,57.8,28
C291.5,690.9,304.5,693.6,335.2,698.4z"/>
<path class="st1" d="M297.3,527.1l65.4,65.5l98.5-98.6l-32.3-31.9c-18.4-18.2-31.8-31.1-33.3-32.1c-0.7,0.4-5.3,4.4-11.1,10
l-10.5,10.1c-0.1,0.1-0.4,0.1-0.5,0l-10.2-10.6c-0.1-0.1-0.1-0.4,0-0.5l10.8-11c43.7-44.5,44.3-44.5,44.8-44.5
c0.9,0,5.6,4.6,6.1,5.2l5.1,5c0.1,0.1,0.1,0.2,0.1,0.3s0,0.2-0.1,0.3l-20.4,20.4l65.5,65.5l97.4-97.3l-65.5-65.5l-11,10.9
c-0.1,0.1-0.4,0.1-0.5,0l-78.3-78.3c-0.1-0.1-0.1-0.4,0-0.5l10.9-11L395.8,206c-18.1-18.1-31.4-31-33.1-32.4
c-2.1,1.7-20.8,20.2-49.1,48.4l-48.3,48.3l65.5,65.5l9.7-9.7c1.7-1.7,10.1-10,11-10c0.9,0,6.7,5.8,7.4,6.5l6.3,6.4
c0.1,0.1,0.1,0.4,0,0.5l-55.9,55.9c-0.1,0.1-0.2,0.1-0.3,0.1c0,0,0,0,0,0c-0.1,0-0.2,0-0.3-0.1l-13-13.2c-0.1-0.1-0.1-0.4,0-0.5
l3.7-3.9c2-2.1,6.7-7,10.4-10.8l6.4-6.7L300,333.3c-9.1-9.4-23.8-24.3-32.7-33.2l-15.9-15.9l-98.5,98.5l65.5,65.5l11-10.9
c0.1-0.1,0.4-0.1,0.5,0l78.3,78.3c0.1,0.1,0.1,0.4,0,0.5L297.3,527.1z"/>
<path class="st0" d="M360.7,75.7c1.3,2.3,2.7,4.5,3.3,4.6c0.1,0,0.2,0,0.4-0.1c0.5-0.4,2.6-3.8,4.8-8.1c4-7.7,5.5-9.2,17-17.6
l3.6-2.6l-2-4.4c-1.2-2.6-6.7-14.1-12.3-25.7C366,2,365.4,1,363.4,0.8c-1.8-0.2-2-0.2-3.9,3.9c-1.1,2.4-6.2,13.5-11.3,24.6
c-5.6,12.1-9.5,21.3-9.7,22.4c-0.3,1.8-0.2,2.1,4.7,5.4C350.2,61.9,356.7,68.9,360.7,75.7z"/>
<path class="st0" d="M675.5,298.8c3.9,2.6,6.6,4.1,7,4.2c1.9,0,11.4-8.8,21.3-18.3c15.7-15,21.1-20.3,21-21.4c0,0,0-0.1-0.2-0.2
c-2.4-1.6-10.2-2.8-31-4.8c-6.2-0.6-13.6-1.4-16.5-1.9c-7.6-1.1-11.2-1-11.8,0.3c-0.3,0.7-1.2,3.5-1.9,6.1c-1.8,6.8-5.6,13.8-11,20
c-2.7,3.2-4.3,5.3-4.4,5.6c0.2,0.4,5.1,1.2,8.3,1.7C662.7,291.2,667.2,293.2,675.5,298.8L675.5,298.8z"/>
<path class="st0" d="M536.9,622c0,0.4,0.2,2.1,0.7,4.3c2.2,9,1.2,20.9-2.5,29.6c-1.7,3.9-1.3,5.2,2.1,6.9c1.6,0.8,4.3,2.3,6.2,3.4
c1.9,1.1,11.6,6.4,21.7,11.8c13.2,7.1,19.8,10.3,21.2,9.4c0.2-0.1,0.4-0.3,0.3-1.1c-0.2-3.1-10.8-54.6-11.6-56.2
c-0.3-0.2-3-0.8-11.1-1c-11.3-0.4-12.7-0.7-22-5.1C539.4,622.7,537.5,622,536.9,622z"/>
<path class="st0" d="M148.4,629.4l-0.7,3.5c-2.1,10.3-8.3,45.6-8.7,49.7c-0.2,2.3-0.4,3.9-0.1,4.2c0.1,0.1,0.3,0.1,0.6,0.1
c1.6,0,4.5-1.5,22.6-11.8c7.6-4.3,17.5-9.9,21.8-12.3l7.7-4.3l-2.6-7.7c-2.6-7.8-2.7-8.4-2.8-19.7c0-6.8,0-10.5-0.8-10.9
c-0.4-0.2-1.5,0.6-2.6,1.4c-1.1,0.8-5,2.7-8.6,4.2c-6,2.4-7.5,2.7-16.4,3.1L148.4,629.4z"/>
<path class="st0" d="M38.7,296.7c3.8,3.3,6.4,5.3,6.8,5.4c0.3-0.1,1.9-1.2,3.9-2.8c8.1-6.8,15.6-10.4,25.2-12.2
c2.7-0.5,4.6-1.1,5.1-1.3c-0.3-0.7-2.2-3-5.3-6.2c-7.3-7.5-10.2-12.7-13-23.4l-0.7-2.9H57c-2.2,0-10.3,0.9-18.1,1.9
c-7.8,1-18.2,2.4-23.2,2.9c-5.4,0.6-9.5,1.2-10.1,1.4c-0.6,0.2-2.1,0.6-3.2,0.8c-1,0.2-1.5,0.5-1.6,0.9c-0.1,0.4,0.3,1.3,2.7,3.3
c1.7,1.3,8.8,7.8,16,14.5C26.6,285.8,35.2,293.7,38.7,296.7z"/>
</svg>

Before

Width:  |  Height:  |  Size: 4.9 KiB

View File

@@ -12,6 +12,7 @@
<td>
{{ $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" }}
<img src="{{ $avatar.RelPermalink }}" alt="{{ .Params.author }}'s avatar">
</td>
<td>

View File

@@ -6,6 +6,16 @@
WN7 2LB <br>
<a href="mailto:info@leighhack.org">info@leighhack.org</a>
</p>
<p>
<b>Policies:</b>
{{ $menu_items := add (len .Site.Menus.policies) -1 }}
{{- range $i, $e := .Site.Menus.policies }}
<a href="{{ .URL | safeURL }}" target="_blank" rel="noopener me" title="{{ .Name }}">{{ .Name }}</a>{{ if lt $i
$menu_items }} / {{ end }}
{{- end }}
</p>
<p>
<b>Socials:</b>
{{ $menu_items := add (len .Site.Params.social_links) -1 }}
@@ -28,7 +38,7 @@
alt="Valid HTML 4.01 Transitional" height="31" width="88"></a>
{{ end }}
{{ with resources.Get "images/leigh-hackspace-button.gif" }}
<a href="http://retro.leighhack.org"><img src="{{ .RelPermalink }}"
alt="Leigh Hackspace" height="31" width="88"></a>
<a href="http://retro.leighhack.org"><img src="{{ .RelPermalink }}" alt="Leigh Hackspace" height="31"
width="88"></a>
{{ end }}
</p>

View File

@@ -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" }}
<img src="{{ $img.RelPermalink }}" width="{{ $img.Width }}" height="{{ $img.Height }}" {{ if $title }}
alt="{{ $title }}" {{ end }}>
<a href="{{ $img.RelPermalink }}"><img src="{{ $rimg.RelPermalink }}" width="{{ $rimg.Width }}" height="{{ $rimg.Height }}"{{ if $title }} alt="{{ $title }}"{{ end }}></a>

View File

@@ -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;
}

View File

@@ -8,7 +8,7 @@
{{ define "content" }}
<article class="media">
<figure class="media-left">
<figure class="blog-avatar media-left">
<p class="image is-64x64">
{{ $avatar := resources.GetRemote (print "https://www.gravatar.com/avatar/" (sha256 .Params.author_email)) |
resources.Copy (print "images/avatars/" (sha256 .Params.author_email) ".jpg") }}

View File

@@ -8,11 +8,6 @@
</script>
{{ end }}
{{ if .Page.Store.Get "hasMap" }}
<script src="https://cdn.jsdelivr.net/npm/ol@v8.2.0/dist/ol.js"></script>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v8.2.0/ol.css">
{{ end }}
{{ $theme := resources.Get "js/theme.js" }}
{{ $site := resources.Get "js/site.js" }}
{{ $js := slice $site $theme | resources.Concat "js/bundle.js" | resources.Minify }}

View File

@@ -1,10 +1,9 @@
<footer class="footer _footer--sticky is-black has-text-white">
<div class="container">
<div class="columns">
<div class="column is-1 is-pull-right-touch is-hidden-mobile">
<img src="{{ absURL "images/rose_logo.svg" }}" alt="The logo of Leigh Hackspace">
</div>
</div>
<div class="column is-4">
<h4 class="title is-size-6 has-text-white">Leigh Hackspace</h4>
@@ -12,34 +11,44 @@
Unit 3.14, Leigh Spinners Mill<br>
Park Lane, Leigh <br>
WN7 2LB <br>
<a href="mailto:info@leighhack.org">info@leighhack.org</a>
<a href="mailto:{{ .Site.Params.contact_email }}">{{ .Site.Params.contact_email }}</a>
</address>
</div>
<div class="column is-5-mobile is-4">
<div class="column is-5-mobile is-2 has-text-right has-text-left-mobile">
<h4 class="title is-size-6 has-text-white">Site Links</h4>
<div class="columns">
<div class="column">
<ul class="has-text-white is-size-6 ">
{{- range site.Menus.main }}
<li><a href="{{ .URL }}">{{ .Name }}</a></li>
{{- end }}
{{- range site.Menus.main }}
<li><a href="{{ .URL }}">{{ .Name }}</a></li>
{{- end }}
</ul>
</div>
</div>
</div>
<div class="column">
<h4 class="title is-6 has-text-white">Socials</h4>
<div class="column is-5-mobile is-2 has-text-right has-text-left-mobile">
<h4 class="title is-size-6 has-text-white">Policies</h4>
<div class="columns">
<div class="column is-4">
<div class="column">
<ul class="has-text-white is-size-6 ">
{{- with .Site.Params.social_links }}
{{ range . -}}
<li><a href="{{ .url | safeURL }}" target="_blank" rel="noopener me" title="{{ .name | humanize }}">{{ .name | humanize }}</a></li>
{{ end }}
{{- range site.Menus.policies }}
<li><a href="{{ .URL }}">{{ .Name }}</a></li>
{{- end }}
</ul>
</div>
</div>
</div>
<div class="column is-5-mobile is-2 has-text-right has-text-left-mobile">
<h4 class="title is-6 has-text-white ">Socials</h4>
<div class="columns">
<div class="column">
<ul class="has-text-white is-size-6 ">
{{- range .Site.Params.social_links }}
<li><a href="{{ .url | safeURL }}" target="_blank" rel="noopener me"
title="{{ .name | humanize }}">{{ .name | humanize }}</a></li>
{{- end }}
</ul>
</div>
@@ -48,16 +57,17 @@
</div>
<div class="columns is-vcentered is-size-6 is-multiline has-text-grey mt-4">
<div class="columns is-vcentered is-size-6 is-multiline has-text-grey mt-4 has-text-right has-text-left-mobile">
<div class="column is-10-desktop is-offset-1-desktop">
<div class="level">
<div class="level-left">
</div>
<div class="level-right has-text-right">
<p>&copy; {{ .Site.Params.company }} {{ .Site.Params.copyright_years }} | Initial website design by <a href="https://www.studiocosmos.co.uk"
target="_blank" rel="noopener">COSMOS</a><br/>
{{ .Site.Title }} is a trading name of {{ .Site.Params.Company }}, registered in England & Wales No. <a href="https://find-and-update.company-information.service.gov.uk/company/{{ .Site.Params.company_number }}">{{ .Site.Params.company_number }}</a></p>
<div class="level-right">
<p>&copy; {{ .Site.Params.company }} {{ .Site.Params.copyright_years }} | Initial website design
by <a href="https://www.studiocosmos.co.uk" target="_blank" rel="noopener">COSMOS</a><br />
{{ .Site.Title }} is a trading name of {{ .Site.Params.Company }}, registered in England &
Wales No. <a href="https://find-and-update.company-information.service.gov.uk/company/{{ .Site.Params.company_number }}">{{ .Site.Params.company_number }}</a></p>
</div>
</div>

View File

@@ -16,12 +16,9 @@
<meta name="theme-color" content="#ffffff">
<link rel="alternate" type="application/rss+xml" href="{{ absURL "blog/index.xml" }}" title="{{ .Site.Title }}">
<link rel="alternate" type="text/calendar" href="https://api.leighhack.org/events.ics" title="{{ .Site.Title }} Events">
<link rel="canonical" href="{{ .RelPermalink }}">
<link rel="alternate" type="text/calendar" href="{{ .Site.Params.calendarUrl }}" title="{{ .Site.Title }} Events">
<link rel="canonical" href="{{ .Permalink }}">
{{ if .Page.Store.Get "hasMap" }}
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ol@v8.2.0/ol.css">
{{ end }}
{{ $opts := dict "transpiler" "libsass" "targetPath" "css/leighhack.css" }}
{{ with resources.Get "sass/leighhack.scss" | toCSS $opts | minify | fingerprint }}
<link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous">

View File

@@ -37,7 +37,7 @@
<div class="navbar-item is-inline-block-touch">
<span class="icon">
<a href="{{ .url | safeURL }}" target="_blank" rel="noopener me"
title="{{ .name | humanize }}"><i class="fab {{ .icon }}" aria-hidden="true"></i></a>
title="{{ .name | humanize }}"><i class="{{ .icon }}" aria-hidden="true"></i></a>
</span>
</div>
{{ end }}