Merge pull request #569 from tammoterhark/answers_html

Dev added margin for survey-expiry-wrapper
LimeSurvey · Oct 26, 2016 · cf603d7 · cf603d7
2 parents fa1ce9f + 297037f
commit cf603d7
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 49 deletions.
diff --git a/application/views/survey/questions/arrays/increasesamedecrease/rows/cells/thead.php b/application/views/survey/questions/arrays/increasesamedecrease/rows/cells/thead.php
@@ -5,10 +5,10 @@
 ?>
 
 <!-- thead -->
-<th  class='th-5 text-center'><?php eT('Increase');?></th>
-<th class='th-6 text-center'><?php eT('Same');?></th>
-<th class='th-7 text-center'><?php eT('Decrease');?></th>
+<th  class="th-5"><?php eT("Increase");?></th>
+<th class="th-6"><?php eT("Same");?></th>
+<th class="th-7"><?php eT("Decrease");?></th>
 <?php if($no_answer):?>
-    <th class='th-8  text-center'><?php eT('No answer');?></th>
+    <th class="th-8"><?php eT("No answer");?></th>
 <?php endif;?>
 <!-- end of  thead -->
diff --git a/application/views/survey/questions/arrays/yesnouncertain/rows/cells/thead.php b/application/views/survey/questions/arrays/yesnouncertain/rows/cells/thead.php
@@ -5,10 +5,10 @@
 ?>
 
 <!-- thead -->
-<th class="dontread text-center"><?php eT('Yes');?></th>
-<th class="dontread text-center"><?php eT('Uncertain');?></th>
-<th class="dontread text-center"><?php eT('No');?></th>
+<th class="dontread"><?php eT('Yes');?></th>
+<th class="dontread"><?php eT('Uncertain');?></th>
+<th class="dontread"><?php eT('No');?></th>
 <?php if($no_answer):?>
-    <th class="dontread text-center"><?php eT('No answer'); ?></th>
+    <th class="dontread"><?php eT('No answer'); ?></th>
 <?php endif;?>
 <!-- end of  thead -->
diff --git a/templates/default/css/ls-functional.css b/templates/default/css/ls-functional.css
@@ -1,6 +1,5 @@
 #top-container {
-  position: relative;
-  top: 70px; }
+  position: relative; }
 
 #outer-frame {
   position: relative; }
@@ -9,9 +8,6 @@
   text-align: left;
   font-weight: normal; }
 
-.ls-label-xs-visibility {
-  display: none; }
-
 .ls-language-changer-item {
   text-align: center; }
 
@@ -47,17 +43,6 @@ ul.ls-answers {
 .ls-js-hidden-sr {
   display: none; }
 
-.array-checkbox td,
-.array-yes-uncertain-no td,
-.array-flexible-row td,
-.array-flexible-column td,
-.array-5-pt td,
-.array-10-pt td,
-.array-increase-same-decrease td,
-.array-flexible-duel-scale td,
-.array-flexible-dual-scale td {
-  text-align: center; }
-
 .ls-choice {
   background: white; }
 
@@ -69,3 +54,9 @@ ul.ls-answers {
 
 .text-right {
   float: right; }
+
+.survey-expiry-wrapper {
+  margin-top: 75px; }
+
+.ls-label-xs-visibility {
+  display: none; }
diff --git a/templates/default/css/styling.css b/templates/default/css/styling.css
@@ -45,10 +45,10 @@ th {
 
 #welcome-container {
   background: white;
-  margin-top: 100px;
-  border-left: 1px solid #999;
-  border-right: 1px solid #999;
-  border-top: 1px solid #999; }
+  margin-top: 0px;
+  border: 1px solid #999;
+  margin-bottom: 15px;
+  padding-bottom: 15px; }
 
 .privacy-container {
   background: white;
@@ -60,3 +60,12 @@ th {
 .yesno-button,
 .gender-button {
   max-width: 400px; }
+
+#outerframeContainer {
+  padding-bottom: 30px; }
+
+td.radio-item, td.checkbox-item {
+  text-align: center; }
+
+tr.ls-heading th {
+  text-align: center; }
diff --git a/templates/default/views/startpage.pstpl b/templates/default/views/startpage.pstpl
@@ -14,7 +14,7 @@
 </head>
 <body class="default lang-{SURVEYLANGUAGE} {SURVEYFORMAT}">
 
-    <nav class="navbar navbar-default navbar-fixed-top" id="topsurveymenubar">
+    <nav class="navbar navbar-default" id="topsurveymenubar">
         <div class="navbar-header col-xs-12 col-sm-6 col-lg-8">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
                 <span class="sr-only">Toggle navigation</span>

diff --git a/templates/default/views/welcome.pstpl b/templates/default/views/welcome.pstpl
@@ -1,29 +1,27 @@
 <div class="alert alert-danger" role="alert"  id="checkjavascript">
     {CHECKJAVASCRIPT}
 </div>
+
 <script>
-document.getElementById("checkjavascript").style.display = 'none';
+  document.getElementById("checkjavascript").style.display = 'none';
 </script>
+
 <!-- Survey Description -->
 <div class="row" id="welcome-container">
-    <div class="col-sm-12 ">
-        <h1>{SURVEYNAME}</h1><br />
-        <p class='surveydescription text-info'>{SURVEYDESCRIPTION}</p>
-    </div>
-</div>
 
-<!-- Survey Welcome -->
-<div class="row survey-welcome">
-    <div class="col-sm-12 ">
-        <p class='surveywelcome'>
-            {WELCOME}
-        </p>
-    </div>
-</div>
+  <div class="survey-description col-sm-12 ">
+    <h1>{SURVEYNAME}</h1>
+    <p class="survey-description-text">{SURVEYDESCRIPTION}</p>
+  </div>
 
-<!-- Question number -->
-<div class="row questions-number">
-    <div class="col-sm-12">
-        <p class="x-questions">{THEREAREXQUESTIONS}</p>
-    </div>
-</div>
+
+  <!-- Survey Welcome -->
+  <div class="survey-welcome col-sm-12">
+    <p class="survey-welcome-text">{WELCOME}</p>
+  </div>
+
+  <!-- Question number -->
+  <div class="questions-number col-sm-12">
+    <p class="questions-number-text">{THEREAREXQUESTIONS}</p>
+  </div>
+</div>