Skip to content

Commit 84cbf57

Browse files
espenakespenak
committed
Tuned text and styles (#432).
1 parent 229402b commit 84cbf57

2 files changed

Lines changed: 83 additions & 48 deletions

File tree

‎index.html‎

Lines changed: 55 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
---
22
layout: base
33
title: Devilry
4+
forumurl: https://groups.google.com/forum/#!forum/devilry-help
5+
forumnewtopicurl: https://groups.google.com/forum/#!newtopic/devilry-help
6+
issuetrackerurl: https://groups.google.com/forum/#!newtopic/devilry-help
7+
facebookurl: https://www.facebook.com/DevilryProsjektet
48
---
59

610
<!-- NAVBAR
@@ -130,16 +134,27 @@ <h2>Develop</h2>
130134

131135
<div class="featurette" id="social">
132136
<div class="featurette-graphics">
133-
<div class="fb-like-box" data-href="https://www.facebook.com/DevilryProsjektet" data-width="300" data-height="400" data-show-faces="true" data-stream="false" data-show-border="false" data-header="false"></div>
137+
<div class="fb-like-box stacked-box" data-href="{{ page.facebookurl }}" data-width="300" data-height="320" data-show-faces="true" data-stream="false" data-show-border="true" data-header="false"></div>
138+
<a class="stacked-box btn btn-success btn-large" href="https://github.com/devilry/devilry-django/issues/new">
139+
<i class="icon-github"></i>
140+
Submit an issue
141+
<small>improvements, new features or bugs</small>
142+
</a>
143+
<a class="stacked-box btn btn-success btn-large" href="https://groups.google.com/forum/#!newtopic/devilry-help">
144+
<i class="icon-edit"></i>
145+
Create a forum topic
146+
<small>discuss all matters concerning Devilry</small>
147+
</a>
134148
</div>
135149

136150
<h2>Get involved. <span class="muted">Join a open and friendly community.</span></h2>
137151
<p class="lead">
138152
Join us
139-
on <a href="https://www.facebook.com/DevilryProsjektet">Facebook</a>. We
153+
on <a href="{{ page.facebookurl }}">Facebook</a>. We
140154
appreciate comments and guiding input from the community.
141-
Suggest improvements and report bugs through our <a href="https://github.com/devilry/devilry-django/issues?state=open">issue
142-
tracker at GitHub.</a>
155+
Suggest improvements and report bugs through our
156+
<a href="{{ page.issuetrackerurl }}">issue tracker</a>,
157+
or discuss broader topics in our <a href="{{ page.forumurl }}">Forum</a>.
143158
</p>
144159
<p>
145160
There are many ways to contribute to the
@@ -153,76 +168,77 @@ <h2>Get involved. <span class="muted">Join a open and friendly community.</span>
153168
tasks for students, teachers and administrators. No
154169
contribution is considered to small.
155170
</p>
156-
<p><a class="btn btn-info"
157-
href="https://github.com/devilry/devilry-django/issues/new">Give Feedback</a></p>
158171
</div>
159172

160173
<hr class="featurette-divider" id="about">
161174

162175
<div class="featurette" id="">
163176
<div class="featurette-graphics">
164177
<!--<img alt="Devilry logo" src="devilrylogo-large.png"/>-->
165-
<i class="icon-tag marketing-huge-icon"></i>
178+
<i class="icon-tag featurette-huge-icon"></i>
166179
</div>
167-
<h2>About Devilry. <span class="muted">And why people love it</span></h2>
180+
<h2>About Devilry. <span class="muted">Why people love it.</span></h2>
168181

169-
<p class="lead">Devilry started out in 2008 by a group of students at the Informatics Department, University of Oslo with a vision to improve the current solutions around deliveries of obligatory assignments. Devilry is designed to be flexible and customizable with a minimal maintainability cost. The system can handle all kinds of deliveries from source code to essays. On top a simple and easy-to-use delivery layer Devilry provides a sophisticated interface for examiners and teaching assistants to manage student group directly in their favorite browser. Course administrators are given a focused interface to be able to easily manage all formalities around course management, from task deadlines to exam lists. </p>
170-
<p>
171-
Devilry is currently the main devilry management system used at the Department of Informatics, UiO with plans of expanding to span across all departments at the The Faculty of Mathematics and Natural Sciences, UiO.</p>
182+
<p class="lead">Devilry started out in 2008 by a group of students at
183+
the Department of Informatics, University of Oslo with a vision to improve
184+
the current solutions around deliveries of obligatory assignments.
185+
Devilry is designed to be flexible and customizable with a minimal
186+
maintainability cost.
187+
</p>
188+
<p>The system can handle all kinds of deliveries
189+
from source code to essays. On top a simple and easy-to-use delivery
190+
layer Devilry provides a sophisticated interface for examiners and
191+
teaching assistants to manage student group directly in their favorite
192+
browser. Course administrators are given a focused interface to be able
193+
to easily manage all formalities around course management, from task
194+
deadlines to exam lists.</p>
195+
<p>Devilry is currently the main delivery management system used at the
196+
Department of Informatics, UiO with plans of expanding to span across
197+
all departments at the The Faculty of Mathematics and Natural Sciences,
198+
UiO.</p>
172199
</div>
173200

174201
<hr class="featurette-divider">
175202

176203
<div class="featurette" id="help">
177-
<div class="featurette-graphics-left">
178-
<!--<img alt="Devilry logo" src="devilrylogo-large.png"/>-->
179-
<i class="icon-comments marketing-huge-icon"></i>
180-
</div>
204+
<div class="featurette-graphics featurette-graphics-left">
205+
<i class="icon-comments featurette-huge-icon"></i>
206+
</div>
181207
<h2>Get help. <span class="muted">Or help someone else.</span></h2>
182208

183209

184210
<p class="lead">
185-
The easiest way to start out is to give us a like at our
186-
<a href="https://www.facebook.com/DevilryProsjektet">Facebook page</a>. To dig into what happens directly to the
187-
Devilry code base visit
188-
our <a href="https://github.com/devilry/devilry-django/issues?state=open">issue
189-
tracker at GitHub</a>To help
190-
out others become of a part of the team now!
211+
<!--The easiest way to start out is to give us a like at our-->
212+
<!--<a href="{{ page.facebookurl }}">Facebook page</a>.-->
213+
Visit our <a href="{{ page.issuetrackerurl }}">issue tracker</a>
214+
and submit or help with bugs and suggestions. Visit our
215+
<a href="{{ page.forumurl }}">forum</a> to get help, or to discuss
216+
all matters concerning Devilry. Become a part of our community now!
191217
</p>
192218

193219
</div>
194220

195221
<div class="featurette" id="developer">
196222
<div class="featurette-graphics">
197223
<!--<img alt="Devilry logo" src="devilrylogo-large.png"/>-->
198-
<i class="icon-puzzle-piece marketing-huge-icon"></i>
224+
<i class="icon-puzzle-piece featurette-huge-icon"></i>
199225
</div>
200226
<h2>Develop Devilry. <span class="muted">We will help you get started.</span></h2>
201227
<p class="lead">
202-
203-
Developers can clone our repository
204-
at <a href="https://github.com/devilry/devilry-django">GitHub</a>
205-
and start right
206-
away. The <a href="http://devilry.readthedocs.org/en/latest/">Devilry
207-
Devoloper Documentation</a> will guide you in the right
208-
direction. Feel free to consult
209-
the <a href="https://groups.google.com/forum/#!forum/devilry-help">Devilry Help Questions and Answers</a> forum for further help on every matters concerning Devilry.
210-
</p>
211-
<p>The Devilry source code is available at our repository under the BSD license, which is an open source license.</p>
212-
<p><a href="https://github.com/devilry/devilry-django/wiki/Developer">Developer Wiki</a></p>
228+
Developers can clone <a href="https://github.com/devilry/devilry-django">our repository</a>
229+
at GitHub and start right away. The
230+
<a href="http://devilry.readthedocs.org/en/latest/">Devilry Devoloper Documentation</a>
231+
will guide you in the right direction. Feel free to consult
232+
the <a href="https://groups.google.com/forum/#!forum/devilry-help">Devilry Help Questions and Answers</a> forum for further help on all matters concerning Devilry.
233+
</p>
234+
<p>The Devilry source code is released with the the <a href="https://github.com/devilry/devilry-django/blob/master/LICENSE">BSD license</a>, which is an open source license.</p>
213235
</div>
214236

215237
<hr class="featurette-divider">
216238

217239
<!-- /END THE FEATURETTES -->
218240

219241

220-
<!-- FOOTER -->
221-
<footer>
222-
<p class="pull-right"><a href="#">Back to top</a></p>
223-
<p>&copy; 2013 Company, Inc. &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
224-
</footer>
225-
226242
</div><!-- /.container -->
227243

228244

‎less/featurette.less‎

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,41 @@
1+
@featuretteMarginSides: 70px;
2+
@featuretteMarginTop: 120px;
3+
14

25
.featurette-divider {
36
margin: 80px 0; /* Space out the Bootstrap <hr> more */
47
}
58
.featurette {
6-
padding-top: 120px; /* Vertically center images part 1: add padding above and below text. */
9+
padding-top: @featuretteMarginTop; /* Vertically center images part 1: add padding above and below text. */
710
overflow: hidden; /* Vertically center images part 2: clear their floats. */
811
.featurette-graphics {
912
float: right;
10-
margin: -120px 0 60px 60px;
11-
i {
13+
margin: -@featuretteMarginTop 0 @featuretteMarginSides @featuretteMarginSides;
14+
i.featurette-huge-icon {
1215
font-size: 420px;
1316
}
14-
}
15-
.featurette-graphics-left {
16-
float: left;
17-
margin: -120px 60px 60px 0;
18-
i {
19-
font-size: 420px;
17+
.stacked-box {
18+
margin-bottom: 10px;
19+
&.btn {
20+
position: relative;
21+
i {
22+
position: absolute;
23+
top: 8px;
24+
left: 12px;
25+
font-size: 45px;
26+
}
27+
padding-left: 70px;
28+
text-align: left;
29+
display: block;
30+
small {
31+
display: block;
32+
font-size: @baseFontSize - 4px;
33+
}
34+
}
35+
}
36+
&.featurette-graphics-left {
37+
float: left;
38+
margin: -@featuretteMarginTop @featuretteMarginSides @featuretteMarginSides 0;
2039
}
2140
}
2241
h2 {

0 commit comments

Comments
 (0)