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

Redesign - nova verzija headerja

Browse Source
This commit is contained in:
pero1203 2022-03-15 09:38:53 +01:00
parent 2aa855bdaf
commit 33f2030c1f
4 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/survey/SurveyAdmin.php
View File

@ -653,7 +653,7 @@ class SurveyAdmin
// Search po zunanji lupini - preusmeri na drupalov search // Search po zunanji lupini - preusmeri na drupalov search
echo '<div id="search_holder">'; echo '<div id="search_holder" class="setting_box">';
if($lang['id'] != "1") if($lang['id'] != "1")
$drupal_search_url = 'https://www.1ka.si/d/en/iskanje/'; $drupal_search_url = 'https://www.1ka.si/d/en/iskanje/';
@ -676,10 +676,10 @@ class SurveyAdmin
// Hitra pomoč - povezave na linke s pomočjo na www.1ka.si // Hitra pomoč - povezave na linke s pomočjo na www.1ka.si
$subdomain = ($lang['id'] == "1") ? 'www' : 'english'; $subdomain = ($lang['id'] == "1") ? 'www' : 'english';
$help_url = Common::getHelpUrl($subdomain, $this->first_action); $help_url = Common::getHelpUrl($subdomain, $this->first_action);
echo '<div id="help_holder">'; echo '<div id="help_holder" class="setting_box">';
echo ' <a href="' . $help_url . '" title="' . $lang['srv_settings_help'] . '" target="_blank">'; echo ' <a href="' . $help_url . '" title="' . $lang['srv_settings_help'] . '" target="_blank">';
echo '<span class="faicon help2"></span>'; echo ' <span class="faicon help2"></span>';
echo '</a> '; echo ' </a> ';
echo '</div>'; echo '</div>';

45
public/css/admin_new.css
View File

@ -6058,20 +6058,24 @@ and open the template in the editor.
Author : Peter Hrvatin Author : Peter Hrvatin
*/ */
/* NAPREDNI MODULI */ /* NAPREDNI MODULI */
.navigation_modules a {
text-decoration: none !important;
}
span.module_icon { span.module_icon {
display: flex; display: flex;
align-items: center; align-items: center;
height: 25px; height: 24px;
padding: 0 8px; padding: 0 8px;
color: white; color: #FFFFFF;
font-weight: 600; font-weight: 700;
font-size: 16px; font-size: 16px;
background-color: transparent; background-color: #0059ab;
border: 1px #FFFFFF solid; border-radius: 2px;
text-decoration: none !important; transition: 0.2s;
} }
span.module_icon::before { span.module_icon::before {
line-height: 25px; line-height: 20px;
} }
span.module_icon.maza::before { span.module_icon.maza::before {
content: "MAZA"; content: "MAZA";
@ -6152,21 +6156,16 @@ span.module_icon.mju::before {
content: "MJU"; content: "MJU";
} }
span.module_icon.gdpr { span.module_icon.gdpr {
color: #E5E5E5; color: #1E88E5;
background-color: #1E88E5;
border: 1px #FFFFFF solid;
} }
span.module_icon.gdpr:hover { span.module_icon.gdpr:hover {
color: #FFFFFF; color: #FFFFFF;
} }
span.module_icon.gdpr.active { span.module_icon.gdpr.active {
color: white; color: #FFFFFF;
background-color: #1E88E5;
border: 1px #FFFFFF solid;
} }
span.module_icon.gdpr.active:hover { span.module_icon.gdpr.active:hover {
color: white; color: white;
border: 1px #FFFFFF solid;
} }
span.module_icon.gdpr::before { span.module_icon.gdpr::before {
content: "GDPR"; content: "GDPR";
@ -7972,6 +7971,7 @@ header #top_line .setting_box {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
height: 28px; height: 28px;
min-width: 28px;
margin-left: 8px; margin-left: 8px;
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
box-sizing: border-box; box-sizing: border-box;
@ -8140,8 +8140,8 @@ header #top_line #enka_nav {
position: absolute; position: absolute;
right: 32px; right: 32px;
} }
header #top_line #enka_nav div { header #top_line #enka_nav #search_holder {
margin-left: 24px; margin-left: 16px;
} }
header #top_line #enka_nav #search_holder form { header #top_line #enka_nav #search_holder form {
display: flex; display: flex;
@ -8150,9 +8150,12 @@ header #top_line #enka_nav #search_holder form {
header #top_line #enka_nav #search_holder input#searchSurvey { header #top_line #enka_nav #search_holder input#searchSurvey {
display: none; display: none;
width: 150px; width: 150px;
padding: 3px 0 3px 5px; padding: 4px 0 3px 5px;
margin: -3px 0 0 5px; margin: 0;
border: 1px solid #1E88E5; border: 0;
}
header #top_line #enka_nav #help_holder {
margin-left: 8px;
} }
header #top_line span.sprites.mail_unread { header #top_line span.sprites.mail_unread {
color: #FFFFFF; color: #FFFFFF;
@ -8165,7 +8168,7 @@ header #top_line span.sprites.mail_unread {
header #top_line #xtradiv { header #top_line #xtradiv {
display: inline-block; display: inline-block;
width: auto; width: auto;
margin-left: 15px; margin-left: 16px;
vertical-align: middle; vertical-align: middle;
} }
header #top_line #xtradiv .xtraname { header #top_line #xtradiv .xtraname {
@ -8173,7 +8176,7 @@ header #top_line #xtradiv .xtraname {
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
width: auto; width: auto;
font-weight: 500; font-weight: 400;
color: #1E88E5; color: #1E88E5;
} }
header #top_line #xtradiv .xtraname:hover { header #top_line #xtradiv .xtraname:hover {

