Skip to content

Commit 3165ac4

Browse files
author
Kristina Schneider
committed
Lots of design changes in calendar, layout, add Tweet and Like Buttons
1 parent 76d9989 commit 3165ac4

File tree

7 files changed

+149
-479
lines changed

7 files changed

+149
-479
lines changed

‎_layouts/main.html

+45-54
Original file line numberDiff line numberDiff line change
@@ -32,84 +32,75 @@
3232

3333
<body>
3434

35+
<nav class="meta_nav">
36+
<div class="container">
37+
<a href="https://twitter.com/opentechschool" class="twitter-follow-button" data-show-count="false">Follow @opentechschool</a>
38+
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
39+
40+
<iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2FOpenTechSchool&amp;send=false&amp;layout=button_count&amp;width=200&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font=lucida+grande&amp;height=21" scrolling="no" frameborder="0"
41+
style="border:none; overflow:hidden; width:80px; height:24px;"
42+
allowTransparency="true">
43+
44+
</iframe>
45+
</div>
46+
</nav>
47+
3548
<header class="site_header">
3649
<div class="container">
37-
<div class="row">
38-
<div class="eightcol">
39-
<h1>
40-
OpenTechSchool
41-
<i>Berlin</i>
42-
</h1>
43-
<h2>Bringing free tech workshops to women and their friends</h2>
44-
45-
</div>
46-
<div class="fourcol last">
47-
<div id="socialshare">
48-
<div id="socialshareprivacy"></div>
49-
</div>
50-
</div>
51-
</div>
50+
<h1>
51+
OpenTechSchool
52+
<i>Berlin</i>
53+
</h1>
54+
55+
56+
<nav>
57+
<ul class="nav_list">
58+
<li>
59+
<a href="#about">About</a>
60+
</li>
61+
<li>
62+
<a href="/#events">events</a>
63+
</li>
64+
<li>
65+
<a href="#coaches">Coaches</a>
66+
</li>
67+
<li>
68+
<a href="#contact">Contact</a>
69+
</li>
70+
</ul>
71+
</nav>
72+
73+
5274
</div>
5375
</header>
5476

55-
56-
<div class="site_header full_bg">
77+
<!-- <div class="full_bg main_img">
5778
<div class="container">
58-
<div class="row">
5979
60-
<h1>full width img goes here</h1>
80+
<img src="http://farm8.staticflickr.com/7226/7228879392_e6fb6877f1_b.jpg" alt="">
6181
62-
</div>
6382
</div>
6483
</div>
65-
66-
84+
-->
6785

6886
<div class="container">
6987
{{ content }}
7088
</div>
7189

7290
<footer class="full_bg">
7391
<div class="container">
74-
<div class="row">
75-
<p>
76-
© 2011-2012 by <a href="http://www.opentechschool.org">OpenTechSchool</a>&nbsp;&nbsp;||&nbsp;&nbsp;Picture by <a href="http://www.flickr.com/photos/lapetiteclaudine/48410895/">La Petit Claudine</a> on Flickr
77-
</p>
78-
</div>
92+
93+
<p>
94+
© 2011-2012 by <a href="http://www.opentechschool.org">OpenTechSchool</a>&nbsp;&nbsp;||&nbsp;&nbsp;<a href="/imprint.html">Imprint</a>
95+
</p>
96+
7997
</div>
8098
</footer>
8199

82100

83101
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
84102
<script>window.jQuery || document.write('<script src="js/libs/jquery-1.6.2.min.js"><\/script>')</script>
85103

