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:
Robert 2022-11-04 08:37:38 +01:00
commit 15837b807e
3 changed files with 1559 additions and 1545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/SurveyAdmin.php
View File

@ -3295,7 +3295,7 @@ class SurveyAdmin
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TEMA . '" title="' . $lang['srv_themes'] . '">' . $lang['srv_themes'] . '</a></li> ';
# jezik
echo '<li ' . ($get == A_PREVAJANJE ? 'class="active"' : '') . '>';
echo '<li id="jezik" ' . ($get == A_PREVAJANJE ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_PREVAJANJE . '" title="' . $lang['lang'] . '">' . $lang['lang'] . '</a></li> ';
# arhivi

3057
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

45
resources/sass/admin_new/components/payments/payments.scss
View File

@ -41,6 +41,7 @@ header #top_line #enka_nav .anketa_header_upgrade_package {
position: absolute;
color: $yellow;
font-weight: 600;
font-size: 12px;
right: 14.68px;
top: 12px;
@ -58,6 +59,7 @@ header #top_line #enka_nav .anketa_header_upgrade_package {
position: absolute;
color: $yellow;
font-weight: 600;
font-size: 12px;
right: 14.68px;
top: 12px;
}
@ -157,6 +159,7 @@ header #top_line #enka_nav .anketa_header_upgrade_package {
position: absolute;
color: $yellow;
font-weight: 900;
font-size: 12px;
right: 4px;
top: 4px;
}
@ -182,6 +185,7 @@ header #top_line #enka_nav .anketa_header_upgrade_package {
content: '\f023';
font-family: $fontawesome;
font-weight: 900;
font-size: 12px;
color: $yellow;
top: 8px;
right: 8px;
@ -226,12 +230,16 @@ header #top_line #enka_nav .anketa_header_upgrade_package {
border-radius: 2px;
box-sizing: border-box;
/* &.dostop_1ka {
color: $dark-gray !important;
}
*/
&:after{
position: absolute;
content: '\f023';
font-family: $fontawesome;
font-weight: 900;
font-size: 12px;
color: $yellow;
top: 8px;
right: 8px;
@ -239,11 +247,46 @@ header #top_line #enka_nav .anketa_header_upgrade_package {
}
.dostop_1ka{
color: $dark-gray !important;
}
.menu_left-list.user_access_locked{
position: relative;
display: block;
width: 100%;
padding: 8px !important;
}
.user_access_locked #jezik{
a{
position: relative;
/* left: 8px; */
width: 100%;
left: -8px;
height: 22px;
/* margin-left: -8px; */
padding-left: 8px;
display: block;
color: $dark-gray;
background-color: rgba(255, 248, 228, 0.4);
border: 1px solid #FFC700;
border-radius: 2px;
box-sizing: border-box;
&:after{
position: absolute;
content: '\f023';
font-family: $fontawesome;
font-weight: 600;
font-size: 12px;
color: $yellow;
right: 8px;
}
}
}
.menu_left-list.user_access_locked.locked{