Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline:
  Style for QnA plugin.

theme/neo/css/display.css

@@ -1246,4 +1246,60 @@ table.profile_list tr.alt {
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FB6104', endColorstr='#fc8035',GradientType=0 );
 }
 
+/* QnA specific styles */
+
+#content .question .entry-title {
+    min-height: 1px;
+}
+
+.question div.question-description {
+    font-size: 1em;
+    line-height: 1.36em;
+    opacity: 1;
+}
+
+.question fieldset {
+    margin: 0px;
+}
+
+.question fieldset legend {
+    display: none;
+}
+
+.question p.answer {
+    margin-top: 4px;
+    margin-bottom: 4px;
+    font-style: italic;
+}
+
+.question label[for=answer] {
+    display: none;
+}
+
+.question textarea {
+    width: 100%;
+    height: 42px;
+    padding: 6px 10px 18px 10px;
+    border: 1px solid #a6a6a6;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -moz-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.2);
+    font-size: 1.2em;
+    margin-bottom: 10px;
+}
+
+.question #answer-form input.submit {
+    height: auto;
+    padding: 0px 10px;
+    margin-left: 0px;
+    margin-bottom: 10px;
+    color:#fff;
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 1.1em;
+}
+
 }/*end of @media screen, projection, tv*/