git ssb - links and key parts of constituion · dangerousbeans/hackland.github.io@d2ae0f6e

Commit d2ae0f6e1c0f6997ef92e0b13a39200a88dea3e1

links and key parts of constituion

Joran committed on 6/3/2017, 10:42:57 PM
Parent: 17ff097562edf5bfd31b5bbdd6cd3178f8b82fe7

Files changed

_config.yml	changed
_includes/about.html	changed
_includes/contact.html	changed
_includes/join_us.html	changed

_config.ymlView
		@@ -15,14 +15,14 @@
15	15 …	# Social networks usernames (many more available: google-plus, flickr, dribbble, pinterest, instagram, tumblr, linkedin, etc.)
16	16 …	social:
17	17 …	- title: slack
18	18 …	url: https://join.slack.com/hakland/shared_invite/MTkwOTk4MDI5NjUwLTE0OTYzMDE0NDYtNGNmMDMxZGUxNw
19		- - title: meetup
20		- url: https://www.meetup.com/HackLand/
	19 …	+ - title: github
	20 …	+ url: https://github.com/HakLand/
	21 …	+ - title: twitter
	22 …	+ url: https://twitter.com/AKL_Hackspace/
21	23 …	- title: facebook
22	24 …	url: https://facebook.com/AuckHackspace/
23		- - title: github
24		- url: https://github.com/HakLand/
25	25 …
26	26 …	# Build settings
27	27 …	markdown: kramdown
28	28 …	permalink: pretty

_includes/about.htmlView
		@@ -1,18 +1,41 @@
1	1 …	<!-- About Section -->
2		- <section id="about" class="container content-section text-center">
	2 …	+ <section id="about" class="container content-section">
3	3 …	<div class="row">
4	4 …	<div class="col-lg-4">
5	5 …	<img src="img/IMG_0957_COLLAGE.jpg" class="img-responsive">
6	6 …	</div>
7	7 …	<div class="col-lg-8">
8		- <h2>About hackLand</h2>
	8 …	+ <h2>INFO</h2>
9	9 …	<p>
10		- An independent, not for profit Hackspace/Cafe hybrid in central Auckland for
	10 …	+ Hackland is an independent, not for profit Hackspace/Cafe hybrid in central Auckland for
11	11 …	coffee, Ethereum, Bitcoin, 3d Printing, Woodworking, Metalworking, Electronics, Coding,
12	12 …	Arts and Crafts or just hanging out.
13	13 …	</p>
14	14 …
	15 …	+ <h4>Guiding Principles</h4>
	16 …	+
	17 …	+ <p>
	18 …	+ <strong>Change and Experimentation</strong> is welcome, even if you're not an expert or not sure where something is going. Everything in the space is hackable
	19 …	+ unless it has a "<strong>Do Not Hack</strong>" sticker on it. If it looks expensive or hacking it would take longer than 6 hours to put back,
	20 …	+ please check with the group or post on the Slack channel or Loomio before taking it to bits.
	21 …	+ </p>
	22 …	+
WritePreview
	23 …	+ <p>
	24 …	+ <strong>Big Changes & Group Consensus</strong>: if a change is big, talk about it with as many people as possible in person, then
	25 …	+ ask on slack and post a Loomio proposal to see how the wider-group feels about it.
	26 …	+ The aim is always to reach a compromise everyone is okay with, but one which is best for the entire group, not one individual.
	27 …	+ </p>
	28 …	+
	29 …	+ <p>
	30 …	+ <strong>Safety:</strong> there are dangerous tools and equipment, which should be labeled - please have someone show you
	31 …	+ how to safely use them before turning them on. Always use the correct safety equipment and always warn of loud noise before making it.
	32 …	+ </p>
	33 …	+
	34 …	+ <p>
	35 …	+ <a href="https://github.com/HakLand/Constitution">github.com/HakLand/Constitution</a>
	36 …	+ </p>
	37 …	+