33
resources/sass/admin_new/basic/icons/modules.scss
View File

@ -10,23 +10,31 @@ and open the template in the editor.
/* NAPREDNI MODULI */ /* NAPREDNI MODULI */
.navigation_modules{
a{
text-decoration: none !important;
}
}
span.module_icon{ span.module_icon{
display: flex; display: flex;
align-items: center; align-items: center;
height: 25px; height: 24px;
padding: 0 8px; padding: 0 8px;
color: white; color: $white;
font-weight: 600; font-weight: 700;
font-size: 16px; font-size: 16px;
background-color: transparent; background-color: $dark-blue;
border: 1px $white solid; border-radius: 2px;
text-decoration: none !important;
transition: 0.2s;
&::before{ &::before{
line-height: 25px; line-height: 20px;
} }
&.maza::before{ &.maza::before{
@ -110,22 +118,17 @@ span.module_icon{
} }
&.gdpr{ &.gdpr{
color: $gray; color: $blue;
background-color: $blue;
border: 1px $white solid;
&:hover{ &:hover{
color: $white; color: $white;
} }
&.active{ &.active{
color: white; color: $white;
background-color: $blue;
border: 1px $white solid;
&:hover{ &:hover{
color: white; color: white;
border: 1px $white solid;
} }
} }

18
resources/sass/admin_new/components/header/top_line.scss
View File

@ -44,6 +44,7 @@ header #top_line{
justify-content: center; justify-content: center;
height: 28px; height: 28px;
min-width: 28px;
margin-left: 8px; margin-left: 8px;
border: 1px solid $gray; border: 1px solid $gray;
@ -287,11 +288,8 @@ header #top_line{
position: absolute; position: absolute;
right: 32px; right: 32px;
div{
margin-left: 24px;
}
#search_holder { #search_holder {
margin-left: 16px;
form{ form{
display: flex; display: flex;
@ -301,13 +299,13 @@ header #top_line{
input#searchSurvey { input#searchSurvey {
display: none; display: none;
width: 150px; width: 150px;
padding: 3px 0 3px 5px; padding: 4px 0 3px 5px;
margin: -3px 0 0 5px; margin: 0;
border: 1px solid $blue; border: 0;
} }
} }
#help_holder { #help_holder {
margin-left: 8px;
} }
#fieldwork_holder { #fieldwork_holder {
@ -327,7 +325,7 @@ header #top_line{
#xtradiv { #xtradiv {
display: inline-block; display: inline-block;
width: auto; width: auto;
margin-left: 15px; margin-left: 16px;
vertical-align: middle; vertical-align: middle;
.xtraname { .xtraname {
@ -337,7 +335,7 @@ header #top_line{
cursor: pointer; cursor: pointer;
width: auto; width: auto;
font-weight: 500; font-weight: 400;
color: $blue; color: $blue;
&:hover{ &:hover{