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:
tejagerjovic 2022-08-26 10:45:16 +02:00
commit 78fb906b56
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -785,7 +785,7 @@ class SurveyTheme {
// Ime teme
echo "<link href='https://fonts.googleapis.com/css?family=Roboto' rel='stylesheet'>";
echo '<span class="theme_name">';
echo self::strip_name($simple_name.($simple_name=='1kaBlue' || $simple_name=='MobileBlue' ? ' ('.$lang['default'].')' : ''));
echo self::strip_name($simple_name.($simple_name=='1kaBlue' || $simple_name=='MobileBlue' ? '<div class="privzeto"> ('.$lang['default'].') </div>' : ''));
// Vprasajcki
if( in_array($simple_name, array('Fdv', 'Cdi', 'Uni', 'MobileFdv', 'MobileCdi', 'MobileUni')) ){
@ -799,11 +799,6 @@ class SurveyTheme {
echo ' (CSS)';
echo '</span>';
// Predogled
echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
echo ' <span class="faicon fa-desktop"></span>';
echo '</div>';
// Prilagodi - samo ce je tema aktivna
if($is_current_skin || $is_current_mobile_skin){
@ -816,6 +811,13 @@ class SurveyTheme {
echo ' <span class="faicon palette"></span>';
echo '</div>';
}
// Predogled
echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
echo ' <span class="faicon fa-desktop"></span>';
echo '</div>';
echo '</div>';

10
public/css/admin_new.css
View File

@ -10183,7 +10183,7 @@ div .table-horizontal-scroll-wrapper2 table {
text-align: center;
color: #333333;
position: relative;
margin: 4px 0px;
padding: 4px 16px;
}
#anketa_edit .table_header {
width: 100%;
@ -20993,7 +20993,7 @@ div.page_tema div.theme_list div.options div.button:last-child {
margin-right: 0px;
}
div.page_tema div.theme_list div.options div.button span.faicon {
margin-right: 10px;
margin-right: 8px;
color: #1E88E5;
background-color: unset;
}
@ -21083,6 +21083,10 @@ div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_l
display: flex;
align-items: center;
}
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options span.theme_name .privzeto {
text-transform: capitalize;
margin-left: 5px;
}
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options div.button {
background: #FFFFFF;
border: 1px solid #E5E5E5;
@ -21101,6 +21105,8 @@ 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_options div.button span.faicon {
margin: 0;
color: #1E88E5;
width: 14px;
height: 14px;
}
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options div.button span.faicon:hover {
color: #0059AB;

2
resources/sass/admin_new/components/table/table.scss
View File

@ -131,7 +131,7 @@ div {
color: #333333;
position: relative;
margin: 4px 0px;
padding: 4px 16px;
}

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

@ -146,7 +146,7 @@ div.page_tema {
cursor: pointer;
span.faicon {
margin-right: 10px;
margin-right: 8px;
color: $blue;
background-color: unset;
}
@ -259,6 +259,10 @@ div.page_tema {
display: flex;
align-items: center;
.privzeto{
text-transform: capitalize;
margin-left: 5px;
}
}
@ -285,6 +289,8 @@ div.page_tema {
span.faicon {
margin: 0;
color: $blue;
width: 14px;
height: 14px;
}
span.faicon:hover{
color: #0059AB;