diff --git a/static/src/css/ethikis_survey.css b/static/src/css/ethikis_survey.css
index afb40d9939cf129ff0f31ddc0e687ade7a172feb..ee7c6d9ec93e5dd331c38aff4c89ae95783f3b07 100644
--- a/static/src/css/ethikis_survey.css
+++ b/static/src/css/ethikis_survey.css
@@ -42,25 +42,27 @@
background-size: cover;
background-blend-mode: luminosity;
background-color: white;
+ background-attachment: fixed;
color:#3D3D3D;
}
.ethikis-survey h1, .ethikis-survey h2, .ethikis-survey h3, .ethikis-survey h4 {
font-weight: 700;
}
+
.ethikis-survey h1 {
font-size: 62px;
text-transform: uppercase;
margin-bottom: 32px;
margin-top: 32px;
color: #5cc4e7;
- font-style: italic;
font-weight: bold;
}
+
.ethikis-survey h2 {
font-size: 42px;
text-transform: uppercase;
- margin-bottom: 16px;
+ margin-bottom: 32px;
color: #61C4E1;
font-weight: border;
}
@@ -70,18 +72,31 @@
}
.ethikis-survey .js_question-wrapper {
- margin-bottom: 64px;
+ margin-bottom: 38px;
+}
+
+.ethikis-survey .js_question-wrapper h4{
+ margin-bottom: 1rem;
+}
+
+.ethikis-survey .js_question-wrapper input{
+ margin-right: 1rem;
}
.ethikis-jumbo {
- opacity: 0.90;
box-shadow: 0 1rem 3.5rem rgba(0, 0, 0, 0.7) !important;
+ background-color: rgba(233,236,239,0.93);
}
.ethikis-jumbo a {
font-weight: bold;
}
+.ethikis-jumbo a.final_links {
+ color: #3D3D3D;
+ line-height: 3;
+}
+
.ethikis-jumbo a:hover {
text-decoration: none;
}
@@ -92,33 +107,6 @@
width: 100%;
}
-.fa {
- padding: 5px;
- font-size: 20px;
- width: 30px;
- text-align: center;
-}
-
-.fa-facebook {
- background: #3B5998;
- color: white;
- }
-
-.fa-twitter {
- background: #55ACEE;
- color: white;
-}
-
-.fa-instagram {
- background: #cb2027;
- color: white;
-}
-
-.fa-linkedin {
- background: #007bb5;
- color: white;
-}
-
.ethikis-footer a {
color: #FFF;
}
@@ -145,4 +133,32 @@
background-color: #009036;
color: white;
border-radius: 20px;
-}
\ No newline at end of file
+}
+
+
+.fa {
+ padding: 5px;
+ font-size: 20px;
+ width: 30px;
+ text-align: center;
+}
+
+.fa-facebook {
+ background: #3B5998;
+ color: white;
+ }
+
+.fa-twitter {
+ background: #55ACEE;
+ color: white;
+}
+
+.fa-instagram {
+ background: #cb2027;
+ color: white;
+}
+
+.fa-linkedin {
+ background: #007bb5;
+ color: white;
+}
diff --git a/templates/layout.xml b/templates/layout.xml
index 8a06a63c40b03a496017f3aeccee9bfaeb5fed62..0ce5839ca18bc0c1e1d4190ee29e7ca97baa6571 100644
--- a/templates/layout.xml
+++ b/templates/layout.xml
@@ -138,28 +138,26 @@
<input type="hidden" name="csrf_token" t-att-value="request.csrf_token()"/>
<input type="hidden" name="page_id" t-att-value="page.id" />
<input type="hidden" name="token" t-att-value="token" />
- <div class="row">
- <div class="col-9">
- <t t-foreach='page.question_ids' t-as='question'>
- <t t-set="prefix" t-value="'%s_%s_%s' % (survey.id, page.id, question.id)" />
- <div class="js_question-wrapper" t-att-id="prefix">
- <h4>
- <span t-field='question.question' />
- <span t-if="question.constr_mandatory" class="text-danger">*</span>
- </h4>
- <div t-field='question.description' class="text-muted oe_no_empty"/>
- <t t-if="question.type == 'free_text'"><t t-call="survey.free_text"/></t>
- <t t-if="question.type == 'textbox'"><t t-call="survey.textbox"/></t>
- <t t-if="question.type == 'numerical_box'"><t t-call="survey.numerical_box"/></t>
- <t t-if="question.type == 'date'"><t t-call="survey.date"/></t>
- <t t-if="question.type == 'simple_choice'"><t t-call="survey.simple_choice"/></t>
- <t t-if="question.type == 'multiple_choice'"><t t-call="survey.multiple_choice"/></t>
- <t t-if="question.type == 'matrix'"><t t-call="survey.matrix"/></t>
- <div class="js_errzone alert alert-danger" style="display:none;" role="alert"/>
- </div>
- </t>
+ <t t-foreach='page.question_ids' t-as='question'>
+ <t t-set="prefix" t-value="'%s_%s_%s' % (survey.id, page.id, question.id)" />
+ <div class="js_question-wrapper" t-att-id="prefix">
+ <h4>
+ <span t-field='question.question' />
+ <span t-if="question.constr_mandatory" class="text-danger">*</span>
+ </h4>
+ <span t-if="question.description != '<p><br></p>'">
+ <div t-field='question.description' class="text-muted oe_no_empty"/>
+ </span>
+ <t t-if="question.type == 'free_text'"><t t-call="survey.free_text"/></t>
+ <t t-if="question.type == 'textbox'"><t t-call="survey.textbox"/></t>
+ <t t-if="question.type == 'numerical_box'"><t t-call="survey.numerical_box"/></t>
+ <t t-if="question.type == 'date'"><t t-call="survey.date"/></t>
+ <t t-if="question.type == 'simple_choice'"><t t-call="survey.simple_choice"/></t>
+ <t t-if="question.type == 'multiple_choice'"><t t-call="survey.multiple_choice"/></t>
+ <t t-if="question.type == 'matrix'"><t t-call="survey.matrix"/></t>
+ <div class="js_errzone alert alert-danger" style="display:none;" role="alert"/>
</div>
- </div>
+ </t>
<div class="text-right mt16 mb16 mr32">
<button t-if="survey.users_can_go_back and page_nr > 0" type="submit" class="btn ethikis-btn-green" name="button_submit" value="previous">Previous page</button>
<button t-if="not last" type="submit" class="btn ethikis-btn-blue" name="button_submit" value="next">Save or continue</button>
@@ -183,9 +181,9 @@
<h1 class="pt32">Thank you!</h1>
<div t-field="survey.thank_you_message" class="oe_no_empty pt32" />
<div t-if='survey.quizz_mode'>You scored <t t-esc="user_input.quizz_score" /> points.</div>
- <div><a t-att-href="'/survey/print/%s/%s' % (slug(survey), token)">Check answers</a></div>
- <div><a href="https://longtimelabel.com">Know more about LONGTIME</a></div>
- <div><a href="https://ethikis.com">Our ethical tools</a></div>
+ <div><a class="final_links" t-att-href="'/survey/print/%s/%s' % (slug(survey), token)">Check answers</a></div>
+ <div><a class="final_links" href="https://longtimelabel.com">Know more about LONGTIME</a></div>
+ <div><a class="final_links" href="https://ethikis.com">Our ethical tools</a></div>
</div>
</div>
</div>