icons and question styles

dominic · dominic · commit dfa80b0b8051 · 2011-10-20T21:43:54.000-04:00
diff --git a/app/assets/images/accepted.png b/app/assets/images/accepted.png
diff --git a/app/assets/images/asked.png b/app/assets/images/asked.png
diff --git a/app/assets/stylesheets/home.css.scss b/app/assets/stylesheets/home.css.scss
@@ -10,57 +10,6 @@
 }
 
 .body-home {
-  #stars {
-    z-index: 100;
-    width: 960px;
-    margin: auto;
-    position: relative;
-/*    overflow: hidden;*/
-
-    .star, .moon {
-      position: absolute;
-      left: 0;
-      width:67px;
-      height: 200px;
-      margin-top: -50px;
-      background: url("/assets/star.png");
-
-      -webkit-animation: sway 2.5s ease-in-out infinite alternate;
-    }
-
-    .star1 {
-      left: -50px;
-      top: -70px;
-    }
-    .moon {
-      background: url("/assets/moon.png");
-      left: -20px;
-      top: -30px;
-    }
-     .star2 {
-       left: 10px;
-     }
-     .star3 {
-       left: 35px;
-       top: -50px;
-     }
-     .star4 {
-       left: auto;
-       right: 20px;
-       top: -80px;
-     }
-     .star5 {
-       left: auto;
-       right: -10px;
-       top: -10px;
-     }
-     .star6 {
-       left: auto;
-       right: -50px;   
-       top: -50px;  
-     }
-  }
-  
   #home-splash {
     border-top: 1px solid $heading + #444;
     .container {
diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss
@@ -1,11 +1,15 @@
+html {
+  background: $heading;
+}
+
 body {
   background: $background url("square_bg.png") fixed;
 }
 
 .topbar {
   position: relative;  
   height: auto;
-  box-shadow: 0px 1px 10px rgba(0,0,0,0.5);
+  @include box-shadow(0px 1px 10px rgba(0,0,0,0.5));
   border-bottom: 1px solid $heading + #444;
 }
 
@@ -59,6 +63,7 @@ header .topbar-inner {
   background: white;
   border-radius: 0 0 8px 8px;
   padding: 40px 18px 18px;
+  @include box-shadow(0 2px 10px 0px rgba(0,0,0,0.45));
 }
 
 .two-column {
diff --git a/app/assets/stylesheets/questions.css.scss b/app/assets/stylesheets/questions.css.scss
@@ -17,9 +17,11 @@
   li {
     @include clearfix;
     list-style-type: none;
+    padding-left: 2.5em;
     padding-bottom: 1em;
     border-bottom: 1px solid #ddd;
     margin-bottom: 1em;
+    background: url("asked.png") 0 6px no-repeat;
 
     .answer-count {
       text-align: center;
@@ -30,15 +32,7 @@
       }
       @include columns(1);
       padding: 6px
-    }
-      .unanswered, .unanswered h3 {
-        color: $orangered;
-      }
-      .answered, .answered h3 {
-        background: $green;
-        color: white;
-      }
-    
+    }    
     .summary {
       @include columns(9, last);
       
@@ -51,6 +45,21 @@
       }
     }
   }
+  
+  .unanswered {
+    .answer-count, .answer-count h3 {
+      color: $orangered;
+    }
+  }
+  .answered, .accepted {
+    .answer-count, .answer-count h3 {
+      color: $green - #333;
+    }
+  }
+  .accepted {
+    background-image: url("accepted.png");
+  }
+  
 }
 
 .question {
@@ -72,18 +81,12 @@
     .answer {
       position: relative;
       list-style-type: none;
-      padding: 1em 1em 0;
-      border-bottom: 1px solid #ddd;
-      margin-bottom: 1em;
+      padding: 1em 1em;
+      border-bottom: 1px solid #ddd;  
       
-      .links {
-        position: absolute;
-        top: 1em;
-        right: 1em;
-      }
     }
   }
-  .selected-answer{
-  	background: #ffc;
+  .selected-answer {
+  	background: rgba(158, 183,68, 0.1) url("accepted.png") 99% 0.5em no-repeat;
   }  
 }
diff --git a/app/views/answers/_list.html.haml b/app/views/answers/_list.html.haml
@@ -6,13 +6,14 @@
     :markdown
       #{list.description}
 
+  - if can?(:update, @question) && (@question.solution_id != list.id)
+    .choose
+      = simple_form_for(@question, :url => question_path(@question)) do |f|
+        = f.hidden_field :solution_id, :value => list.id
+        = f.button :submit, :value => "This answers my question!", :class => "primary btn"
+
   .links
     - if can? :update, list
       = link_to 'Edit', edit_question_answer_path(@question, list)
     - if can? :destroy, list
       = link_to 'Delete', question_answer_path(@question, list), :confirm => 'Are you sure?', :method => :delete
-
-  - if can?(:update, @question) && (@question.solution_id != list.id)
-    = simple_form_for(@question, :url => question_path(@question)) do |f|
-      = f.hidden_field :solution_id, :value => list.id
-      = f.button :submit, :value => "This answers my question!", :class => "primary btn"
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -2,7 +2,8 @@
 !!!
 %html
   %head
-    %title Hackety Hack!
+    - title = yield :title
+    %title #{title.blank? ? "" : "#{title} | "}Hackety Hack!
 
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     / <link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css">
@@ -31,7 +32,6 @@
             = link_to "x", "#", :class => "close"
 
         #content{:class => @content_class}
-          - title = yield :title
           - unless title.empty?
             %h1.title= title
 
diff --git a/app/views/questions/_list.html.haml b/app/views/questions/_list.html.haml
@@ -1,5 +1,5 @@
-%li.item{:id=>list.id}
-  .answer-count{:class => list.answers.count > 0 ? "answered" : "unanswered"}
+%li.item{:id=>list.id, :class => list.answers.count > 0 ? (list.solution_id.nil? ? "answered" : "accepted") : "unanswered"}
+  .answer-count
     %h3= list.answers.count
     #{list.answers.count == 1 ? "answer" : "answers"}
   .summary
