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

Popravki postavitve, razmakov branching elementov na razlicnih sirinah ekrana (zlasti za formo in glasovanje)

Browse Source
This commit is contained in:
pero1203 2021-01-20 11:36:34 +01:00
parent b685f0518c
commit f86fa60cf7
7 changed files with 383 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/SurveyAdmin.php
View File

@ -378,7 +378,7 @@ class SurveyAdmin
// Prikaze podatke o anketi in navigacijo - na vrhu (top bar) // Prikaze podatke o anketi in navigacijo - na vrhu (top bar)
$this->displayAnketaTop(); $this->displayAnketaTop();
echo '<div id="anketa_edit" class="page_'.$_GET['a'].' subpage_'.$_GET['m'].'">'; echo '<div id="anketa_edit" class="page_'.$_GET['a'].' subpage_'.$_GET['m'].' '.($this->survey_type == '1' ? 'forma' : '').' '.($this->survey_type == '0' ? 'glasovanje' : '').'">';
$this->displayAnketa(); $this->displayAnketa();
echo '</div>'; echo '</div>';

252
public/css/admin.css
View File

@ -14010,77 +14010,6 @@ and open the template in the editor.
Created on : 03-Aug-2018, 11:04:39 Created on : 03-Aug-2018, 11:04:39
Author : podkrizniku Author : podkrizniku
*/ */
#glas_settings {
float: left;
width: 330px;
margin: 57px 0 10px 15px;
padding: 0;
line-height: 18px;
background-color: white;
border: 1px solid #c8e3f8;
}
#glas_settings .more {
float: right;
margin: 5px 20px 10px 0;
font-weight: 500;
}
#glas_settings .less {
float: right;
margin: 5px 20px 10px 0;
font-weight: 500;
}
#glas_settings .header_holder {
height: 35px;
font-size: 16px;
font-weight: 500;
background-color: #c8e3f8;
width: 100%;
}
#glas_settings .header_content {
padding: 8px 0px 7px 0px;
}
#glas_settings .header_content .header_left {
color: #1e88e5;
font-size: 16px;
font-weight: 500;
width: auto;
float: left;
padding-left: 10px;
}
#glas_settings fieldset {
margin: 11px 10px;
padding: 3px 5px;
border: 0;
border-top: 1px solid #1e88e5;
}
#glas_settings legend {
margin: 0;
padding: 0 10px 0 5px;
background-color: rgba(0, 0, 0, 0);
color: #1e88e5;
font-weight: 500;
}
#branching.branching_glasovanje {
position: absolute;
left: 377px !important;
right: 322px !important;
padding: 3px;
min-height: 400px;
max-width: 848px;
}
#branching.branching_glasovanje ul.first {
margin: 1px 0 0 0 !important;
}
#branching.branching_glasovanje ul li {
margin-left: 0px !important;
}
#quick_settings_holder.glas_quick_settings {
margin-top: 35px;
top: 190px !important;
}
.nastavitveSpan4 { .nastavitveSpan4 {
display: table-cell; display: table-cell;
float: left; float: left;
@ -14107,39 +14036,113 @@ select#skin {
margin: 4px 0 2px 0; margin: 4px 0 2px 0;
} }
#quick_settings { #anketa_edit.glasovanje .anketa_edit_main {
float: right; display: flex;
padding: 0 10px 0 10px; /* Leve nastavitve */
width: 290px; /* Srednji del */
background-color: #f5fafe; /* Desne nastavitve */
}
#anketa_edit.glasovanje .anketa_edit_main #glas_settings {
width: 330px;
margin: 20px 0 0 0;
padding: 0;
line-height: 18px;
background-color: white;
border: 1px solid #c8e3f8; border: 1px solid #c8e3f8;
} }
#quick_settings fieldset { #anketa_edit.glasovanje .anketa_edit_main #glas_settings .more {
border: 1px #606060 solid; float: right;
margin: 5px 20px 10px 0;
font-weight: 500;
} }
#quick_settings .form_bottom_settings { #anketa_edit.glasovanje .anketa_edit_main #glas_settings .less {
margin: 0 8px 10px 8px; float: right;
padding: 0 0 5px 10px; margin: 5px 20px 10px 0;
background-color: inherit; font-weight: 500;
} }
#quick_settings #form_settings_obvescanje { #anketa_edit.glasovanje .anketa_edit_main #glas_settings .header_holder {
padding: 1px 0 10px 10px; height: 35px;
font-size: 16px;
font-weight: 500;
background-color: #c8e3f8;
width: 100%;
} }
#quick_settings #form_settings_obvescanje textarea#alert_finish_other_emails:focus { #anketa_edit.glasovanje .anketa_edit_main #glas_settings .header_content {
padding: 2px; padding: 8px 0px 7px 0px;
}
#anketa_edit.glasovanje .anketa_edit_main #glas_settings .header_content .header_left {
color: #1e88e5;
font-size: 16px;
font-weight: 500;
width: auto;
float: left;
padding-left: 10px;
}
#anketa_edit.glasovanje .anketa_edit_main #glas_settings fieldset {
margin: 11px 10px;
padding: 3px 5px;
border: 0; border: 0;
background-color: #ffdda1; border-top: 1px solid #1e88e5;
} }
#anketa_edit.glasovanje .anketa_edit_main #glas_settings legend {
#quick_settings_holder { margin: 0;
padding: 0 10px 0 5px;
background-color: rgba(0, 0, 0, 0);
color: #1e88e5;
font-weight: 500;
}
#anketa_edit.glasovanje .anketa_edit_main #placeholder {
margin: 85px 0 0 20px;
max-width: 1100px;
}
#anketa_edit.glasovanje .anketa_edit_main #placeholder #branching.branching_glasovanje {
padding: 3px;
min-height: 400px;
width: calc(96% - 315px);
}
#anketa_edit.glasovanje .anketa_edit_main #placeholder #branching.branching_glasovanje ul.first {
margin: 1px 0 0 0 !important;
}
#anketa_edit.glasovanje .anketa_edit_main #placeholder #branching.branching_glasovanje ul li {
margin-left: 0px !important;
}
#anketa_edit.glasovanje .anketa_edit_main #placeholder #vprasanje_float_editing {
margin-top: 45px !important;
}
#anketa_edit.glasovanje .anketa_edit_main #quick_settings_holder {
position: absolute; position: absolute;
right: 15px; right: calc(3% + 5px);
top: 235px; margin-left: -5px;
top: 222px;
height: auto; height: auto;
width: 310px; width: 310px;
border: 0; border: 0;
background-color: transparent; background-color: transparent;
} }
#anketa_edit.glasovanje .anketa_edit_main #quick_settings_holder #quick_settings {
padding: 5px 15px;
width: 315px;
box-sizing: border-box;
float: right;
background-color: #f5fafe;
border: 1px solid #c8e3f8;
}
#anketa_edit.glasovanje .anketa_edit_main #quick_settings_holder #quick_settings fieldset {
border: 1px #606060 solid;
}
#anketa_edit.glasovanje .anketa_edit_main #quick_settings_holder #quick_settings .form_bottom_settings {
margin: 0 8px 10px 8px;
padding: 0 0 5px 10px;
background-color: inherit;
}
#anketa_edit.glasovanje .anketa_edit_main #quick_settings_holder #quick_settings #form_settings_obvescanje {
padding: 1px 0 10px 10px;
}
#anketa_edit.glasovanje .anketa_edit_main #quick_settings_holder #quick_settings #form_settings_obvescanje textarea#alert_finish_other_emails:focus {
padding: 2px;
border: 0;
background-color: #ffdda1;
}
/* /*
To change this license header, choose License Headers in Project Properties. To change this license header, choose License Headers in Project Properties.
@ -14161,6 +14164,40 @@ and open the template in the editor.
margin-top: 66px !important; margin-top: 66px !important;
} }
#anketa_edit.forma #quick_settings_holder {
position: absolute;
right: 5%;
top: 235px;
height: auto;
width: 310px;
border: 0;
background-color: transparent;
}
#anketa_edit.forma #quick_settings_holder #quick_settings {
padding: 5px 15px;
width: 315px;
box-sizing: border-box;
float: right;
background-color: #f5fafe;
border: 1px solid #c8e3f8;
}
#anketa_edit.forma #quick_settings_holder #quick_settings fieldset {
border: 1px #606060 solid;
}
#anketa_edit.forma #quick_settings_holder #quick_settings .form_bottom_settings {
margin: 0 8px 10px 8px;
padding: 0 0 5px 10px;
background-color: inherit;
}
#anketa_edit.forma #quick_settings_holder #quick_settings #form_settings_obvescanje {
padding: 1px 0 10px 10px;
}
#anketa_edit.forma #quick_settings_holder #quick_settings #form_settings_obvescanje textarea#alert_finish_other_emails:focus {
padding: 2px;
border: 0;
background-color: #ffdda1;
}
/* /*
To change this license header, choose License Headers in Project Properties. To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates To change this template file, choose Tools | Templates
@ -14424,7 +14461,7 @@ and open the template in the editor.
display: flex; display: flex;
width: 98%; width: 98%;
max-width: 1450px; max-width: 1450px;
margin: 5px 0 0 50px; margin: 5px 0 0 30px;
} }
#branching { #branching {
@ -14891,6 +14928,7 @@ and open the template in the editor.
*/ */
#branching.collapsed { #branching.collapsed {
min-height: 317px; min-height: 317px;
margin-top: 10px;
} }
#branching.collapsed li.spr { #branching.collapsed li.spr {
line-height: 28px; line-height: 28px;
@ -28128,7 +28166,7 @@ and open the template in the editor.
margin: 0px 40px 40px -30px; margin: 0px 40px 40px -30px;
} }
#branching.branching_glasovanje { /*#branching.branching_glasovanje {
max-width: 810px; max-width: 810px;
} }
@ -28139,21 +28177,29 @@ and open the template in the editor.
#quick_settings_holder { #quick_settings_holder {
right: 30px; right: 30px;
} }
#quick_settings_holder.glas_quick_settings { #quick_settings_holder.glas_quick_settings {
right: 30px; right: 30px;
} }*/
} }
@media screen and (-webkit-min-device-pixel-ratio: 0) { @media screen and (-webkit-min-device-pixel-ratio: 0) {
.tabnavigation1 { .tabnavigation1 {
margin: 0px 0px 0px 1px; margin: 0px 0px 0px 1px;
} }
} }
@media all and (min-width: 1550px) {
#toolbox_library {
left: 1200px;
}
#quick_settings_holder {
left: 1162px;
}
}
/*
@media all and (min-width: 1500px) { @media all and (min-width: 1500px) {
#branching.branching_glasovanje { #branching.branching_glasovanje {
max-width: 800px; max-width: 800px;
} }
#toolbox_library { #toolbox_library {
right: 30px; right: 30px;
} }
@ -28161,24 +28207,25 @@ and open the template in the editor.
#quick_settings_holder { #quick_settings_holder {
right: 30px; right: 30px;
} }
#quick_settings_holder.glas_quick_settings { #quick_settings_holder.glas_quick_settings {
right: 30px; right: 30px;
} }
} }
@media all and (min-width: 1580px) { @media all and (min-width: 1580px) {
#toolbox_library { #toolbox_library {
right: 30px; right: 30px;
} }
#quick_settings_holder { #quick_settings_holder {
right: 30px; right: auto;
left: 1180px;
} }
#quick_settings_holder.glas_quick_settings { #quick_settings_holder.glas_quick_settings {
right: 30px; right: 30px;
} }
} }
@media all and (min-width: 1618px) { @media all and (min-width: 1618px) {
#branching.branching_glasovanje { #branching.branching_glasovanje {
max-width: 815px; max-width: 815px;
@ -28191,14 +28238,13 @@ and open the template in the editor.
#quick_settings_holder { #quick_settings_holder {
right: auto; right: auto;
left: 1180px; left: 1182px;
} }
#quick_settings_holder.glas_quick_settings { #quick_settings_holder.glas_quick_settings {
right: auto; right: auto;
left: 1180px; left: 1182px;
}
} }
}*/
@media print { @media print {
.no-print { .no-print {
display: none !important; display: none !important;

2
resources/sass/admin/branching/branching_collapsed.scss
View File

@ -10,6 +10,8 @@ and open the template in the editor.
#branching.collapsed { #branching.collapsed {
min-height: 317px; min-height: 317px;
margin-top: 10px;
li.spr { li.spr {
line-height: 28px; line-height: 28px;
&:hover { &:hover {

2
resources/sass/admin/branching/branching_expanded.scss
View File

@ -18,7 +18,7 @@ $if_background: $soft_blue_lighten;
width: 98%; width: 98%;
max-width: 1450px; max-width: 1450px;
margin: 5px 0 0 50px; margin: 5px 0 0 30px;
} }
#branching { #branching {

46
resources/sass/admin/branching/form.scss
View File

@ -21,3 +21,49 @@ and open the template in the editor.
margin-top: 66px !important; margin-top: 66px !important;
} }
} }
#anketa_edit.forma {
#quick_settings_holder{
position: absolute;
right: 5%;
top: 235px;
height: auto;
width: 310px;
border: 0;
background-color: transparent;
#quick_settings{
padding: 5px 15px;
width: 315px;
box-sizing: border-box;
float: right;
background-color: $soft_blue_very_lighten;
border: 1px solid $soft_blue;
fieldset {
border: 1px $grey_dark solid;
}
.form_bottom_settings {
margin: 0 8px 10px 8px;
padding: 0 0 5px 10px;
background-color: inherit;
}
#form_settings_obvescanje {
padding: 1px 0 10px 10px;
textarea#alert_finish_other_emails {
&:focus {
padding: 2px;
border: 0;
background-color: $orange_very_lighten;
}
}
}
}
}
}

