Permalink
Browse files

rules and locations plus a nav! [finishes #15785957, #15779523]

  • Loading branch information...
Visnu Pitiyanuvath
Visnu Pitiyanuvath committed Jul 15, 2011
1 parent b6ba04e commit 70a608379b5291315f2895a3502f74342eab4ddb
View
@@ -12,6 +12,5 @@ loadCurrentPersonWithTeam = (req, res, next) ->
app.get '/', [loadCurrentPersonWithTeam], (req, res) ->
res.render2 'index/index', team: req.team
-['about', 'how-to-win', 'sponsors'].forEach (p) ->
- app.get '/' + p, (req, res) ->
- res.render2('index/' +p)
+['about', 'how-to-win', 'locations', 'rules', 'sponsors'].forEach (p) ->
+ app.get '/' + p, (req, res) -> res.render2 "index/#{p}"
@@ -28,7 +28,7 @@ xxx-large = 96px
font-style normal
font-size medium
-header, footer
+header, footer, nav
display block
time
display inline
@@ -57,15 +57,16 @@ button, input[type=submit], a.button
font-size large
border solid 1px hsla(0, 0%, 0%, 0.2)
background-color hsl(200, 30%, 60%)
- background hsl(200, 30%, 50%) -webkit-linear-gradient(-90deg, hsla(0, 0%, 100%, 0.6), hsla(0, 0%, 100%, 0.1) 50%)
+ background hsl(200, 30%, 50%) -webkit-linear-gradient(-90deg, hsla(0, 0%, 100%, 0.5), hsla(0, 0%, 100%, 0.1) 50%)
+ background hsl(200, 30%, 50%) -moz-linear-gradient(-90deg, hsla(0, 0%, 100%, 0.5), hsla(0, 0%, 100%, 0.1) 50%)
color white
- text-shadow 0 -1px 0 hsla(0, 0%, 0%, 0.2)
+ text-shadow 0 -1px 0 hsla(0, 0%, 0%, 0.5)
text-decoration none
- padding 5px 10px
+ padding 5px 1ex
border-radius 3px
box-shadow inset 0 0 3px hsla(0, 0%, 0%, 0.2)
&:active
- box-shadow inset 0 0 5px hsla(0, 0%, 0%, 0.8)
+ box-shadow inset 0 0 5px hsla(0, 0%, 0%, 0.6)
input[type=text], input[type=email]
font-size large
@@ -169,6 +170,14 @@ aside
padding 8px 5px 5px 10px
border-radius 2px
border solid 1px hsla(0, 100%, 100%, 0.5)
+ nav
+ margin 1em 0
+ border-bottom dotted 2px hsla(0, 0%, 0%, 0.2)
+ a:link
+ text-decoration none
+ li
+ display inline
+ margin 0 1em
.thing
position absolute
@@ -205,6 +214,8 @@ aside
font-size xxx-large !important
.ko
padding 10px 10px 0 25px !important
+ nav
+ font-size large
section
margin 3em 0px
p, ul
View
@@ -14,7 +14,7 @@ section
section
- if (team)
- a.button( href: '/teams/' + team.id ) View Your Team
+ a.register.button( href: '/teams/' + team.id ) View Your Team
- else
a.register.button( href: '/teams/new' ) Register a Team
View
@@ -0,0 +1,16 @@
+:markdown
+ # Locations
+
+ Contestants may compete "virtually" from anywhere in the world, but [Joyent]
+ will be hosting Knockout HQ in San Francisco.
+
+ ## San Francisco
+
+ Further details coming.
+
+ ## Other Locations
+
+ Not in San Francisco? Want to host a satellite location? [Let us know].
+
+ [Joyent]:http://www.joyent.com/
+ [Let us know]:mailto:all@nodeknockout.com
View
@@ -0,0 +1,7 @@
+:markdown
+ # Rules
+
+ Rules are forthcoming. Until then, refer to [last year's rules][1]. They're
+ going to be very similar, with only a few tweaks to voting and judging.
+
+ [1]:http://2010.nodeknockout.com/rules
View
@@ -54,6 +54,11 @@ html
h1: a( href: '/' )
| node.js
span.ko ko
+ nav: ul
+ li: a( href: '/rules' ) Rules
+ li: a( href: '/locations' ) Locations
+ li: a( href: '/teams' ) Teams
+
!= body
script( src: '/socket.io/socket.io.js' )
script( src: '/javascripts/all.js' )

0 comments on commit 70a6083

Please sign in to comment.