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:
pero1203 2022-07-28 12:03:51 +02:00
commit ef3f468562
11 changed files with 90 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/survey/classes/class.GDPR.php
View File

@ -339,15 +339,15 @@ class GDPR{
echo '<div class="gdpr_authority_info_data">';
if($authority['name'] != '')
echo '<span class="bold">'.$authority['name'].'</span><br />';
echo '<span class="authority_name">'.$authority['name'].'</span><br />';
if($authority['title'] != '')
echo '<span>'.$authority['title'].'</span><br />';
if($authority['email'] != '')
echo '<span class="spaceLeft">'.$lang['srv_gdpr_user_settings_email'].': '.$authority['email'].'</span><br />';
echo '<span class="spaceLeft">'.$lang['srv_gdpr_user_settings_email'].': <div class="bold" > '.$authority['email'].'</div></span>';
if($authority['phone'] != '')
echo '<span class="spaceLeft">'.$lang['srv_gdpr_user_settings_phone'].': '.$authority['phone'].'</span><br />';
echo '<span class="spaceLeft">'.$lang['srv_gdpr_user_settings_phone'].': <div class="bold" > '.$authority['phone'].'</div></span>';
if($authority['fax'] != '')
echo '<span class="spaceLeft">Fax: '.$authority['fax'].'</span><br />';
echo '<span class="spaceLeft">Fax: <div class="bold" > '.$authority['fax'].'</div></span><br />';
echo '</div>';
}

56
admin/survey/classes/class.SurveyTheme.php
View File

