survey module: update css

Conflicts:

	app/assets/stylesheets/questionnaire.css
This commit is contained in:
iCross 2013-06-02 11:53:24 +08:00
parent 8d71c377f2
commit d2f131d160
1 changed files with 38 additions and 3 deletions

View File

@ -39,8 +39,34 @@
} }
.o-question-title { .o-question-title {
font-weight: bold; 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; display: block;
} }
.o-question-title + input[type=text], .o-question-title + textarea { .o-question-title + input[type=text], .o-question-title + textarea {
@ -89,15 +115,24 @@
border-collapse: collapse; border-collapse: collapse;
max-width: 90%; max-width: 90%;
min-width: 50%; min-width: 50%;
width: auto;
} }
.o-question-group.view-grid th, .o-question-group.view-grid td { .o-question-group.view-grid th, .o-question-group.view-grid td {
padding: 6px; 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 th {}
.o-question-group.view-grid tbody .odd .o-question-title, .o-question-group.view-grid tbody .odd td { .o-question-group.view-grid tbody .odd .o-question-title, .o-question-group.view-grid tbody .odd td {
background-color: #f6f6f6; 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 { .o-question-group.view-grid tbody .odd .o-question-title {
background-color: transparent; background-color: transparent;
} }