86-
<script src="js/supersized.3.1.3.min.js"></script>
87-
<script src="js/jquery.socialshareprivacy.min.js"></script>
88-
<script type="text/javascript">
89-
$(function() {
90-
slideshow_interval = 0;
91-
$.supersized({
92-
slides: [{'image': 'images/it_uni_copen_2.jpg'}]
93-
});
94-
$('#socialshareprivacy').socialSharePrivacy({
95-
services: {
96-
facebook: {
97-
dummy_img : 'images/socialshareprivacy/dummy_facebook_en.png',
98-
txt_info: '2-Click-Privacy-Protection-System: Only when you click here, will the sharing be activated and data send to Facebook. Click a second time to share this Page on Facebook.',
99-
language: 'en_US'
100-
},
101-
twitter : {
102-
txt_info: 'Tweet this link',
103-
txt_info: '2-Click-Privacy-Protection-System: Only when you click here, will the sharing be activated and data send to Twitter. Click a second time to share this Page on Twitter.',
104-
},
105-
gplus: {
106-
txt_info: '2-Click-Privacy-Protection-System: Only when you click here, will the sharing be activated and data send to Google. Click a second time to share this Page on Google+',
107-
language: 'en'
108-
}
109-
}
110-
});
111-
});
112-
</script>
113104
<!--[if lt IE 7 ]>
114105
<script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js"></script>
115106
<script>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>

‎imprint.html

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
layout: main
3+
title: Home
4+
---
5+
6+
<h2>Imprint</h2>
7+
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>

‎index.html

+23-24
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,29 @@
33
title: Home
44
---
55

6-
<div id="main" role="main">
7-
<div id="inner-container">
8-
9-
<div id="introduction">
10-
<p>OpenTechSchool is a community initiative to provide programming and other tech-related workshops to women and their friends. We take care of the organizational side of things (venues, press, finding participants) and let our volunteer coaches to create the curriculum according to their vision. Our main goal is to create a friendly and safe learning environment where no one feels shy about asking any question. Everyone, no matter what their gender, skill level or experience, is invited to participate, whether as a coach or a learner. OTS is an idea we would be very happy to see spread across the globe!
11-
</p>
12-
13-
<h2>Upcoming events</h2>
14-
<!-- Move this div where you want to insert the calendar -->
15-
16-
17-
<h2>Looking for Coaches</h2>
18-
<p>We are currently trying to set up our first two workshops about Javascript and Python. If you feel like coaching on those topics, let us know ( <a href="https://gist.github.com/2850541" target="_blank">here for python</a>, <a href="https://gist.github.com/2835808" target="_blank">here for javascript</a>).
19-
</p>
20-
<h2>Join the movement</h2>
21-
<p>
22-
We are currently working on our official web presence. Until then please feel free to join our Google Group to stay up to date:</p>
23-
</div>
24-
<div id="mail-wrapper" >
25-
<a href="https://groups.google.com/forum/#!forum/opentechschool">Join OpenTechSchool Mailinglist</a>
26-
</div>
27-
28-
</div>
29-
</div>
6+
7+
<div class="row">
8+
9+
<div class="sixcol">
10+
11+
<h2 id="about">About</h2>
12+
<p>OpenTechSchool is a community initiative to provide programming and other tech-related workshops to women and their friends. We take care of the organizational side of things (venues, press, finding participants) and let our volunteer coaches to create the curriculum according to their vision. Our main goal is to create a friendly and safe learning environment where no one feels shy about asking any question. Everyone, no matter what their gender, skill level or experience, is invited to participate, whether as a coach or a learner. OTS is an idea we would be very happy to see spread across the globe!
13+
</p>
14+
15+
16+
<h2>Upcoming events</h2>
17+
<!-- Move this div where you want to insert the calendar -->
18+
<div id="icjs"></div>
19+
20+
21+
<h2 id="contact">Contact</h2>
22+
<p>
23+
Join our Google Group to stay up to date: <a href="https://groups.google.com/forum/#!forum/opentechschool">Join OpenTechSchool Mailinglist</a>
24+
</p>
25+
26+
</div>
27+
</div>
28+
3029

