Merge pull request #5 from cljart/adjust_clojurebridge

Malwine · Malwine · commit 99daae69b4dc · 2015-07-14T16:07:56.000+02:00
Update cljart website text
diff --git a/_site/index.html b/_site/index.html
@@ -1,6 +1,7 @@
 <html>
   <head>
     <meta charset="utf-8">
+    <title>CLJ Art Collective</title>
     <link rel="stylesheet" href="/public/css/stylesheet.css">
     <link href='https://fonts.googleapis.com/css?family=Source+Code+Pro:300' rel='stylesheet' type='text/css'>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"
@@ -9,39 +10,46 @@
     
 <h1 id="clj-art-collective-3supsmallsmallsup">CLJ Art Collective &lt;3<sup><small>*</small></sup></h1>
 
-<p><small><sup>*</sup> pronounced “with a heart”</small>  </p>
+<p><small><sup>*</sup> pronounced “with a heart”</small></p>
 
-<p>We are a learners group and programmer collective.  <br />
-On Mondays we play around with  </p>
+<p>We are a learners group and programmer collective:  <br />
+<a href="https://twitter.com/jellea" class="highlight_link">@jellea</a>, <a href="https://twitter.com/nicsnet" class="highlight_link">@nicsnet</a>, <a href="https://twitter.com/malweene" class="highlight_link">@malweene</a>, <a href="https://twitter.com/plexus" class="highlight_link">@plexus</a>, <a href="https://twitter.com/thatbettina" class="highlight_link">@thatbettina</a></p>
+
+<p>Usually we meet on Mondays and play around with</p>
 
 <ul>
-  <li>Clojure/Clojurescript  </li>
-  <li>Music    </li>
-  <li>Animation  </li>
-  <li>and everything that comes to our mind.  </li>
+  <li>Clojure/Clojurescript</li>
+  <li>Music</li>
+  <li>Animation</li>
+  <li>and everything that comes to our mind.</li>
 </ul>
 
+<p>Currently we are in our summerbreak!  <br />
+But we keep reading <a href="http://www.braveclojure.com/">this awesome book.</a></p>
+
 <div class="box">
   <h3 id="clojurebridge">ClojureBridge</h3>
-  <p>Currently we are planning <a href="http://www.clojurebridge.org/" class="coaching">ClojureBridge</a> Berlin! <br />
-Which is a free, beginner-friendly Clojure programming workshop for women.  </p>
+  <p>ClojureBridge is a free, beginner-friendly Clojure programming workshop for women.</p>
+
+  <p>In July 2015 we organized our own <a href="https://clojurebridge-berlin.github.io/" class="highlight_link">ClojureBridge Workshop</a> in Berlin! <br /></p>
 
-  <p><a href="https://docs.google.com/forms/d/1tZXTsTPkeHA4EAW2pMVk_CzW1FkSxmGRWrgdvkPI__4/viewform?c=0&amp;w=1&amp;fbzx=3635869930483963967" class="coaching">Sign up for coaching!</a></p>
 </div>
 
 <h3 id="our-projects">Our projects</h3>
 
 <p><a href="/squares.html" class="projects">Squares</a></p>
 
-<p><a href="/beeps.html" class="projects">Beeps</a>  </p>
+<p><a href="/beeps.html" class="projects">Beeps</a></p>
+
+<p><a href="http://l33tr00m.herokuapp.com/" class="projects">l33tr00m chat</a></p>
 
-<p><a href="http://l33tr00m.herokuapp.com/" class="projects">l33tr00m chat</a>  </p>
+<p><a href="https://github.com/cljart/TheDevilsStaircase" class="projects">The Devils Staircase</a></p>
 
-<p><a href="https://github.com/cljart/TheDevilsStaircase" class="projects">The Devils Staircase</a>  </p>
+<p><a href="https://github.com/cljart/secretsanta" class="projects">Secret Santa</a></p>
 
