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

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
urospodkriznik 2022-10-10 11:20:49 +02:00
commit 87cb6b4f62
4 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/survey/app/Controllers/BodyController.php
View File

@ -2070,8 +2070,6 @@ class BodyController extends Controller
echo '<div id="preview-window">'; echo '<div id="preview-window">';
echo '<div id="preview_switch">'; echo '<div id="preview_switch">';
// Preklop na celostranski preview // Preklop na celostranski preview
@ -2439,8 +2437,6 @@ class BodyController extends Controller
?><script> ?><script>
if (localStorage.preview_popup == 1) { if (localStorage.preview_popup == 1) {
$('#preview-holder, #preview_switch').hide();
$('.preview_icon_open').show(); $('.preview_icon_open').show();
$('.preview_icon_close').hide(); $('.preview_icon_close').hide();

4
main/survey/js/script.js
View File

@ -1247,8 +1247,6 @@ function return_edit_send (site_url, lang_id) {
function preview_popup_close () { function preview_popup_close () {
$('#preview-holder, #nacina').fadeOut('medium');
$('#preview-window').addClass('closed'); $('#preview-window').addClass('closed');
$('.preview_icon_open').show(); $('.preview_icon_open').show();
@ -1259,8 +1257,6 @@ function preview_popup_close () {
function preview_popup_open () { function preview_popup_open () {
$('#preview-holder, #nacina').fadeIn('medium');
$('#preview-window').removeClass('closed'); $('#preview-window').removeClass('closed');
$('.preview_icon_open').hide(); $('.preview_icon_open').hide();

16
public/css/main.css
View File

@ -7296,16 +7296,26 @@ button.ui-datepicker-trigger::before {
top: 45px; top: 45px;
right: 10px; right: 10px;
width: 265px; width: 265px;
min-height: 32px;
font-size: 12px; font-size: 12px;
background-color: white; background-color: white;
box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12); box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
border-radius: 2px; border-radius: 2px;
padding: 16px; padding: 16px;
transition: 0.5s all;
} }
#preview-window.closed { #preview-window.closed {
background-color: transparent; /*background-color: transparent;
border: 0; border: 0;*/
}
#preview-window.closed #preview_switch {
padding-bottom: 0;
border-bottom: 0;
}
#preview-window.closed #preview_switch #nacina {
display: none;
}
#preview-window.closed #preview-holder {
display: none;
} }
#preview-window b, #preview-window b,
#preview-window .bold { #preview-window .bold {

22
resources/sass/main/main/admin.scss
View File

@ -123,7 +123,7 @@
right: 10px; right: 10px;
width: 265px; width: 265px;
min-height: 32px; //min-height: 32px;
font-size: 12px; font-size: 12px;
@ -134,10 +134,24 @@
padding: 16px; padding: 16px;
&.closed{ transition: 0.5s all;
background-color: transparent; &.closed{
border: 0; /*background-color: transparent;
border: 0;*/
#preview_switch{
padding-bottom: 0;
border-bottom: 0;
#nacina{
display: none;
}
}
#preview-holder{
display: none;
}
} }
b, b,