3130
<script>(function() {
3231

‎stylesheets/calendar.css

+1-9
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,16 @@ text-decoration:none;
99
}
1010

1111
.ij_table {
12-
font-family:sans-serif;
13-
font-size:12px;
1412
border-collapse:collapse;
1513
width:100%;
1614
}
1715

1816
.ij_date {
19-
background:#fff;
2017
}
2118

2219
.ij_date th {
2320
text-align:left;
2421
padding:14px 4px 4px 4px;
25-
font-size:13px;
2622
}
2723

2824
.ij_row_a, .ij_row_b {
@@ -43,7 +39,6 @@ background:#f4f4ff;
4339
content:"";
4440
padding-right:0;
4541
color:#449;
46-
font-size:10px;
4742
}
4843

4944
.ij_cal02 {
@@ -53,7 +48,6 @@ background:#f4fff4;
5348
content:"";
5449
padding-right:0;
5550
color:#494;
56-
font-size:10px;
5751
}
5852

5953
.ij_cal03 {
@@ -63,7 +57,6 @@ background:#fff4f4;
6357
content:"";
6458
padding-right:0;
6559
color:#944;
66-
font-size:10px;
6760
}
6861

6962
.ij_cal04 {
@@ -117,15 +110,14 @@ display:block;
117110

118111
.ij_loc {
119112
margin-top:6px;
120-
font-size:11px;
121113
color:#060;
122114
}
123115

124116
.ij_credit {
125117
text-align:center;
126118
padding:12px 0 4px 0;
127119
background:#fff;
128-
font-size:9px;
120+
font-size:.75em;
129121
color:#777;
130122
}
131123

‎stylesheets/grid.css

+2-84
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,11 @@
1-
/* CSS Resets */
2-
3-
html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,address,cite,code,del,dfn,em,img,ins,q,small,strong,sub,sup,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{border:0;margin:0;padding:0}article,aside,figure,figure img,figcaption,hgroup,footer,header,nav,section,video,object{display:block}a img{border:0}figure{position:relative}figure img{width:100%}
4-
5-
6-
/* ==================================================================================================================== */
7-
/* ! The 1140px Grid V2 by Andy Taylor \ http://cssgrid.net \ http://www.twitter.com/andytlr \ http://www.andytlr.com */
8-
/* ==================================================================================================================== */
9-
101
.container {
11-
padding-left: 20px;
12-
padding-right: 20px;
13-
}
14-
15-
.row {
162
width: 100%;
17-
max-width: 1140px;
3+
max-width: 755px;
184
min-width: 755px;
195
margin: 0 auto;
206
overflow: hidden;
217
}
228

23-
.onecol, .twocol, .threecol, .fourcol, .fivecol, .sixcol, .sevencol, .eightcol, .ninecol, .tencol, .elevencol {
24-
margin-right: 3.8%;
25-
float: left;
26-
min-height: 1px;
27-
}
28-
29-
.row .onecol {
30-
width: 4.85%;
31-
}
32-
33-
.row .twocol {
34-
width: 13.45%;
35-
}
36-
37-
.row .threecol {
38-
width: 22.05%;
39-
}
40-
41-
.row .fourcol {
42-
width: 30.75%;
43-
}
44-
45-
.row .fivecol {
46-
width: 39.45%;
47-
}
48-
49-
.row .sixcol {
50-
width: 48%;
51-
}
52-
53-
.row .sevencol {
54-
width: 56.75%;
55-
}
56-
57-
.row .eightcol {
58-
width: 65.4%;
59-
}
60-
61-
.row .ninecol {
62-
width: 74.05%;
63-
}
64-
65-
.row .tencol {
66-
width: 82.7%;
67-
}
68-
69-
.row .elevencol {
70-
width: 91.35%;
71-
}
72-
73-
.row .twelvecol {
74-
width: 100%;
75-
float: left;
76-
}
77-
78-
.last {
79-
margin-right: 0px;
80-
}
81-
829
img, object, embed {
8310
max-width: 100%;
8411
}
@@ -109,7 +36,7 @@ img {
10936
-webkit-text-size-adjust: none;
11037
}
11138

112-
.row, body, .container {
39+
body, .container {
11340
width: 100%;
11441
min-width: 0;
11542
margin-left: 0px;
@@ -118,13 +45,4 @@ img {
11845
padding-right: 0px;
11946
}
12047

121-
.row .onecol, .row .twocol, .row .threecol, .row .fourcol, .row .fivecol, .row .sixcol, .row .sevencol, .row .eightcol, .row .ninecol, .row .tencol, .row .elevencol, .row .twelvecol {
122-
width: auto;
123-
float: none;
124-
margin-left: 0px;
125-
margin-right: 0px;
126-
padding-left: 20px;
127-
padding-right: 20px;
128-
}
129-
13048
}

0 commit comments

Comments
 (0)