Skip to content

Commit

Permalink
Add nice updates and activities to index
Browse files Browse the repository at this point in the history
  • Loading branch information
jordanbyron committed May 3, 2012
1 parent 207aacd commit c5cd70e
Show file tree
Hide file tree
Showing 12 changed files with 229 additions and 69 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
_sites
.sass-cache
_site
.sass-cache
7 changes: 7 additions & 0 deletions _posts/activities/2012-05-03-placeholder.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: Activity Placeholder
category: activities
layout: default
---

This is a placeholder for activities
7 changes: 7 additions & 0 deletions _posts/updates/2012-05-03-placeholder.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: Update Placeholder
category: updates
layout: default
---

This is a placeholder for updates
File renamed without changes.
File renamed without changes.
61 changes: 61 additions & 0 deletions _sass/partials/_landing.sass
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
#landing

#welcome
margin: 40px 0
font-size: 40px
text-align: center

span.banner
font-size: 48px
color: #70120B

#intro
background: url(/images/logo.png) center top no-repeat
padding-top: 210px
font-size: 23px
text-align: center
margin: 1em 0
padding-bottom: 1em
border-bottom: 1px solid #aaa

#posts
margin: 1em 0
.clear
clear: left
#activities, #updates
width: 400px
float: left
display: inline-block
margin: 0
padding: 0
h2
font-size: 1.5em
text-align: left
a.all
font-size: 0.5em
float: right
padding-top: 1em
ul
list-style-type: none
margin: 0
padding: 0
li a
display: block
padding: 2px 4px
border-bottom: 1px solid #999
text-decoration: none
color: #703838
margin-bottom: 0.5em
span.date
float: right

#updates
margin-right: 50px

p
text-align: center
margin-bottom: 1em
&.footer
border-top: 1px solid #aaa
padding-top: 1em
font-size: 0.9em
File renamed without changes.
23 changes: 2 additions & 21 deletions sass/screen.sass → _sass/screen.sass
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@import compass/css3/box-shadow

@import partials/fonts
@import partials/landing

+blueprint-typography

Expand All @@ -16,24 +17,4 @@ body

#container
margin: 20px auto
width: 850px

#welcome
margin: 40px 0
font-size: 40px
text-align: center

span.banner
font-size: 48px
color: #70120B

#intro
background: url(/images/logo.png) center top no-repeat
padding-top: 210px
font-size: 23px
text-align: center

div.divider
background: url(/images/divider.png) center center no-repeat
height: 28px
margin: 40px 0
width: 850px
2 changes: 1 addition & 1 deletion config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "stylesheets"
sass_dir = "sass"
sass_dir = "_sass"
images_dir = "images"
javascripts_dir = "javascripts"

Expand Down
64 changes: 64 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
---
title: Mendicant University
layout: default
---
<div id="landing">
<div id="welcome">
Welcome to
<span class="banner">Mendicant University</span>
</div>

<div id="intro">
We are a group of software developers who use our technical skills to make a
real positive impact on the world. Rather than learning in a traditional
classroom setting, we sharpen our skills by working on real projects while helping each other out.
</div>

<div id="posts">
<div id="updates">
<h2>
Recent Updates
<a href="#TODO" class="all">View All</a>
</h2>
<ul>
{% for update in site.categories.updates %}
<li>
<a href="{{update.url}}">
{{ update.title }}
<span class="date">{{update.date | date: "%Y %B %d"}}</span>
</a>
</li>
{% endfor %}
</ul>
</div>

<div id="activities">
<h2>
Upcoming Activities
<a href="#TODO" class="all">View All</a>
</h2>
<ul>
{% for activity in site.categories.activities %}
<li>
<a href="{{activity.url}}">
{{ activity.title }}
<span class="date">{{activity.date | date: "%Y %B %d"}}</span>
</a>
</li>
{% endfor %}
</ul>
</div>
<div class="clear"></div>
</div>

<p>
Please read the
<a href="#TODO">Beginner's Guide to Mendicant University</a>
to learn how to get involved.
</p>

