may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redesign - popravki urejanja vprasalnika

Browse Source
This commit is contained in:
pero1203 2022-04-20 11:38:23 +02:00
parent 0e6fc8aa8e
commit 8678e8856d
7 changed files with 296 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
admin/survey/script/vprasanjeInline.js
View File

@ -948,8 +948,10 @@ function inline_clear_paste(_this){
* nastavi editor na contenteditable element za naslov * nastavi editor na contenteditable element za naslov
*/ */
function inline_load_editor (_this) { function inline_load_editor (_this) {
$(_this).css('display', 'none'); $(_this).css('display', 'none');
var el = $(_this).parent().find('div[contenteditable].naslov_inline'); var el = $(_this).parent().find('div[contenteditable].naslov_inline');
if (el.attr('contenteditable') == 'true') { if (el.attr('contenteditable') == 'true') {
var spr_id = el.attr('spr_id'); var spr_id = el.attr('spr_id');
@ -959,38 +961,28 @@ function inline_load_editor (_this) {
var def_pogoj = 'default="'+def_text+'"'; var def_pogoj = 'default="'+def_text+'"';
el.replaceWith('<textarea name="naslov_'+spr_id+'" id="naslov_'+spr_id+'" style="width:99%" '+def_pogoj+'>'+el.html()+'</textarea>'+ el.replaceWith('<textarea name="naslov_'+spr_id+'" id="naslov_'+spr_id+'" style="width:99%" '+def_pogoj+'>'+el.html()+'</textarea>'+
'<span class="buttonwrapper floatLeft" style="margin:5px 0"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inline_save_editor(\''+spr_id+'\'); return false;">'+lang['save']+'</a></span>'); '<div class="button_holder top8 bottom0"><button class="small blue" onclick="inline_save_editor(\''+spr_id+'\'); return false;">'+lang['save']+'</button></div>');
editor_display(spr_id); editor_display(spr_id);
} }
} }
function inline_load_editor_hotspot (_this, vre_id) { function inline_load_editor_hotspot (_this, vre_id) {
//console.log(_this);
$(_this).css('display', 'none');
//var el = $(_this).parent().find('div[contenteditable].naslov_inline');
// echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline_hotspot " contenteditable="false" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_hot_spot_image'])!==false || strpos($row1['naslov'], $lang1['srv_hot_spot_image'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'</div>'; $(_this).css('display', 'none');
var el = $(_this).parent().find('.vrednost_inline_hotspot'); var el = $(_this).parent().find('.vrednost_inline_hotspot');
//if (el.attr('contenteditable') == 'true') {
var spr_id = el.attr('spr_id'); var spr_id = el.attr('spr_id');
var def_text = el.attr('default'); var def_text = el.attr('default');
var def_pogoj = ''; var def_pogoj = '';
if(def_text == 1) if(def_text == 1)
var def_pogoj = 'default="'+def_text+'"'; var def_pogoj = 'default="'+def_text+'"';
//el.replaceWith('<textarea name="hotspot_image_'+spr_id+'" id="hotspot_image_'+spr_id+'" style="width:99%">'+el.html()+'</textarea>'+
//'<span class="buttonwrapper floatLeft" style="margin:5px 0"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inline_save_editor_hotspot(\''+spr_id+'\'); return false;">'+lang['save']+'</a></span>');
el.replaceWith('<textarea name="hotspot_image_'+vre_id+'" id="hotspot_image_'+vre_id+'" style="width:99%" '+def_pogoj+'>'+el.html()+'</textarea>'+ el.replaceWith('<textarea name="hotspot_image_'+vre_id+'" id="hotspot_image_'+vre_id+'" style="width:99%" '+def_pogoj+'>'+el.html()+'</textarea>'+
'<span class="buttonwrapper floatLeft" style="margin:5px 0"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inline_save_editor_hotspot(\''+vre_id+'\', \''+spr_id+'\'); return false;">'+lang['save']+'</a></span>'); '<div class="button_holder top8 bottom0"><button class="medium blue" onclick="inline_save_editor_hotspot(\''+vre_id+'\', \''+spr_id+'\'); return false;">'+lang['save']+'</button></div>');
editor_display_hotspot(vre_id); editor_display_hotspot(vre_id);
//}
//console.log("HotSpot editor");
} }
function inline_save_editor_hotspot(vre_id, spr_id, postsave) { function inline_save_editor_hotspot(vre_id, spr_id, postsave) {
@ -1001,7 +993,7 @@ function inline_save_editor_hotspot(vre_id, spr_id, postsave) {
var parent = el.parent(); var parent = el.parent();
el.replaceWith('<div id="vre_id_'+vre_id+'" vre_id="'+vre_id+'" class="vrednost_inline_hotspot " contenteditable="false" spr_id="'+spr_id+'" tabindex="1">'+el.val()+'</div>'); el.replaceWith('<div id="vre_id_'+vre_id+'" vre_id="'+vre_id+'" class="vrednost_inline_hotspot " contenteditable="false" spr_id="'+spr_id+'" tabindex="1">'+el.val()+'</div>');
parent.find('span.buttonwrapper').remove(); parent.find('div.button_holder').remove();
if ( postsave != false ) if ( postsave != false )
inline_hotspot(spr_id, parent.find('div.vrednost_inline_hotspot')); inline_hotspot(spr_id, parent.find('div.vrednost_inline_hotspot'));
@ -1020,7 +1012,7 @@ function inline_save_editor(spr_id, postsave) {
var parent = el.parent(); var parent = el.parent();
el.replaceWith('<div class="naslov naslov_inline" contenteditable="true" spr_id="'+spr_id+'" tabindex="1">'+el.val()+'</div>'); el.replaceWith('<div class="naslov naslov_inline" contenteditable="true" spr_id="'+spr_id+'" tabindex="1">'+el.val()+'</div>');
parent.find('span.buttonwrapper').remove(); parent.find('div.button_holder').remove();
if ( postsave != false ) if ( postsave != false )
inline_naslov(spr_id, parent.find('div.naslov_inline')); inline_naslov(spr_id, parent.find('div.naslov_inline'));

189
public/css/admin_new.css
View File

@ -6351,7 +6351,7 @@ a.faicon.edit::before {
} }
a.faicon.addif::before { a.faicon.addif::before {
font-family: Montserrat, sans-serif; font-family: Source Sans Pro, sans-serif;
font-size: 18px; font-size: 18px;
font-weight: 900; font-weight: 900;
content: "IF"; content: "IF";
@ -6432,17 +6432,23 @@ a.faicon.unhide_icon::before {
} }
.variabla span.inline.faicon.odg_if_not::before { .variabla span.inline.faicon.odg_if_not::before {
font-family: Montserrat, sans-serif; font-family: Source Sans Pro, sans-serif;
font-size: 15px; font-size: 15px;
font-weight: 900; font-weight: 900;
content: "IF*"; content: "IF*";
} }
.variabla span.inline.faicon.odg_if_follow::before { .variabla span.inline.faicon.odg_if_follow::before {
font-family: Montserrat, sans-serif; font-family: Source Sans Pro, sans-serif;
font-size: 15px; font-size: 15px;
font-weight: 900; font-weight: 900;
content: "IF🠞"; content: "IF";
}
.variabla span.inline.faicon.odg_if_follow::after {
font-size: 14px;
margin-left: 2px;
content: "";
} }
.variabla span.inline.faicon.correct::before { .variabla span.inline.faicon.correct::before {
@ -9152,6 +9158,9 @@ div.button_holder.bottom16 {
div.button_holder.top16 { div.button_holder.top16 {
margin-top: 16px; margin-top: 16px;
} }
div.button_holder.top8 {
margin-top: 8px;
}
div.button_holder.bottom0 { div.button_holder.bottom0 {
margin-bottom: 0px; margin-bottom: 0px;
} }
@ -13717,6 +13726,11 @@ div.spr .spr_edit a:after,
color: #1E88E5; color: #1E88E5;
font-size: 16px; font-size: 16px;
} }
li.spr .spr_edit a:hover:before,
div.spr .spr_edit a:hover:before,
.jezik_row .spr_edit a:hover:before {
color: #0059ab;
}
li.spr .spr_edit a .arhiv, li.spr .spr_edit a .arhiv,
div.spr .spr_edit a .arhiv, div.spr .spr_edit a .arhiv,
.jezik_row .spr_edit a .arhiv { .jezik_row .spr_edit a .arhiv {
@ -13805,10 +13819,10 @@ div.spr .spremenljivka_content:hover,
background-color: white; background-color: white;
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.07); box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.07);
} }
li.spr .spremenljivka_content:hover .add-variable, li.spr .spremenljivka_content:hover .content_div_normalmode .add-variable,
div.spr .spremenljivka_content:hover .add-variable, div.spr .spremenljivka_content:hover .content_div_normalmode .add-variable,
.jezik_row .spremenljivka_content:hover .add-variable { .jezik_row .spremenljivka_content:hover .content_div_normalmode .add-variable {
display: block; visibility: visible;
} }
li.spr .spremenljivka_content .spremenljivka_settings, li.spr .spremenljivka_content .spremenljivka_settings,
div.spr .spremenljivka_content .spremenljivka_settings, div.spr .spremenljivka_content .spremenljivka_settings,
@ -13878,8 +13892,26 @@ div.spr .spremenljivka_content .spremenljivka_tekst_form .display_editor,
cursor: pointer; cursor: pointer;
visibility: hidden; visibility: hidden;
position: absolute; position: absolute;
right: 40px; right: 20px;
top: 25px; top: 18px;
transition: 0.2s;
}
li.spr .spremenljivka_content .content_div_normalmode .display_editor::before,
li.spr .spremenljivka_content .spremenljivka_tekst_form .display_editor::before,
div.spr .spremenljivka_content .content_div_normalmode .display_editor::before,
div.spr .spremenljivka_content .spremenljivka_tekst_form .display_editor::before,
.jezik_row .spremenljivka_content .content_div_normalmode .display_editor::before,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .display_editor::before {
color: #1E88E5;
font-size: 14px;
}
li.spr .spremenljivka_content .content_div_normalmode .display_editor.show,
li.spr .spremenljivka_content .spremenljivka_tekst_form .display_editor.show,
div.spr .spremenljivka_content .content_div_normalmode .display_editor.show,
div.spr .spremenljivka_content .spremenljivka_tekst_form .display_editor.show,
.jezik_row .spremenljivka_content .content_div_normalmode .display_editor.show,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .display_editor.show {
visibility: visible;
} }
li.spr .spremenljivka_content .content_div_normalmode .naslov, li.spr .spremenljivka_content .content_div_normalmode .naslov,
li.spr .spremenljivka_content .spremenljivka_tekst_form .naslov, li.spr .spremenljivka_content .spremenljivka_tekst_form .naslov,
@ -13891,7 +13923,7 @@ div.spr .spremenljivka_content .spremenljivka_tekst_form .naslov,
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
min-width: 100px; min-width: 100px;
padding: 4px 16px; padding: 4px 24px 4px 16px;
font-size: 14px; font-size: 14px;
} }
li.spr .spremenljivka_content .content_div_normalmode .naslov p, li.spr .spremenljivka_content .content_div_normalmode .naslov p,
@ -13986,20 +14018,30 @@ div.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder span.i
cursor: pointer; cursor: pointer;
float: left; float: left;
} }
li.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:before, li.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:before, li.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:after,
li.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:before, li.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:before,
li.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:after,
div.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:before, div.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:before,
div.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:after,
div.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:before, div.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:before,
div.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:after,
.jezik_row .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:before, .jezik_row .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:before,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:before { .jezik_row .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:after,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:before,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:after {
color: rgba(30, 136, 229, 0.5); color: rgba(30, 136, 229, 0.5);
} }
li.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:hover:before, li.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:hover:before, li.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:hover:after,
li.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:hover:before, li.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:hover:before,
li.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:hover:after,
div.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:hover:before, div.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:hover:before,
div.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:hover:after,
div.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:hover:before, div.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:hover:before,
div.spr .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:hover:after,
.jezik_row .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:hover:before, .jezik_row .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:hover:before,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:hover:before { .jezik_row .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder .faicon:hover:after,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:hover:before,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .variable_holder .icons_holder .faicon:hover:after {
color: #1E88E5; color: #1E88E5;
} }
li.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder span.inline_edit, li.spr .spremenljivka_content .content_div_normalmode .variable_holder .icons_holder span.inline_edit,
@ -14102,7 +14144,7 @@ div.spr .spremenljivka_content .spremenljivka_tekst_form div[contenteditable=tru
.jezik_row .spremenljivka_content .content_div_normalmode div[contenteditable=true], .jezik_row .spremenljivka_content .content_div_normalmode div[contenteditable=true],
.jezik_row .spremenljivka_content .spremenljivka_tekst_form div[contenteditable=true] { .jezik_row .spremenljivka_content .spremenljivka_tekst_form div[contenteditable=true] {
border: 1px solid transparent; border: 1px solid transparent;
border-radius: 4px; border-radius: 2px;
} }
li.spr .spremenljivka_content .content_div_normalmode div[contenteditable=true]:hover, li.spr .spremenljivka_content .content_div_normalmode div[contenteditable=true]:hover,
li.spr .spremenljivka_content .spremenljivka_tekst_form div[contenteditable=true]:hover, li.spr .spremenljivka_content .spremenljivka_tekst_form div[contenteditable=true]:hover,
@ -14138,20 +14180,28 @@ div.spr .spremenljivka_content .content_div_normalmode .add-variable,
div.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable, div.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable,
.jezik_row .spremenljivka_content .content_div_normalmode .add-variable, .jezik_row .spremenljivka_content .content_div_normalmode .add-variable,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .add-variable { .jezik_row .spremenljivka_content .spremenljivka_tekst_form .add-variable {
display: none; display: flex;
position: absolute; align-items: center;
left: 59px; justify-content: flex-start;
bottom: 4px; visibility: hidden;
margin-left: 16px;
font-size: 14px;
} }
li.spr .spremenljivka_content .content_div_normalmode .add-variable span, li.spr .spremenljivka_content .content_div_normalmode .add-variable .faicon,
li.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable span, li.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable .faicon,
div.spr .spremenljivka_content .content_div_normalmode .add-variable span, div.spr .spremenljivka_content .content_div_normalmode .add-variable .faicon,
div.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable span, div.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable .faicon,
.jezik_row .spremenljivka_content .content_div_normalmode .add-variable span, .jezik_row .spremenljivka_content .content_div_normalmode .add-variable .faicon,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .add-variable span { .jezik_row .spremenljivka_content .spremenljivka_tekst_form .add-variable .faicon {
position: relative; margin-right: 8px;
top: 1px; }
margin-right: 5px !important; li.spr .spremenljivka_content .content_div_normalmode .add-variable .faicon:before,
li.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable .faicon:before,
div.spr .spremenljivka_content .content_div_normalmode .add-variable .faicon:before,
div.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable .faicon:before,
.jezik_row .spremenljivka_content .content_div_normalmode .add-variable .faicon:before,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .add-variable .faicon:before {
font-size: 14px;
} }
li.spr .spremenljivka_content .content_div_normalmode .add-variable a, li.spr .spremenljivka_content .content_div_normalmode .add-variable a,
li.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable a, li.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable a,
@ -14167,7 +14217,7 @@ div.spr .spremenljivka_content .content_div_normalmode .add-variable a:hover,
div.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable a:hover, div.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable a:hover,
.jezik_row .spremenljivka_content .content_div_normalmode .add-variable a:hover, .jezik_row .spremenljivka_content .content_div_normalmode .add-variable a:hover,
.jezik_row .spremenljivka_content .spremenljivka_tekst_form .add-variable a:hover { .jezik_row .spremenljivka_content .spremenljivka_tekst_form .add-variable a:hover {
color: #FFC700; color: #0059ab;
} }
li.spr .spremenljivka_content .content_div_normalmode .add-variable .tip_6, li.spr .spremenljivka_content .content_div_normalmode .add-variable .tip_6,
li.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable .tip_6, li.spr .spremenljivka_content .spremenljivka_tekst_form .add-variable .tip_6,
@ -14223,6 +14273,10 @@ li.spr_editing .spr_edit,
div.spr_editing .spr_edit { div.spr_editing .spr_edit {
display: block; display: block;
} }
li.spr_editing span.display_editor,
div.spr_editing span.display_editor {
visibility: visible !important;
}
li.spr_editing .spremenljivka_content, li.spr_editing .spremenljivka_content,
div.spr_editing .spremenljivka_content { div.spr_editing .spremenljivka_content {
background-color: white; background-color: white;
@ -14236,7 +14290,7 @@ div.spr_editing .spremenljivka_content .spremenljivka_settings {
} }
li.spr_editing .spremenljivka_content .add-variable, li.spr_editing .spremenljivka_content .add-variable,
div.spr_editing .spremenljivka_content .add-variable { div.spr_editing .spremenljivka_content .add-variable {
display: none; display: none !important;
} }
li.spr_editing .spremenljivka_content .comment_container_inline, li.spr_editing .spremenljivka_content .comment_container_inline,
div.spr_editing .spremenljivka_content .comment_container_inline { div.spr_editing .spremenljivka_content .comment_container_inline {
@ -14564,6 +14618,23 @@ li.spr .variable_holder div.variabla .vrednost_inline p {
padding: 0; padding: 0;
font-size: 16px; font-size: 16px;
} }
div.spr .variable_holder div.variabla[other="1"] .vrednost_inline,
li.spr .variable_holder div.variabla[other="1"] .vrednost_inline {
max-width: 200px;
}
div.spr .variable_holder div.variabla[other="1"] input[type=text],
li.spr .variable_holder div.variabla[other="1"] input[type=text] {
max-width: 200px;
height: 28px;
margin: 0 0 0 8px;
background: #F8F8F8;
border: 1px solid #C4C4C4;
border-radius: 2px;
}
div.spr .variable_holder div.variabla[other="1"] .icons_holder,
li.spr .variable_holder div.variabla[other="1"] .icons_holder {
flex-grow: 1;
}
div.spr .variable_holder div.variabla#variabla_new .vrednost_inline, div.spr .variable_holder div.variabla#variabla_new .vrednost_inline,
li.spr .variable_holder div.variabla#variabla_new .vrednost_inline { li.spr .variable_holder div.variabla#variabla_new .vrednost_inline {
color: #A9A9A9; color: #A9A9A9;
@ -15259,7 +15330,7 @@ div.jezik_row.tip_20 .spremenljivka_content .content_div_normalmode .variable_ho
div.jezik_row.tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-plus-minus, div.jezik_row.tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-plus-minus,
div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-plus-minus, div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-plus-minus,
div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-plus-minus { div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr td .grid-plus-minus {
display: flex; display: none;
justify-content: flex-end; justify-content: flex-end;
} }
li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-plus-minus span, li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th .grid-plus-minus span,
@ -15549,6 +15620,43 @@ div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_ho
width: auto !important; width: auto !important;
text-align: left; text-align: left;
} }
li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
li.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
li.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
li.spr_tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
li.spr_tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
li.spr_tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
li.spr_tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
li.spr_tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
li.spr_tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
div.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
div.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
div.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
div.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
div.spr_tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
div.spr_tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
div.spr_tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
div.spr_tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
div.spr_tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
div.spr_tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
div.jezik_row.tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
div.jezik_row.tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
div.jezik_row.tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
div.jezik_row.tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
div.jezik_row.tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
div.jezik_row.tip_19 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
div.jezik_row.tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
div.jezik_row.tip_20 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text],
div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question input[type=text],
div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question input[type=text] {
width: auto;
height: 28px;
margin: 0 0 0 8px;
background: #F8F8F8;
border: 1px solid #C4C4C4;
border-radius: 2px;
}
li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question .icons_holder, li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question .icons_holder,
li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question .icons_holder, li.spr_tip_6 .spremenljivka_content .content_div_normalmode .variable_holder table tr td.grid_question .icons_holder,
li.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question .icons_holder, li.spr_tip_16 .spremenljivka_content .content_div_normalmode .variable_holder table tr th.grid_question .icons_holder,
@ -15877,6 +15985,23 @@ div.jezik_row.tip_20 .spremenljivka_content .content_div_normalmode .variable_ho
div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tbody tr:nth-child(2n+1) { div.jezik_row.tip_24 .spremenljivka_content .content_div_normalmode .variable_holder table tbody tr:nth-child(2n+1) {
background-color: #F8F8F8; background-color: #F8F8F8;
} }
li.spr_tip_6.spr_editing .grid-plus-minus,
li.spr_tip_16.spr_editing .grid-plus-minus,
li.spr_tip_19.spr_editing .grid-plus-minus,
li.spr_tip_20.spr_editing .grid-plus-minus,
li.spr_tip_24.spr_editing .grid-plus-minus,
div.spr_tip_6.spr_editing .grid-plus-minus,
div.spr_tip_16.spr_editing .grid-plus-minus,
div.spr_tip_19.spr_editing .grid-plus-minus,
div.spr_tip_20.spr_editing .grid-plus-minus,
div.spr_tip_24.spr_editing .grid-plus-minus,
div.jezik_row.tip_6.spr_editing .grid-plus-minus,
div.jezik_row.tip_16.spr_editing .grid-plus-minus,
div.jezik_row.tip_19.spr_editing .grid-plus-minus,
div.jezik_row.tip_20.spr_editing .grid-plus-minus,
div.jezik_row.tip_24.spr_editing .grid-plus-minus {
display: flex !important;
}
/*.spremenljivka_content[tip="24"] { /*.spremenljivka_content[tip="24"] {
.variable_holder { .variable_holder {

16
resources/sass/admin_new/basic/icons/question_edit.scss
View File

@ -31,7 +31,7 @@ a.faicon.edit::before{
content: "\f304"; content: "\f304";
} }
a.faicon.addif::before{ a.faicon.addif::before{
font-family: Montserrat, sans-serif; font-family: $font_family;
font-size: 18px; font-size: 18px;
font-weight: 900; font-weight: 900;
content: "IF"; content: "IF";
@ -95,17 +95,25 @@ a.faicon.unhide_icon::before{
color: $yellow; color: $yellow;
} }
.variabla span.inline.faicon.odg_if_not::before{ .variabla span.inline.faicon.odg_if_not::before{
font-family: Montserrat, sans-serif; font-family: $font_family;
font-size: 15px; font-size: 15px;
font-weight: 900; font-weight: 900;
content: "IF*"; content: "IF*";
} }
.variabla span.inline.faicon.odg_if_follow::before{ .variabla span.inline.faicon.odg_if_follow::before{
font-family: Montserrat, sans-serif; font-family: $font_family;
font-size: 15px; font-size: 15px;
font-weight: 900; font-weight: 900;
content: "IF🠞"; //content: "IF🠞";
content: "IF";
} }
.variabla span.inline.faicon.odg_if_follow::after{
font-size: 14px;
margin-left: 2px;
content: "\f0da";
}
.variabla span.inline.faicon.correct::before{ .variabla span.inline.faicon.correct::before{
font-size: 14px; font-size: 14px;
font-weight: 900; font-weight: 900;

4
resources/sass/admin_new/components/form/button.scss
View File

@ -197,6 +197,10 @@ div.button_holder {
margin-top: 16px; margin-top: 16px;
} }
&.top8 {
margin-top: 8px;
}
&.bottom0 { &.bottom0 {
margin-bottom: 0px; margin-bottom: 0px;
} }

19
resources/sass/admin_new/pages/survey_edit/questions/grids.scss
View File

@ -33,7 +33,7 @@ div.jezik_row.tip_24{
text-align: center; text-align: center;
.grid-plus-minus{ .grid-plus-minus{
display: flex; display: none;
justify-content: flex-end; justify-content: flex-end;
span{ span{
@ -72,6 +72,17 @@ div.jezik_row.tip_24{
} }
// Drugo - disabled polje
input[type="text"]{
width: auto;
height: 28px;
margin: 0 0 0 8px;
background: $light-gray;
border: 1px solid $dark-gray;
border-radius: 2px;
}
.icons_holder{ .icons_holder{
position: absolute; position: absolute;
visibility: hidden; visibility: hidden;
@ -171,6 +182,12 @@ div.jezik_row.tip_24{
} }
} }
} }
&.spr_editing{
.grid-plus-minus{
display: flex !important;
}
}
} }

64
resources/sass/admin_new/pages/survey_edit/questions/question_box.scss
View File

@ -42,6 +42,10 @@ div.spr,
font-size: 16px; font-size: 16px;
} }
&:hover:before{
color: $dark-blue;
}
.arhiv { .arhiv {
background-position: -16px -30px; background-position: -16px -30px;
} }
@ -132,8 +136,8 @@ div.spr,
background-color: white; background-color: white;
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.07); box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.07);
.add-variable { .content_div_normalmode .add-variable {
display: block; visibility: visible;
} }
} }
@ -202,8 +206,19 @@ div.spr,
visibility: hidden; visibility: hidden;
position: absolute; position: absolute;
right: 40px; right: 20px;
top: 25px; top: 18px;
transition: 0.2s;
&::before{
color: $blue;
font-size: 14px;
}
&.show{
visibility: visible;
}
} }
@ -214,7 +229,7 @@ div.spr,
box-sizing: border-box; box-sizing: border-box;
width: 100%; width: 100%;
min-width: 100px; min-width: 100px;
padding: 4px 16px; padding: 4px 24px 4px 16px;
font-size: 14px; font-size: 14px;
@ -287,11 +302,13 @@ div.spr,
.icons_holder{ .icons_holder{
.faicon{ .faicon{
&:before{ &:before,
&:after{
color: rgba(30, 136, 229, 0.5); color: rgba(30, 136, 229, 0.5);
} }
&:hover:before{ &:hover:before,
&:hover:after{
color: $blue; color: $blue;
} }
} }
@ -351,7 +368,7 @@ div.spr,
} }
div[contenteditable=true] { div[contenteditable=true] {
border: 1px solid transparent; border: 1px solid transparent;
border-radius: 4px; border-radius: 2px;
&:hover { &:hover {
background-color: $white; background-color: $white;
@ -371,24 +388,31 @@ div.spr,
display: none; display: none;
} }
.add-variable { .add-variable {
display: none; display: flex;
position: absolute; align-items: center;
left: 59px; justify-content: flex-start;
bottom: 4px;
span { visibility: hidden;
position: relative; margin-left: 16px;
top: 1px;
margin-right: 5px !important; font-size: 14px;
.faicon {
margin-right: 8px;
&:before{
font-size: 14px;
}
} }
a { a {
color: $blue; color: $blue;
&:hover{ &:hover{
color: $yellow; color: $dark-blue;
} }
} }
.tip_6 { .tip_6 {
left: 52px; left: 52px;
} }
@ -437,6 +461,10 @@ div.spr_editing{
display: block; display: block;
} }
span.display_editor {
visibility: visible !important;
}
.spremenljivka_content { .spremenljivka_content {
background-color: white; background-color: white;
border: 1px solid $blue; border: 1px solid $blue;
@ -449,7 +477,7 @@ div.spr_editing{
} }
.add-variable { .add-variable {
display: none; display: none !important;
} }
// komentarji na dnu // komentarji na dnu

22
resources/sass/admin_new/pages/survey_edit/questions/variable.scss
View File

@ -56,6 +56,28 @@ li.spr{
} }
} }
// Vrstica z other
&[other="1"]{
.vrednost_inline{
max-width: 200px;
}
input[type="text"]{
max-width: 200px;
height: 28px;
margin: 0 0 0 8px;
background: $light-gray;
border: 1px solid $dark-gray;
border-radius: 2px;
}
.icons_holder{
flex-grow: 1;
}
}
// Vrstica za nov odgovor na dnu // Vrstica za nov odgovor na dnu
&#variabla_new{ &#variabla_new{