Dev: Style and-or-or condition better

LimeSurvey · Oct 11, 2016 · 2db450d · 2db450d
1 parent 84989c9
commit 2db450d
Show file tree

Hide file tree

Showing 19 changed files with 83 additions and 13 deletions.
diff --git a/application/views/admin/conditions/includes/condition.php b/application/views/admin/conditions/includes/condition.php
@@ -1,7 +1,5 @@
 <?php if ($andOrOr): ?>
-    <span class='label label-default'>
-        <?php echo $andOrOr; ?>
-    </span>
+    <h4 class='condition-and-or-or'><span class='label label-default'> <?php echo $andOrOr; ?> </span></h4>
 <?php endif; ?>
 
 <?php echo CHtml::form(
@@ -12,7 +10,7 @@
         'name'=>"conditionaction" . $row['cid']
     )
 ); ?>
-    <table class='table conditionstable'>
+    <table class='table conditions-table'>
         <tr class='active'>
             <?php if ($subaction == "copyconditionsform" || $subaction == "copyconditions" ): ?>
                 <td></td>

diff --git a/styles/Apple_Blossom/css/lime-admin-common-rtl.css b/styles/Apple_Blossom/css/lime-admin-common-rtl.css
diff --git a/styles/Apple_Blossom/css/lime-admin-common.css b/styles/Apple_Blossom/css/lime-admin-common.css
@@ -2146,6 +2146,14 @@ table#responsedetail tr td{
     margin-left: 5px;
 }
 
+.conditions-table {
+    margin-bottom: 0;
+}
+
+.condition-and-or-or {
+    margin-left: 20px;
+}
+
 /* Tabs used within form in condition designer */
 #editconditions .tab-content {
     padding-top: 0;

diff --git a/styles/Bay_of_Many/css/lime-admin-common-rtl.css b/styles/Bay_of_Many/css/lime-admin-common-rtl.css
diff --git a/styles/Bay_of_Many/css/lime-admin-common.css b/styles/Bay_of_Many/css/lime-admin-common.css
@@ -2146,6 +2146,14 @@ table#responsedetail tr td{
     margin-left: 5px;
 }
 
+.conditions-table {
+    margin-bottom: 0;
+}
+
+.condition-and-or-or {
+    margin-left: 20px;
+}
+
 /* Tabs used within form in condition designer */
 #editconditions .tab-content {
     padding-top: 0;

diff --git a/styles/Black_Pearl/css/lime-admin-common-rtl.css b/styles/Black_Pearl/css/lime-admin-common-rtl.css
diff --git a/styles/Black_Pearl/css/lime-admin-common.css b/styles/Black_Pearl/css/lime-admin-common.css
@@ -2146,6 +2146,14 @@ table#responsedetail tr td{
     margin-left: 5px;
 }
 
+.conditions-table {
+    margin-bottom: 0;
+}
+
+.condition-and-or-or {
+    margin-left: 20px;
+}
+
 /* Tabs used within form in condition designer */
 #editconditions .tab-content {
     padding-top: 0;

diff --git a/styles/Dark_Sky/css/lime-admin-common-rtl.css b/styles/Dark_Sky/css/lime-admin-common-rtl.css
diff --git a/styles/Dark_Sky/css/lime-admin-common.css b/styles/Dark_Sky/css/lime-admin-common.css
@@ -2146,6 +2146,14 @@ table#responsedetail tr td{
     margin-left: 5px;
 }
 
+.conditions-table {
+    margin-bottom: 0;
+}
+
+.condition-and-or-or {
+    margin-left: 20px;
+}
+
 /* Tabs used within form in condition designer */
 #editconditions .tab-content {
     padding-top: 0;

diff --git a/styles/Free_Magenta/css/lime-admin-common-rtl.css b/styles/Free_Magenta/css/lime-admin-common-rtl.css
diff --git a/styles/Free_Magenta/css/lime-admin-common.css b/styles/Free_Magenta/css/lime-admin-common.css
@@ -2146,6 +2146,14 @@ table#responsedetail tr td{
     margin-left: 5px;
 }
 
+.conditions-table {
+    margin-bottom: 0;
+}
+
+.condition-and-or-or {
+    margin-left: 20px;
+}
+
 /* Tabs used within form in condition designer */
 #editconditions .tab-content {
     padding-top: 0;

diff --git a/styles/Noto_All_Languages/css/lime-admin-common-rtl.css b/styles/Noto_All_Languages/css/lime-admin-common-rtl.css
diff --git a/styles/Noto_All_Languages/css/lime-admin-common.css b/styles/Noto_All_Languages/css/lime-admin-common.css
@@ -2146,6 +2146,14 @@ table#responsedetail tr td{
     margin-left: 5px;
 }
 
+.conditions-table {
+    margin-bottom: 0;
+}
+
+.condition-and-or-or {
+    margin-left: 20px;
+}
+
 /* Tabs used within form in condition designer */
 #editconditions .tab-content {
     padding-top: 0;

diff --git a/styles/Purple_Tentacle/css/lime-admin-common-rtl.css b/styles/Purple_Tentacle/css/lime-admin-common-rtl.css
diff --git a/styles/Purple_Tentacle/css/lime-admin-common.css b/styles/Purple_Tentacle/css/lime-admin-common.css
@@ -2146,6 +2146,14 @@ table#responsedetail tr td{
     margin-left: 5px;
 }
 
+.conditions-table {
+    margin-bottom: 0;
+}
+
+.condition-and-or-or {
+    margin-left: 20px;
+}
+
 /* Tabs used within form in condition designer */
 #editconditions .tab-content {
     padding-top: 0;

diff --git a/styles/Sea_Green/css/lime-admin-common-rtl.css b/styles/Sea_Green/css/lime-admin-common-rtl.css
diff --git a/styles/Sea_Green/css/lime-admin-common.css b/styles/Sea_Green/css/lime-admin-common.css
@@ -2146,6 +2146,14 @@ table#responsedetail tr td{
     margin-left: 5px;
 }
 
+.conditions-table {
+    margin-bottom: 0;
+}
+
+.condition-and-or-or {
+    margin-left: 20px;
+}
+
 /* Tabs used within form in condition designer */
 #editconditions .tab-content {
     padding-top: 0;

diff --git a/styles/Sunset_Orange/css/lime-admin-common-rtl.css b/styles/Sunset_Orange/css/lime-admin-common-rtl.css
diff --git a/styles/Sunset_Orange/css/lime-admin-common.css b/styles/Sunset_Orange/css/lime-admin-common.css
@@ -2146,6 +2146,14 @@ table#responsedetail tr td{
     margin-left: 5px;
 }
 
+.conditions-table {
+    margin-bottom: 0;
+}
+
+.condition-and-or-or {
+    margin-left: 20px;
+}
+
 /* Tabs used within form in condition designer */
 #editconditions .tab-content {
     padding-top: 0;