-<p><a href="https://github.com/cljart/secretsanta" class="projects">Secret Santa</a>  </p>
+<p><a href="https://github.com/cljart/steambox" class="projects">Steambox</a></p>
 
-<p><a href="https://github.com/cljart" class="projects">And more on Github</a>  </p>
+<p><a href="https://github.com/cljart" class="projects">And more on Github</a></p>
 
 
   </body>
diff --git a/_site/public/css/stylesheet.css b/_site/public/css/stylesheet.css
@@ -25,7 +25,7 @@ a.projects:link {
     float: left;
 }
 
-a.coaching:link { 
+a.highlight_link:link { 
   color: #fbad4c;
   font-weight: bold;
   text-decoration: none;
@@ -50,7 +50,7 @@ a.projects:hover {
   background-color: #fbe97c;
 }
 
-a.coaching:hover {
+a.highlight_link:hover {
   color: #e1621c;
 }
 
diff --git a/index.md b/index.md
@@ -8,22 +8,25 @@ layout: default
 
 <small><sup>*</sup> pronounced "with a heart"</small>  
 
-We are a learners group and programmer collective.  
-For one year we met on Mondays and played around with  
+We are a learners group and programmer collective:  
+[@jellea](https://twitter.com/jellea){:.highlight_link}, [@nicsnet](https://twitter.com/nicsnet){:.highlight_link}, [@malweene](https://twitter.com/malweene){:.highlight_link}, [@plexus](https://twitter.com/plexus){:.highlight_link}, [@thatbettina](https://twitter.com/thatbettina){:.highlight_link}  
+
+Usually we meet on Mondays and play around with  
 
 * Clojure/Clojurescript  
 * Music    
 * Animation  
 * and everything that comes to our mind.  
 
-Now we are in our summerbreak!  
+Currently we are in our summerbreak!  
+But we keep reading [this awesome book.](http://www.braveclojure.com/)
 
 <div class="box">
 ### ClojureBridge
-Currently we are planning [ClojureBridge](http://www.clojurebridge.org/){:.coaching} Berlin! <br>
-Which is a free, beginner-friendly Clojure programming workshop for women.  
+ClojureBridge is a free, beginner-friendly Clojure programming workshop for women.  
+
+In July 2015 we organized our own [ClojureBridge Workshop](https://clojurebridge-berlin.github.io/){:.highlight_link} in Berlin! <br>
 
-[Sign up for coaching!](https://docs.google.com/forms/d/1tZXTsTPkeHA4EAW2pMVk_CzW1FkSxmGRWrgdvkPI__4/viewform?c=0&w=1&fbzx=3635869930483963967){:.coaching}
 </div>
 
 ### Our projects
diff --git a/public/css/stylesheet.css b/public/css/stylesheet.css
@@ -25,7 +25,7 @@ a.projects:link {
     float: left;
 }
 
-a.coaching:link { 
+a.highlight_link:link { 
   color: #fbad4c;
   font-weight: bold;
   text-decoration: none;
@@ -50,7 +50,7 @@ a.projects:hover {
   background-color: #fbe97c;
 }
 
-a.coaching:hover {
+a.highlight_link:hover {
   color: #e1621c;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ a.projects:link {`
`25`	`25`	`float: left;`
`26`	`26`	`}`
`27`	`27`
`28`		`-a.coaching:link {`
	`28`	`+a.highlight_link:link {`
`29`	`29`	`color: #fbad4c;`
`30`	`30`	`font-weight: bold;`
`31`	`31`	`text-decoration: none;`
`@@ -50,7 +50,7 @@ a.projects:hover {`
`50`	`50`	`background-color: #fbe97c;`
`51`	`51`	`}`
`52`	`52`
`53`		`-a.coaching:hover {`
	`53`	`+a.highlight_link:hover {`
`54`	`54`	`color: #e1621c;`
`55`	`55`	`}`
`56`	`56`