<p class="footer">
You can find <a href="#TODO">the source</a> for this website on GitHub.
Pull requests are welcome!
</p>
</div>
16 changes: 0 additions & 16 deletions index.markdown

This file was deleted.

114 changes: 85 additions & 29 deletions stylesheets/screen.css
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,89 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav,
font-style: normal;
}

/* line 3, ../_sass/partials/_landing.sass */
#landing #welcome {
margin: 40px 0;
font-size: 40px;
text-align: center;
}
/* line 8, ../_sass/partials/_landing.sass */
#landing #welcome span.banner {
font-size: 48px;
color: #70120b;
}
/* line 12, ../_sass/partials/_landing.sass */
#landing #intro {
background: url(/images/logo.png) center top no-repeat;
padding-top: 210px;
font-size: 23px;
text-align: center;
margin: 1em 0;
padding-bottom: 1em;
border-bottom: 1px solid #aaaaaa;
}
/* line 21, ../_sass/partials/_landing.sass */
#landing #posts {
margin: 1em 0;
}
/* line 23, ../_sass/partials/_landing.sass */
#landing #posts .clear {
clear: left;
}
/* line 25, ../_sass/partials/_landing.sass */
#landing #posts #activities, #landing #posts #updates {
width: 400px;
float: left;
display: inline-block;
margin: 0;
padding: 0;
}
/* line 31, ../_sass/partials/_landing.sass */
#landing #posts #activities h2, #landing #posts #updates h2 {
font-size: 1.5em;
text-align: left;
}
/* line 34, ../_sass/partials/_landing.sass */
#landing #posts #activities h2 a.all, #landing #posts #updates h2 a.all {
font-size: 0.5em;
float: right;
padding-top: 1em;
}
/* line 38, ../_sass/partials/_landing.sass */
#landing #posts #activities ul, #landing #posts #updates ul {
list-style-type: none;
margin: 0;
padding: 0;
}
/* line 42, ../_sass/partials/_landing.sass */
#landing #posts #activities ul li a, #landing #posts #updates ul li a {
display: block;
padding: 2px 4px;
border-bottom: 1px solid #999999;
text-decoration: none;
color: #703838;
margin-bottom: 0.5em;
}
/* line 49, ../_sass/partials/_landing.sass */
#landing #posts #activities ul li a span.date, #landing #posts #updates ul li a span.date {
float: right;
}
/* line 52, ../_sass/partials/_landing.sass */
#landing #posts #updates {
margin-right: 50px;
}
/* line 55, ../_sass/partials/_landing.sass */
#landing p {
text-align: center;
margin-bottom: 1em;
}
/* line 58, ../_sass/partials/_landing.sass */
#landing p.footer {
border-top: 1px solid #aaaaaa;
padding-top: 1em;
font-size: 0.9em;
}

/* line 33, ../../../../.rvm/gems/ruby-1.9.2-p290/gems/compass-0.12.1/frameworks/blueprint/stylesheets/blueprint/_typography.scss */
body {
line-height: 1.5;
Expand Down Expand Up @@ -303,42 +386,15 @@ caption {
color: #111111;
}

/* line 12, ../sass/screen.sass */
/* line 13, ../_sass/screen.sass */
body {
background: url(/images/snow.png);
font-family: "ThryomanesNormal", "Baskerville Old Face", "Century Schoolbook", "Tw Cen MT", serif;
font-size: 1.25em;
}

/* line 17, ../sass/screen.sass */
/* line 18, ../_sass/screen.sass */
#container {
margin: 20px auto;
width: 850px;
}

/* line 21, ../sass/screen.sass */
#welcome {
margin: 40px 0;
font-size: 40px;
text-align: center;
}
/* line 26, ../sass/screen.sass */
#welcome span.banner {
font-size: 48px;
color: #70120b;
}

/* line 30, ../sass/screen.sass */
#intro {
background: url(/images/logo.png) center top no-repeat;
padding-top: 210px;
font-size: 23px;
text-align: center;
}

/* line 36, ../sass/screen.sass */
div.divider {
background: url(/images/divider.png) center center no-repeat;
height: 28px;
margin: 40px 0;
}

0 comments on commit c5cd70e

Please sign in to comment.