Dev: Fixed issue : notice is Gender

Dev: cursor hover radio and checkbox : IMHO it's really better : can remove
LimeSurvey · Nov 4, 2016 · 3c4ad4f · 3c4ad4f
1 parent 0f4f3eb
commit 3c4ad4f
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 50 deletions.
diff --git a/application/views/survey/questions/gender/buttons/answer.php b/application/views/survey/questions/gender/buttons/answer.php
@@ -25,7 +25,7 @@ class="radio"
             <?php echo $fChecked; ?>
         />
         <label for="answer<?php echo $name;?>F">
-            <span class="fa fa-venus" aria-hidden="true"></span> <?php eT('Female');?>
+            <span class="fa fa-venus ls-icon" aria-hidden="true"></span> <?php eT('Female');?>
         </label>
     </li>
 
@@ -40,7 +40,7 @@ class="radio"
             <?php echo $mChecked;?>
         />
         <label for="answer<?php echo $name;?>M">
-            <span class="fa fa-mars" aria-hidden="true"></span> <?php eT('Male');?>
+            <span class="fa fa-mars ls-icon" aria-hidden="true"></span> <?php eT('Male');?>
         </label>
     </li>
 
@@ -56,7 +56,7 @@ class="radio"
             <?php echo $naChecked;?>
         />
         <label for="answer<?php echo $name;?>">
-            <span class="fa fa-genderless" aria-hidden="true"></span> <?php eT('No answer'); ?>
+            <span class="fa fa-genderless ls-icon" aria-hidden="true"></span> <?php eT('No answer'); ?>
         </label>
     </li>
     <?php endif;?>

diff --git a/application/views/survey/questions/gender/radio/answer.php b/application/views/survey/questions/gender/radio/answer.php
@@ -54,7 +54,6 @@
                 id="answer<?php echo $name;?>"
                 value=""
                 <?php echo $naChecked;?>
-                onclick="<?php echo $checkconditionFunction; ?>"
             />
             <label for="answer<?php echo $name;?>" class="control-label radio-label">
                 <?php eT('No answer'); ?>

diff --git a/application/views/survey/questions/yesno/buttons/item.php b/application/views/survey/questions/yesno/buttons/item.php
@@ -21,7 +21,7 @@
             <?php echo $yChecked; ?>
         />
         <label for="answer<?php echo $name;?>Y">
-            <span class="fa fa-check" aria-hidden="true"></span> <?php eT('Yes');?>
+            <span class="fa fa-check ls-icon" aria-hidden="true"></span> <?php eT('Yes');?>
         </label>
     </li>
     <!-- No -->
@@ -34,7 +34,7 @@
             <?php echo $nChecked; ?>
         />
         <label for="answer<?php echo $name;?>Y">
-            <span class="fa fa-ban" aria-hidden="true"></span> <?php eT('No');?>
+            <span class="fa fa-ban ls-icon" aria-hidden="true"></span> <?php eT('No');?>
         </label>
     </li>
 
@@ -49,7 +49,7 @@
                 <?php echo $naChecked; ?>
             />
             <label for="answer<?php echo $name;?>Y">
-                <span class="fa fa-circle-thin" aria-hidden="true"></span> <?php eT('No answer');?>
+                <span class="fa fa-circle-thin ls-icon" aria-hidden="true"></span> <?php eT('No answer');?>
             </label>
         </li>
     <?php endif;?>

diff --git a/templates/default/css/template.css b/templates/default/css/template.css
@@ -19,10 +19,6 @@ body
   }
 }
 
- div[id^="group-"]>div.group-container {
-     background-color: transparent;
- }
-
 .group-title-container {
   padding: 1em;
   background:transparent;
@@ -87,15 +83,11 @@ padding-top:1em;padding-bottom:1em;
 .dir-rtl .ls-questionhelp:before {
     right:0;
 }
- /**
- * Navigator
- */
 
- #navigator-container {
-     margin-top: 4em;
-     padding-top: 1em;
-     padding-bottom: 1em;
- }
+
+/**
+ * Unsure part
+ */
 
  #main-col {
      margin-top: 1em;
@@ -161,12 +153,19 @@ padding-top:1em;padding-bottom:1em;
 
 }
 
-html, body {
-    height: 90%;
-}
 /**
- * Max width for some answer part
+ * Specific question part
  */
+.radio-item label,.checkbox-item label {
+    cursor: pointer;
+}
+.radio-item [type='radio'],.checkbox-item [type='checkbox'] { /* Why we must positionning at same place */
+    cursor: pointer;
+}
+.js td.radio-item,.js td.checkbox-item{
+    cursor: pointer;
+}
+/* Max width for some answer part */
 @media (min-width: 768px) {
   .yesno-button,.gender-button {
     float: left;
@@ -175,16 +174,14 @@ html, body {
     width: 50%;
   }
 }
-/**
- * table color
- */
+/* table color */
 .ls-even{
 background-color:#f9f9f9;
 }
-/* This, maybe, work in CSS4 :) */
-/* Actual solution : js only*/
-.table-col-hover col:hover,
-.table-col-hover col.hover{
+
+.table-col-hover col:hover, /* This, maybe, work in CSS4 :) */
+.table-col-hover col.hover /* Actual solution : js only*/
+{
     background-color: #ecf0f1;
 }
 @media
@@ -198,36 +195,21 @@ only screen and (max-width: 760px),
  * Gender buttons
  */
 
-/* Not selected */
-
-.gender-button button{
-    box-shadow: 2px 2px 2px 0 rgba(0, 0, 0, 0.16), 2px 2px 2px 0 rgba(0, 0, 0, 0.12);
-    margin-left: 1em;
-}
-
-/* selected */
-.gender-button .btn:focus {
-    box-shadow: none;
-}
-
-.gender-button .btn:focus .gender-text{
-    text-decoration: underline;
-}
-
 /* General */
-.gender-button .btn span {
+.button-item .ls-icon {
     display: block;
 }
+.button-item .ls-icon {
+    font-size: 1.4em;
+}
 
 html body .navbar.navbar-default.navbar-fixed-top {
     z-index: 2000;
 }
 .file-upload-modal,.modal{
     z-index: 2001;
 }
-.gender-button .gender-icon {
-    font-size: 2em;
-}
+
 /* Title of survey can be big, allow multiline, but leave the minimum */
 .navbar-brand {
     height: auto;