diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php
index aa32f2d51..bef6eda16 100644
--- a/admin/survey/Branching.php
+++ b/admin/survey/Branching.php
@@ -4570,17 +4570,18 @@ class Branching {
}
+
//Zadnja bela celica kjer se nahajajo ikone za mouseover, ko je slider
if($slider_VmesneDescrLabel){
$mouseOverStyle = '';
- }else{
+ }
+ else{
$mouseOverStyle = 'style="min-width:80px;"';
}
- echo '
';
- //echo ' ';
- //Zadnja bela celica kjer se nahajajo ikone za mouseover, ko je slider - konec
-
- }else{
+
+ echo ' ';
+ }
+ else{
echo ' ';
}
@@ -5072,10 +5073,8 @@ class Branching {
}
- echo ' ';
- echo ' ';
- echo ' ';
-
+
+
//tabela za labele podrocij in podrocja
echo '';
@@ -5270,7 +5269,7 @@ class Branching {
// n=k
if ($row['design'] == 2) {
- echo '';
+ echo '
';
while ($row1 = mysqli_fetch_array($sql1)) {
@@ -5330,7 +5329,7 @@ class Branching {
elseif ($row['design'] == 0) {
//zaslon razdelimo na dva dela - izris leve strani
- echo '
';
+ echo '
';
while ($row1 = mysqli_fetch_array($sql1)) {
@@ -5387,7 +5386,7 @@ class Branching {
// izris desne strani
- echo '
';
+ echo '
';
if($row['ranking_k'] == 0)
$max = mysqli_num_rows($sql1);
@@ -6120,7 +6119,6 @@ class Branching {
echo ' ';
echo '
';
-
}
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 0d5bcce8d..956a474a4 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -15365,6 +15365,21 @@ div.div.jezik_row.tip_21.spr_tip_7 .variable_holder .calendar_icon:before,
div.div.jezik_row.tip_21.spr_tip_8 .variable_holder .calendar_icon:before {
color: #1E88E5;
}
+li.spr_tip_4.spr_tip_8 .variable_holder .variabla input,
+li.spr_tip_7.spr_tip_8 .variable_holder .variabla input,
+li.spr_tip_8.spr_tip_8 .variable_holder .variabla input,
+li.spr_tip_21.spr_tip_8 .variable_holder .variabla input,
+div.spr_tip_4.spr_tip_8 .variable_holder .variabla input,
+div.spr_tip_7.spr_tip_8 .variable_holder .variabla input,
+div.spr_tip_8.spr_tip_8 .variable_holder .variabla input,
+div.spr_tip_21.spr_tip_8 .variable_holder .variabla input,
+div.div.jezik_row.tip_4.spr_tip_8 .variable_holder .variabla input,
+div.div.jezik_row.tip_7.spr_tip_8 .variable_holder .variabla input,
+div.div.jezik_row.tip_8.spr_tip_8 .variable_holder .variabla input,
+div.div.jezik_row.tip_21.spr_tip_8 .variable_holder .variabla input {
+ width: 160px;
+ padding: 6px 8px;
+}
/*
Tabele v urejanju vprasanja - vrednosti pri tabelah
@@ -16658,7 +16673,7 @@ and open the template in the editor.
box-sizing: border-box;
width: 150px;
margin-left: 8px;
- padding: 12px 8px;
+ padding: 6px 8px;
color: #a9a9a9;
border: 1px solid #E5E5E5;
border-radius: 4px;
@@ -16669,6 +16684,11 @@ and open the template in the editor.
}
.variabla_vsota .variabla_vsota_inline {
word-break: break-all;
+ box-sizing: border-box;
+ flex-grow: 1;
+ padding: 4px 6px;
+ margin-left: 15px;
+ font-size: 14px;
}
/* Zadnja vrsticas pri urejanju vsote - "skupaj" */
@@ -16901,12 +16921,17 @@ div.spr_tip_17 .variable_holder .ranking_holder.design_0 #half .variabla,
div.jezik_row.tip_17 .variable_holder .ranking_holder.design_0 #half .variabla {
margin-bottom: 16px;
}
+li.spr_tip_17 .variable_holder .ranking_holder.design_0 #half .variabla:last-child,
+div.spr_tip_17 .variable_holder .ranking_holder.design_0 #half .variabla:last-child,
+div.jezik_row.tip_17 .variable_holder .ranking_holder.design_0 #half .variabla:last-child {
+ margin-bottom: 0;
+}
li.spr_tip_17 .variable_holder .ranking_holder.design_0 #half .variabla .ranking,
div.spr_tip_17 .variable_holder .ranking_holder.design_0 #half .variabla .ranking,
div.jezik_row.tip_17 .variable_holder .ranking_holder.design_0 #half .variabla .ranking {
overflow: hidden;
box-sizing: border-box;
- flex-grow: 0;
+ flex-grow: 1;
width: calc(100% - 120px);
max-width: 250px;
min-height: 36px;
@@ -16968,6 +16993,11 @@ div.jezik_row.tip_17 .variable_holder .ranking_holder.design_0 #half2 .ranking_f
border: 1px dashed #E5E5E5;
border-radius: 4px;
}
+li.spr_tip_17 .variable_holder .ranking_holder.design_0 #half2 .ranking_frame:last-child,
+div.spr_tip_17 .variable_holder .ranking_holder.design_0 #half2 .ranking_frame:last-child,
+div.jezik_row.tip_17 .variable_holder .ranking_holder.design_0 #half2 .ranking_frame:last-child {
+ margin-bottom: 0;
+}
li.spr_tip_17 .variable_holder .ranking_holder.design_1 .icons_holder,
div.spr_tip_17 .variable_holder .ranking_holder.design_1 .icons_holder,
div.jezik_row.tip_17 .variable_holder .ranking_holder.design_1 .icons_holder {
diff --git a/resources/sass/admin_new/pages/survey_edit/questions/ranking.scss b/resources/sass/admin_new/pages/survey_edit/questions/ranking.scss
index e860ab0ed..f4750c24a 100644
--- a/resources/sass/admin_new/pages/survey_edit/questions/ranking.scss
+++ b/resources/sass/admin_new/pages/survey_edit/questions/ranking.scss
@@ -33,10 +33,14 @@ div.jezik_row.tip_17{
.variabla{
margin-bottom: 16px;
+ &:last-child{
+ margin-bottom: 0;
+ }
+
.ranking {
overflow: hidden;
box-sizing: border-box;
- flex-grow: 0;
+ flex-grow: 1;
width: calc(100% - 120px);
max-width: 250px;
@@ -106,6 +110,10 @@ div.jezik_row.tip_17{
background-color: $light-gray;
border: 1px dashed $gray;
border-radius: 4px;
+
+ &:last-child{
+ margin-bottom: 0;
+ }
}
}
}
diff --git a/resources/sass/admin_new/pages/survey_edit/questions/sum.scss b/resources/sass/admin_new/pages/survey_edit/questions/sum.scss
index 0b5b4e31f..a6aa25d30 100644
--- a/resources/sass/admin_new/pages/survey_edit/questions/sum.scss
+++ b/resources/sass/admin_new/pages/survey_edit/questions/sum.scss
@@ -21,7 +21,7 @@ and open the template in the editor.
box-sizing: border-box;
width: 150px;
margin-left: 8px;
- padding: 12px 8px;
+ padding: 6px 8px;
color: #a9a9a9;
@@ -36,6 +36,14 @@ and open the template in the editor.
.variabla_vsota_inline{
word-break:break-all;
+
+ box-sizing: border-box;
+ flex-grow: 1;
+
+ padding: 4px 6px;
+ margin-left: 15px;
+
+ font-size: 14px;
}
}
diff --git a/resources/sass/admin_new/pages/survey_edit/questions/text.scss b/resources/sass/admin_new/pages/survey_edit/questions/text.scss
index 9ed498161..5d7b356ae 100644
--- a/resources/sass/admin_new/pages/survey_edit/questions/text.scss
+++ b/resources/sass/admin_new/pages/survey_edit/questions/text.scss
@@ -211,4 +211,9 @@ div.div.jezik_row.tip_21{
}
}
}
+
+ &.spr_tip_8 .variable_holder .variabla input{
+ width: 160px;
+ padding: 6px 8px;
+ }
}