From d2f131d1601bef2f5b9d3275c2c529ba0c80c0e9 Mon Sep 17 00:00:00 2001
From: iCross <rja@icross.cc>
Date: Sun, 2 Jun 2013 11:53:24 +0800
Subject: [PATCH] survey module: update css

Conflicts:

	app/assets/stylesheets/questionnaire.css
---
 app/assets/stylesheets/questionnaire.css | 41 ++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/questionnaire.css b/app/assets/stylesheets/questionnaire.css
index adedca5b..db74f00a 100644
--- a/app/assets/stylesheets/questionnaire.css
+++ b/app/assets/stylesheets/questionnaire.css
@@ -39,8 +39,34 @@
 }
 .o-question-title {
   font-weight: bold;
+  font-size: 1.2em;
+  line-height: 1.5em;
+  margin-bottom: 16px;
 }
-.o-question-title + input[type=text], .o-question-title + textarea, .o-question-title + select {
+.o-question-title + .o-question-description {
+  font-weight: normal;
+  background-color: #f6f6f6;
+  padding: 16px;
+  position: relative;
+  margin-top: 20px;
+  width: 90%;
+}
+.o-question-title + .o-question-description:before {
+  display: block;
+  content: "";
+  border-left: 12px solid transparent;
+  border-right: 12px solid transparent; 
+  border-bottom: 12px solid #f6f6f6;
+  position: absolute;
+  top: -12px;
+  left: 16px;
+}
+.o-question-title + input[type=text],
+.o-question-title + textarea,
+.o-question-title + select,
+.o-question-description + input[type=text],
+.o-question-description + textarea,
+.o-question-description + select {
   display: block;
 }
 .o-question-title + input[type=text], .o-question-title + textarea {
@@ -89,15 +115,24 @@
   border-collapse: collapse;
   max-width: 90%;
   min-width: 50%;
+  width: auto;
 }
 .o-question-group.view-grid th, .o-question-group.view-grid td {
   padding: 6px;
 }
-.o-question-group.view-grid thead th {}
+.o-question-group.view-grid thead th {
+  text-align: center;
+}
 .o-question-group.view-grid tbody th {}
 .o-question-group.view-grid tbody .odd .o-question-title, .o-question-group.view-grid tbody .odd td {
   background-color: #f6f6f6;
 }
+<<<<<<< HEAD
+=======
+.o-question-group.view-grid .o-question-title {
+  font-size: 1em;
+}
+>>>>>>> 19effe9... survey module: update css
 .o-question-group.view-grid tbody .odd .o-question-title {
   background-color: transparent;
 }
@@ -115,4 +150,4 @@
 .o-question-action {
   padding: 20px;
   background-color: #f6f6f6;
-}
\ No newline at end of file
+}