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 
# Conflicts:
#	public/css/admin_new.css
This commit is contained in:
pero1203 2022-08-19 12:06:56 +02:00
commit 38e0ce555a
3 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,6 +179,7 @@ class SurveyTheme {
$groupId = 0;
echo '<div class="themes-content">';
echo '<script src="https://kit.fontawesome.com/c5e58c7f60.js" crossorigin="anonymous"></script>';
echo '<div id="div_theme_groups">';
$this->displayGroupSelector($groupId);
@ -372,7 +373,10 @@ class SurveyTheme {
echo '<script src="/admin/survey/script/urejanje_oblika.js"> </script>';
echo '<div class="options option1" >';
echo '<button id="btn-1" onclick="teme_options()"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button id="btn-1" class="faicon dots" onclick="teme_options()"> ';
// echo '<img src="\public\img\icons\dots.svg">';
echo '<i class="fa-solid fa-ellipsis"></i>';
echo ' </button>';
echo '<div class= "buttons-window displayNone buttons-window1" id="buttons-window1">';
@ -424,7 +428,7 @@ class SurveyTheme {
//Gumbi
echo '<div class="options">';
echo '<button id="btn-2" onclick="teme_options2()"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button id="btn-2" onclick="teme_options2()"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "buttons-window displayNone " id="buttons-window2">';
@ -600,7 +604,7 @@ class SurveyTheme {
echo '<div class="options options'.$row['id'].'" id="options'.$row['id'].'">';
echo '<button onclick="show_settings(\''.$row['id'].'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings(\''.$row['id'].'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class="buttons-window displayNone" id="additional_settings_'.$row['id'].'">';
@ -660,7 +664,7 @@ class SurveyTheme {
//Gumbi
echo '<div class="options options_mobile'.$row['id'].'" id="options'.$row['id'].'">';
echo '<button onclick="show_settings_mobile(\''.$row['id'].'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_mobile(\''.$row['id'].'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class="buttons-window" id="additional_settings_mobile_'.$row['id'].'">';

13
public/css/admin_new.css
View File

@ -20970,6 +20970,13 @@ textarea#addusers, textarea#addusers_note {
display: none;
}
i {
font-size: 16px;
font-weight: 600;
color: #1e88e5;
vertical-align: bottom;
}
div.page_tema h2 {
font-size: 24px;
margin-top: 32px;
@ -21134,7 +21141,7 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l
}
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_content span.theme_name {
font-weight: 600;
font-weight: 500;
font-weight: 600;
}
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options {
display: flex;
@ -21144,9 +21151,9 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l
margin-bottom: 16px;
}
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options span.theme_name {
font-weight: 500;
font-weight: 600;
text-transform: uppercase;
font-size: 14px;
font-size: 16px;
display: flex;
align-items: center;
}

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

@ -2,6 +2,14 @@
display: none;
}
i{
font-size: 16px;
font-weight: 600;
color: #1e88e5;
vertical-align: bottom;
}
// Oblika - prva stran, meni s temami
@ -228,7 +236,7 @@ div.page_tema {
font-weight: $semi-bold;
// font-family: 'Roboto';
font-weight: 500;
font-weight: 600;
}
@ -242,10 +250,9 @@ div.page_tema {
margin-bottom: 16px;
span.theme_name {
font-weight: 500;
font-weight: 600;
text-transform: uppercase;
// font-family: 'Roboto';
font-size: 14px;
font-size: 16px;
display: flex;
align-items: center;