119
resources/sass/admin/branching/voting.scss
View File

@ -8,10 +8,46 @@ and open the template in the editor.
Author : podkrizniku Author : podkrizniku
*/ */
#glas_settings {
.nastavitveSpan4 {
display: table-cell;
float: left; float: left;
font-weight: 500;
width: 55%;
clear: both;
}
.nastavitveSpan5 {
display: table-cell;
float: left;
font-weight: 500;
width: 25%;
clear: both;
}
select#skin_anketa {
max-width: 120px;
margin-bottom: 2px;
}
select#skin {
max-width: 120px;
margin: 4px 0 2px 0;
}
#quick_settings {
}
#anketa_edit.glasovanje {
.anketa_edit_main{
display: flex;
/* Leve nastavitve */
#glas_settings {
width: 330px; width: 330px;
margin: 57px 0 10px 15px; margin: 20px 0 0 0;
padding: 0; padding: 0;
line-height: 18px; line-height: 18px;
@ -64,14 +100,15 @@ and open the template in the editor.
} }
} }
#branching.branching_glasovanje { /* Srednji del */
position: absolute; #placeholder{
left: 377px !important; margin: 85px 0 0 20px;
right: 322px !important; max-width: 1100px;
#branching.branching_glasovanje {
padding: 3px; padding: 3px;
min-height: 400px; min-height: 400px;
max-width: 848px; width: calc(96% - 315px);
ul.first { ul.first {
margin: 1px 0 0 0 !important; margin: 1px 0 0 0 !important;
@ -83,47 +120,42 @@ and open the template in the editor.
} }
} }
#quick_settings_holder.glas_quick_settings { #vprasanje_float_editing{
margin-top: 35px; margin-top: 45px !important;
top: 190px !important; }
} }
.nastavitveSpan4 {
display: table-cell; /* Desne nastavitve */
float: left; #quick_settings_holder{
font-weight: 500; position: absolute;
width: 55%; right: calc(3% + 5px);
clear: both; margin-left: -5px;
} top: 222px;
.nastavitveSpan5 { height: auto;
display: table-cell; width: 310px;
float: left; border: 0;
font-weight: 500; background-color: transparent;
width: 25%;
clear: both;
}
select#skin_anketa {
max-width: 120px;
margin-bottom: 2px;
}
select#skin {
max-width: 120px;
margin: 4px 0 2px 0;
}
#quick_settings{ #quick_settings{
padding: 5px 15px;
width: 315px;
box-sizing: border-box;
float: right;
background-color: $soft_blue_very_lighten;
border: 1px solid $soft_blue;
fieldset { fieldset {
border: 1px $grey_dark solid; border: 1px $grey_dark solid;
} }
float: right;
padding: 0 10px 0 10px;
width: 290px;
background-color: $soft_blue_very_lighten;
border: 1px solid $soft_blue;
.form_bottom_settings { .form_bottom_settings {
margin: 0 8px 10px 8px; margin: 0 8px 10px 8px;
padding: 0 0 5px 10px; padding: 0 0 5px 10px;
background-color: inherit; background-color: inherit;
} }
#form_settings_obvescanje { #form_settings_obvescanje {
padding: 1px 0 10px 10px; padding: 1px 0 10px 10px;
textarea#alert_finish_other_emails { textarea#alert_finish_other_emails {
@ -135,12 +167,9 @@ select#skin {
} }
} }
} }
#quick_settings_holder { }
position: absolute; }
right: 15px;
top: 235px;
height: auto;
width: 310px;
border: 0;
background-color: transparent;
} }