15	38 …	<a href="https://goo.gl/forms/XAyCLl92GzYykcCa2" class="btn btn-default btn-lg">JOIN HACKLAND</a>
16	39 …
17	40 …	</div>
18	41 …	</div>

_includes/contact.htmlView
		@@ -3,16 +3,25 @@
3	3 …	<div class="row">
4	4 …	<div class="col-lg-8 col-lg-offset-2">
5	5 …	<h2>Contact</h2>
6	6 …	<p>y hallo thur.</p>
7		- <p><a href="mailto:{{ site.email }}">{{ site.email }}</a>
8		- </p>
	7 …	+ <!-- <p><a href="mailto:{{ site.email }}">{{ site.email }}</a>
	8 …	+ </p> -->
9	9 …	<ul class="list-inline banner-social-buttons">
	10 …	+ <li>
	11 …	+ <a href="https://www.loomio.org/invitations/c087a1f90764a4d182a0" class="btn btn-default btn-lg"><span class="network-name">Loomio</span></a>
	12 …	+ </li>
	13 …	+
10	14 …	{% for network in site.social %}
11	15 …	<li>
12	16 …	<a href="{{ network.url }}" class="btn btn-default btn-lg"><i class="fa fa-{{ network.title }} fa-fw"></i> <span class="network-name">{{ network.title }}</span></a>
13	17 …	</li>
14	18 …	{% endfor %}
	19 …	+
	20 …	+ <li>
	21 …	+ <a href="https://www.meetup.com/HackLand/" class="btn btn-default btn-lg"><span class="network-name">Meetup</span></a>
	22 …	+ </li>
	23 …	+
15	24 …	</ul>
16	25 …	</div>
17	26 …	</div>
18	27 …	</section>

_includes/join_us.htmlView
		@@ -2,24 +2,24 @@
2	2 …	<section id="download" class="content-section">
3	3 …	<div class="download-section">
4	4 …	<div class="container">
5	5 …	<div class="col-lg-12">
6		- <h2>JOIN US!</h2>
	6 …	+ <h2>JOIN US! <a href="https://goo.gl/forms/XAyCLl92GzYykcCa2" class="btn btn-default btn-lg">JOIN HACKLAND</a></h2>
7	7 …	<p>Members can use the space whenever they want, 24 hours every day of the week</p>
8	8 …	<p>The hackspace is regularly open to the public whenever a member is in to open up, and weekly on Thursday from 6pm - this is the busiest time and the best for new people visiting</p>
9	9 …
10	10 …	<p>Membership costs $15 a week but please pay as much as you feel is fair so the space can survive.
11		- Casual day use is by Koha or coffee buying.
	11 …	+ Casual day use is by Koha or coffee buying - please check Twitter to see if the space is open
12	12 …	</p>
13	13 …	<p>
14	14 …	Membership includes full access to everything 24/7* including:
15	15 …	</p>
16	16 …
17		- <p>UNLIMITED Fibre Internet</p>
	17 …	+ <p>UNLIMITED Fibre Internet (unlimited other internet until fibre is installed)</p>
18	18 …	<p>Woodworking tools</p>
19	19 …	<p>Storage for projects</p>
20	20 …	<p>Soldering & Electronics</p>
21		- <p>Quiet places to work</p>
	21 …	+ <p>Quiet places to work (sometimes quiet)</p>
22	22 …	<p>All of the tea / coffee</p>
23	23 …
24	24 …	<p>*plz no powertools/noisey things after 10pm</p>
25	25 …	<a href="https://goo.gl/forms/XAyCLl92GzYykcCa2" class="btn btn-default btn-lg">JOIN HACKLAND</a>

Built with git-ssb-web

dangerousbeans / hackland.github.io

Commit d2ae0f6e1c0f6997ef92e0b13a39200a88dea3e1

links and key parts of constituion

Files changed