Tweaks

columbusrb · Feb 1, 2012 · c999a03 · c999a03
1 parent 7d12423
commit c999a03
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/coffee/client.coffee b/coffee/client.coffee
@@ -24,7 +24,7 @@ $ ->
 
     presenter.cssClass.push "winner" if entry.winner is true
     presenter.cssClass = presenter.cssClass.join(' ')
-    row = target.prepend(template(presenter)).children(":first").hide().fadeIn(1500)
+    row = target.prepend(template(presenter))
     row.find('.gravatar img').mouseenter() if entry.winner
 
   clearWinner = ->
@@ -152,6 +152,9 @@ $ ->
     $("#admin-area").fadeOut 1000
     socket.emit "consumeEntries"
 
+  $('.alert a.close').click ->
+    $(this).parents('.alert').fadeOut()
+
   $(window).keyup (e) ->
      $('#admin-area').slideUp 'fast' if e.keyCode is 27
 

diff --git a/public/crb.css b/public/crb.css
@@ -1,12 +1,10 @@
 .container{width:960px;position:relative}
-#rules-area{margin-bottom:2em;color:#222;}
-#rules-area li{font-style:italic}
-#rules-area h3{color:#222}
+#rules-area{margin-bottom:2em}
 table#contest th{border-bottom:1px solid #ddd !important}
 table#contest td{line-height:26px;vertical-align:middle;}
 table#contest td.gravatar img{width:24px;height:24px}
 table#contest td.twitter{text-transform:lowercase}
-#count{text-align:center;font-weight:bold}
+#count{text-align:right;font-weight:bold}
 input.error,select.error{border-color:#dc143c;color:#dc143c}
 tr.winner td{font-weight:bold;background-color:#f9f0c4 !important}
 #admin-area{-moz-box-shadow:0 0 5px #888;-webkit-box-shadow:0 0 5px #888;box-shadow:0 0 5px #888;position:absolute;top:0;right:0;padding:1em;background:#f5f5f5;border:1px solid #ddd;}

diff --git a/public/crb.styl b/public/crb.styl
@@ -11,13 +11,6 @@ box-shadow(color)
 
 #rules-area
   margin-bottom: 2em
-  color: #222
-
-  li
-    font-style: italic
-
-  h3
-    color: #222
 
 table#contest
   th
@@ -35,7 +28,7 @@ table#contest
       text-transform: lowercase
 
 #count
-  text-align: center
+  text-align: right
   font-weight: bold
 
 input.error,select.error

diff --git a/views/index.jade b/views/index.jade
@@ -1,15 +1,24 @@
 .page-header
   h1 Columbus Ruby Brigade Register
 
-#rules-area
-  h3 Contest Rules
+#rules-area.alert.alert-warning
+  a.close x
+  h3.alert-heading Contest Rules
   ul
     li One entry per attendee.
     li Must be present to win!
-    li Must have more than 30 attendees for a giveaway.
+    li Must have at least 30 attendees for a giveaway.
     li Licenses arrive via email &mdash; usually within three weeks.
     li The CRB will use this email address as the licensee address.
 
+#progress-area
+  h3
+    = "Contest Attendence Goal "
+    small (30 attendees)
+  .progress.progress-info.progress-striped.active
+    .bar(style="width: 0%;")
+
+
 
 #admin-link Super Secret Admin Area
 #admin-area(style="display:none;")
@@ -52,14 +61,6 @@ form#new-entry-form.form-horizontal
     = " Register"
 
 
-#progress-area
-  h3
-    = "Contest Attendence Goal "
-    small (30 attendees)
-  .progress.progress-success.progress-striped.active
-    .bar(style="width: 0%;")
-
-
 table#contest.table.table-condensed.table-striped
   thead
     tr