63
resources/sass/admin/media.scss
View File

@ -16,20 +16,6 @@ and open the template in the editor.
margin: 0px 40px 40px -30px; margin: 0px 40px 40px -30px;
} }
} }
#branching.branching_glasovanje {
max-width: 810px;
}
#toolbox_library {
right: 30px;
}
#quick_settings_holder {
right: 30px;
}
#quick_settings_holder.glas_quick_settings {
right: 30px;
}
} }
@media screen and (-webkit-min-device-pixel-ratio:0) { @media screen and (-webkit-min-device-pixel-ratio:0) {
@ -38,54 +24,17 @@ and open the template in the editor.
} }
} }
@media all and (min-width: 1500px) {
#branching.branching_glasovanje {
max-width: 800px;
}
#toolbox_library {
right: 30px;
}
#quick_settings_holder { @media all and (min-width: 1550px) {
right: 30px;
}
#quick_settings_holder.glas_quick_settings {
right: 30px;
}
}
@media all and (min-width: 1580px) {
#toolbox_library {
right: 30px;
}
#quick_settings_holder {
right: 30px;
}
#quick_settings_holder.glas_quick_settings {
right: 30px;
}
}
@media all and (min-width: 1618px) {
#branching.branching_glasovanje {
max-width: 815px;
}
#toolbox_library{ #toolbox_library{
right: auto; left: 1200px;
left: 1180px; }
#quick_settings_holder {
left: 1162px;
}
} }
#quick_settings_holder {
right: auto;
left: 1180px;
}
#quick_settings_holder.glas_quick_settings {
right: auto;
left: 1180px;
}
}
@media print { @media print {
.no-print { .no-print {