@ -371,17 +371,23 @@ class SurveyTheme {
//Gumbi
echo '<div class="options">';
//Predogled
echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">';
echo '<span class="faicon fa-desktop"></span>';
echo $lang['srv_poglejanketo2'];
echo '</div>';
echo '<img src="\public\img\icons\dots.svg">';
//Prilagodi
echo '<div class="button" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>';
echo $lang['srv_te_theme_edit'];
echo '</div>';
echo '<div class= "buttons-window active">';
//Predogled
echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">';
echo '<span class="faicon fa-desktop"></span>';
echo $lang['srv_poglejanketo2'];
echo '</div>';
//Prilagodi
echo '<div class="button" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>';
echo $lang['srv_te_theme_edit'];
echo '</div>';
echo '</div>';
echo '</div>';
@ -417,17 +423,23 @@ class SurveyTheme {
//Gumbi
echo '<div class="options">';
//Predogled
echo '<div class="button theme_links_preview" src="'.$preview_link_mobile.'" title="'.$lang['srv_poglejanketo2'].'">';
echo '<span class="faicon fa-desktop"></span>';
echo $lang['srv_poglejanketo2'];
echo '</div>';
echo '<img src="\public\img\icons\dots.svg">';
//Prilagodi
echo '<div class="button" onclick="window.location.href='.$modify_link_mobile.'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>';
echo $lang['srv_te_theme_edit'];
echo '</div>';
echo '<div class= "buttons-window active">';
//Predogled
echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">';
echo '<span class="faicon fa-desktop"></span>';
echo $lang['srv_poglejanketo2'];
echo '</div>';
//Prilagodi
echo '<div class="button" onclick="window.location.href='.$modify_link.'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>';
echo $lang['srv_te_theme_edit'];
echo '</div>';
echo '</div>';
echo '</div>';
@ -581,6 +593,8 @@ class SurveyTheme {
//Gumbi
echo '<div class="options">';
echo '<img src="\public\img\icons\dots.svg">';
//Aktiviraj
echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
echo '<span class="faicon fa-hand-pointer"></span>';
@ -633,6 +647,8 @@ class SurveyTheme {
//Gumbi
echo '<div class="options">';
echo '<img src="\public\img\icons\dots.svg">';
//Aktiviraj
echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true, true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
echo '<span class="faicon fa-hand-pointer"></span>';

1
frontend/simple/css/aai.css
View File

@ -847,7 +847,6 @@ input[type=button]:hover,
display: flex;
flex-direction: row;
flex-wrap: wrap;
padding: 0px 20px;
}
footer .footer_content h2 {
padding-top: 12px;

23
public/css/admin_new.css
View File

@ -5117,7 +5117,7 @@ p, span {
}
.bold {
font-weight: 400;
font-weight: 800;
}
.semi-bold {
@ -9816,6 +9816,17 @@ fieldset {
margin-inline-end: 0;
border: 1px solid #E5E5E5;
}
fieldset .bold {
font-weight: 400;
color: #1E88E5;
text-decoration: underline;
}
fieldset .spaceLeft {
display: flex;
}
fieldset .authority_name {
font-weight: 800;
}
fieldset legend {
padding: 0 15px;
font-size: 16px;
@ -20692,6 +20703,12 @@ div.page_tema div.theme_list div.theme span.desc {
div.page_tema div.theme_list div.options {
display: flex;
flex-direction: row;
position: relative;
}
div.page_tema div.theme_list div.options div.buttons-window {
position: absolute;
bottom: 12px;
max-width: 113px;
}
div.page_tema div.theme_list div.options div.button {
background: #FFFFFF;
@ -20699,7 +20716,7 @@ div.page_tema div.theme_list div.options div.button {
box-sizing: border-box;
border-radius: 2px;
height: 28px;
width: fit-content;
width: 100%;
display: flex;
align-items: center;
padding: 7px 12px;
@ -27978,7 +27995,7 @@ and open the template in the editor.
.setting_horizontal_wrapper {
display: flex;
flex-direction: row;
margin-bottom: 16px;
margin-bottom: 0px;
}
.setting_horizontal_wrapper .setting_holder {
margin-right: 32px;

3
public/img/icons/dots.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="14" height="4" viewBox="0 0 14 4" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10.25 2C10.25 1.03344 11.0344 0.25 12 0.249999C12.9656 0.249999 13.75 1.03344 13.75 2C13.75 2.96656 12.9656 3.75 12 3.75C11.0344 3.75 10.25 2.96656 10.25 2ZM5.25 2C5.25 1.03344 6.03438 0.25 7 0.25C7.96562 0.25 8.75 1.03344 8.75 2C8.75 2.96656 7.96562 3.75 7 3.75C6.03438 3.75 5.25 2.96656 5.25 2ZM3.75 2C3.75 2.96656 2.96563 3.75 2 3.75C1.03344 3.75 0.25 2.96656 0.25 2C0.25 1.03344 1.03344 0.25 2 0.25C2.96562 0.25 3.75 1.03344 3.75 2Z" fill="#1E88E5"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 566 B

2
resources/sass/admin_new/basic/typography.scss
View File

@ -62,7 +62,7 @@ p,span {
}
.bold {
font-weight: $regular;
font-weight: $extra-bold;
}
.semi-bold {

15
resources/sass/admin_new/components/form/fieldset.scss
View File

@ -8,6 +8,21 @@ fieldset{
border: 1px solid $gray;
.bold{
font-weight: 400;
color: #1E88E5;
text-decoration: underline;
}
.spaceLeft{
display: flex;
}
.authority_name{
font-weight: $extra-bold;
}
legend{
padding: 0 15px;

1
resources/sass/admin_new/pages/settings/uporabniki.scss
View File

@ -113,6 +113,7 @@ div.subpage_uporabniki {
.setting_holder {
margin-bottom: 16px;
&:last-of-type {
margin-bottom: 0;
}

2
resources/sass/admin_new/pages/survey_data/popups/calculations.scss
View File

@ -2,7 +2,7 @@
.setting_horizontal_wrapper {
display: flex;
flex-direction: row;
margin-bottom: 16px;
margin-bottom: 0px;
.setting_holder {
margin-right: 32px;

9
resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
View File

@ -59,6 +59,13 @@ div.page_tema {
div.options {
display: flex;
flex-direction: row;
position: relative;
div.buttons-window{
position: absolute;
bottom: 12px;
max-width: 113px;
}
div.button {
background: $white;
@ -67,7 +74,7 @@ div.page_tema {
border-radius: 2px;
height: 28px;
width: fit-content;
width: 100%;
display: flex;
align-items: center;

2
resources/sass/frontend_simple/aai.scss
View File

@ -1031,7 +1031,7 @@ input[type=button],
flex-direction: row;
flex-wrap: wrap;
padding: 0px 20px;
// padding: 0px 20px;
h2 {
padding-top: 12px;