From 76498b2cc6b449e41f00764d481882404059b17f Mon Sep 17 00:00:00 2001 From: gorhgorh Date: Sat, 5 Mar 2016 22:03:48 +0100 Subject: [PATCH] update texts and added cfp to the template --- src/index.hbs | 208 +++++++++++++++++++++++++++----------------------- src/index.md | 21 ++++- 2 files changed, 130 insertions(+), 99 deletions(-) diff --git a/src/index.hbs b/src/index.hbs index 581ddd7..03deb51 100644 --- a/src/index.hbs +++ b/src/index.hbs @@ -1,5 +1,6 @@ + SquatConf.386 @@ -13,56 +14,53 @@ -
-
- -
- - - -
-
+
+
+
+
+
+ BE PART OF IT + + + + + + + +
 
+ + You can either send us a pull request on GitHub or a simple email, if you have a talk to propose. + +
+ +
+
+
+
JOIN US - - + + +
 
we'll send you info about future events, and talk about all and nothing -
- +
+ +
+
+ +
+ +
-
- -
- -
- - -
- - - -
-
- 

+      
+      

+        

+          

      .d8888b.                         888                            .d888
     d88P  Y88b                        888                           d88P"
     Y88b.                             888                           888
@@ -75,7 +73,7 @@
                    888
                    888
         

-
+          
          ____                    _    ____             __
         / ___|  __ _ _   _  __ _| |_ / ___|___  _ __  / _|
         \___ \ / _` | | | |/ _` | __| |   / _ \| '_ \| |_
@@ -83,7 +81,7 @@
         |____/ \__, |\__,_|\__,_|\__|\____\___/|_| |_|_|
                   |_|
 

-
+          
      __
     (_  _     _ |_
     __)(_||_|(_||_
@@ -92,64 +90,80 @@
     /   _  _ (_
     \__(_)| )|
 

-      

-      

-        {{md "src/header.md"}}
-      

-      

-        {{md "src/index.md"}}
+        

+        

+          {{md "src/header.md"}}
+        

+        

+          {{md "src/index.md"}}
+
-
-
-
-
-
-
-
-
- - - - - - - image/svg+xml - - - - - - - - - - - - - - +
+
+
+
+
+
+
+ + + + + + + image/svg+xml + + + + + + + + + + + + + + +
+
logo image by substack
+
-
logo image by substack
-
-
- - + + + diff --git a/src/index.md b/src/index.md index 298d563..2eecee4 100644 --- a/src/index.md +++ b/src/index.md @@ -9,6 +9,11 @@ Squatconf won't be your everyday conference, but you'll have good talks from ama We will provide a space, we will provide a context, some talks, and the rest will be up to you… +## What we (kind of) know +2 day event with one day of talks and one day of workshops / hacking sessions. +We also plan events the week after +We also are looking for place to host people (if you do have some contact us) + ## How is this possible? Conference costs are huge, and ticket prices are often nowhere near the true per-attendee cost, even for a non-profit conference. @@ -29,6 +34,18 @@ I want to speak / do a workshop / dance everybody here is welcome, we won't promise that every proposal will be accepted, but they will all be displayed here and in a git repository, and the curation process will happened in the open. +## Who is behind this + +a bunch of ppl that had fun at the first one, or knew each others before, coming from loads of different horizons. + +## Etiquette +while we are open to discuss a lot of things, we are +- antifascists +- against all form of discrimination + +Hence any form of exclusion, harassement or the likes will NOT be tolerated, and we invite any witness of such thing to act accordingly if none of us are around. +this is explained in detail in the [COC][3] - [1]: https://twitter.com/olizilla - [2]: http://blog.tableflip.io/squatconf-information-wants-to-be-free/ +[1]: https://twitter.com/olizilla +[2]: http://blog.tableflip.io/squatconf-information-wants-to-be-free/ +[3]: https://github.com/squatconf/organisation/blob/master/code_of_conduct.md#squatconf-code-of-conduct