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

Redesign - popravki headerja

Browse Source
This commit is contained in:
pero1203 2021-12-14 11:58:50 +01:00
parent d6792b802d
commit d55bd2b0e4
11 changed files with 1903 additions and 1794 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

255
admin/survey/SurveyAdmin.php
View File

@ -685,7 +685,7 @@ class SurveyAdmin
$text = $row['name'] . ' ' . $row['surname'];
$text = (strlen($text) > 25) ? substr($text, 0, 25) . '...' : $text;
echo '<div id="xtradiv"><strong class="xtraname">'.$text.' <span class="faicon after sort_down_arrow"/></strong>';
echo '<div id="xtradiv"><strong class="xtraname">'.$text.' <span class="faicon arrow2_d small" /></strong>';
echo '<div id="xtradivSettings">';
echo '<span class="xtraSetting"><a class="xtra" href="' . $site_url . 'admin/survey/index.php?a=nastavitve&m=global_user_myProfile"><span class="faicon user"></span>' . $lang['edit_data'] . '</a></span>';
@ -790,13 +790,13 @@ class SurveyAdmin
echo '<div class="anketa_header_quick_settings">';
if ($hierarhija_type == 10) {
echo ' <a href="#" title="' . $lang['srv_survey_settings'] . '" style="padding: 0 5px;cursor:text !important;">';
echo '<span class="faicon wheel_32 icon-orange_hover_red" style="margin-bottom:1px;"></span>';
echo ' <a href="#" title="' . $lang['srv_survey_settings'] . '" style="cursor:text !important;">';
echo '<span class="faicon wheel_32"></span>';
echo '</a> ';
}
else {
echo ' <a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&a=nastavitve" title="' . $lang['srv_survey_settings'] . '" style="padding: 0 5px;">';
echo '<span class="faicon wheel_32 icon-orange_hover_red" style="margin-bottom:1px;"></span>';
echo ' <a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&a=nastavitve" title="' . $lang['srv_survey_settings'] . '">';
echo '<span class="faicon wheel_32"></span>';
echo '</a> ';
}
@ -914,19 +914,7 @@ class SurveyAdmin
echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_REPORTI . '" title="' . $lang['srv_navigation_status'] . '">';
echo '<div id="status_link_' . $css_status . '">';
if ($d->checkDostopSub('dashboard')) {
echo '<span id="baseSurveyInfoImg" class="tooltip anketa_img_nav">';
echo '<span class="faicon info icon-inline '.($css_status == 'on' ? 'icon-orange' : 'icon-white').'"></span>';
echo '<span class="expanded-tooltip bottom light">';
echo '<span id="surveyInfo_msg"></span>';
echo '<span class="arrow"></span>';
echo '</span>'; // expanded-tooltip bottom
echo '</span>';
}
echo '<span class="status_link">' . $lang['srv_navigation_status'] . '</span>';
echo ' <span class="status_link">' . $lang['srv_navigation_status'] . '</span>';
echo '</div>';
if ($d->checkDostopSub('dashboard'))
@ -1021,112 +1009,8 @@ class SurveyAdmin
echo '</ol>';
$d = new Dostop();
if ($d->checkDostopAktiven()) {
echo '<ol class="quick_settings' . ($this->isAnketar == true ? ' displayNone' : '') . '">';
# Komentarji
SurveySetting::getInstance()->Init($this->anketa);
$survey_comment = SurveySetting::getInstance()->getSurveyMiscSetting('survey_comment');
$question_comment = SurveySetting::getInstance()->getSurveyMiscSetting('question_comment');
$question_note_view = SurveySetting::getInstance()->getSurveyMiscSetting('question_note_view');
$question_resp_comment = SurveySetting::getInstance()->getSurveyMiscSetting('question_resp_comment');
$sas = new SurveyAdminSettings();
// V kolikor je vklopljena hierarhija in imamo gor splošne uporabnike, potem nastavitev ne prikazujemo
$hierarhija_prikaz = true;
if(SurveyInfo::getInstance()->checkSurveyModule('hierarhija') && $hierarhija_type == 10)
$hierarhija_prikaz = false;
#ikonco za komentarje prikazujemo po potrebi
if ($this->survey_type > 1 && $hierarhija_prikaz) {
global $global_user_id;
$userAccess = UserAccess::getInstance($global_user_id);
if ($survey_comment != '' || $question_comment != '' || /*$question_note_view != '' ||*/
$question_resp_comment == 1 || $sas->testiranje_komentarji_komentarji_na_vprasanje(false) > 0
) {
echo '<li>';
echo '<div id="quick_comments_link" class="newCss">';
if($userAccess->checkUserAccess('komentarji')){
if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0)
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments_num icon-orange fa-stack-1x" title="' . $lang['srv_view_comment'] . '"><strong class="fa-stack-1x">' . $sas->testiranje_komentarji_komentarji_na_vprasanje() . '</strong></span></div></a>';
else
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments fa-stack-1x icon-orange" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
}
else{
if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0)
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='. $row['id'].'&a=urejanje" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments_num icon-orange fa-stack-1x user_access_locked" title="' . $lang['srv_view_comment'] . '"><strong class="fa-stack-1x">' . $sas->testiranje_komentarji_komentarji_na_vprasanje() . '</strong></span></div></a>';
else
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=urejanje" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments fa-stack-1x icon-orange user_access_locked" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
}
echo '</div>';
echo '</li>';
}
// ce ni komentarjev, potem prikazemo link do nastavitev komentarjev
else {
echo '<li>';
echo '<div id="quick_comments_link" class="newCss">';
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
if($userAccess->checkUserAccess('komentarji'))
echo '<a href="' . $site_url . 'admin/survey/ajax.php?anketa='.$row['id'].'&a=comments_onoff&do=on" title="' . $lang['srv_preview_comments'] . '"><div class="fa-stack"><span class="faicon comments fa-stack-1x icon-blue" title="' . $lang['srv_preview_comments'] . '">';
else
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=urejanje" title="' . $lang['srv_preview_comments'] . '"><div class="fa-stack"><span class="faicon comments fa-stack-1x icon-blue user_access_locked" title="' . $lang['srv_preview_comments'] . '">';
echo '</span></div></a>';
echo '</div>';
echo '</li>';
}
if (($admin_type <= $survey_comment && $survey_comment != '') || $sas->testiranje_komentarji_komentarji_na_anketo(false) > 0) {
echo '<li>';
echo '<div id="quick_comments_link" class="newCss">';
$this->survey_icon_add_comment();
echo '</div>';
echo '</li>';
}
}
// ikonco za jezik prikazujemo po potrebi
if ($row['multilang'] == 1) {
$p = new Prevajanje($this->anketa);
global $lang1;
echo '<li style="margin: 10px 0 0 0;">';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=prevajanje" class="srv_ico" title="' . $lang['lang'] . ': ' . $lang['lang_short'] . ' | ' . $lang1['lang_short'] . $lang_more . '">';
echo '<span class="faicon language icon-as_link"></span>';
echo '</a>';
echo '</li>';
}
elseif (UserSetting::getInstance()->getUserSetting('showLanguageShortcut')) {
// Ikona za vklop jezika, če je v globalnih nastavitvah vklopljena opcija
echo '<li style="margin: 10px 0 0 0;">';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=prevajanje" class="srv_ico" title="' . $lang['lang'] . '">';
echo '<span class="faicon language icon-grey_normal pointer"></span>';
echo '</a>';
echo '</li>';
}
// Ikonca ce je izklopljeno prilagajanje za mobitel (mobile friendly)
$mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly');
if ($mobile_friendly == 0) {
echo '<li style="margin: 10px 0 0 0;">';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=mobile_settings" class="srv_ico" title="' . $lang['srv_settings_mobile_friendly_off'] . '">';
echo '<span class="faicon mobile_off icon-as_link"></span>';
echo '</a>';
echo '</li>';
}
echo '</ol>';
}
// Ikone na desni
echo '<div class="right_icons">';
# zavhiki dodatnih nastavitev
echo '<ol class="navigation_modules">';
@ -1420,9 +1304,117 @@ class SurveyAdmin
echo '</li>';
}
echo '</ol>';
// Ikone komentarjev, jezika...
$d = new Dostop();
if ($d->checkDostopAktiven()) {
echo '<ol class="quick_settings' . ($this->isAnketar == true ? ' displayNone' : '') . '">';
# Komentarji
SurveySetting::getInstance()->Init($this->anketa);
$survey_comment = SurveySetting::getInstance()->getSurveyMiscSetting('survey_comment');
$question_comment = SurveySetting::getInstance()->getSurveyMiscSetting('question_comment');
$question_note_view = SurveySetting::getInstance()->getSurveyMiscSetting('question_note_view');
$question_resp_comment = SurveySetting::getInstance()->getSurveyMiscSetting('question_resp_comment');
$sas = new SurveyAdminSettings();
// V kolikor je vklopljena hierarhija in imamo gor splošne uporabnike, potem nastavitev ne prikazujemo
$hierarhija_prikaz = true;
if(SurveyInfo::getInstance()->checkSurveyModule('hierarhija') && $hierarhija_type == 10)
$hierarhija_prikaz = false;
#ikonco za komentarje prikazujemo po potrebi
if ($this->survey_type > 1 && $hierarhija_prikaz) {
global $global_user_id;
$userAccess = UserAccess::getInstance($global_user_id);
if ($survey_comment != '' || $question_comment != '' || /*$question_note_view != '' ||*/
$question_resp_comment == 1 || $sas->testiranje_komentarji_komentarji_na_vprasanje(false) > 0
) {
echo '<li>';
echo '<div id="quick_comments_link" class="newCss">';
if($userAccess->checkUserAccess('komentarji')){
if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0)
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments_num icon-orange fa-stack-1x" title="' . $lang['srv_view_comment'] . '"><strong class="fa-stack-1x">' . $sas->testiranje_komentarji_komentarji_na_vprasanje() . '</strong></span></div></a>';
else
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=komentarji" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments fa-stack-1x icon-orange" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
}
else{
if ($sas->testiranje_komentarji_komentarji_na_vprasanje() > 0)
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='. $row['id'].'&a=urejanje" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments_num icon-orange fa-stack-1x user_access_locked" title="' . $lang['srv_view_comment'] . '"><strong class="fa-stack-1x">' . $sas->testiranje_komentarji_komentarji_na_vprasanje() . '</strong></span></div></a>';
else
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=urejanje" title="' . $lang['srv_view_comment'] . '" ><div class="fa-stack"><span class="faicon comments fa-stack-1x icon-orange user_access_locked" title="' . $lang['srv_view_comment'] . '"></span></div></a>';
}
echo '</div>';
echo '</li>';
}
// ce ni komentarjev, potem prikazemo link do nastavitev komentarjev
else {
echo '<li>';
echo '<div id="quick_comments_link" class="newCss">';
// Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
if($userAccess->checkUserAccess('komentarji'))
echo '<a href="' . $site_url . 'admin/survey/ajax.php?anketa='.$row['id'].'&a=comments_onoff&do=on" title="' . $lang['srv_preview_comments'] . '"><div class="fa-stack"><span class="faicon comments fa-stack-1x icon-blue" title="' . $lang['srv_preview_comments'] . '">';
else
echo '<a href="' . $site_url . 'admin/survey/index.php?anketa='.$row['id'].'&a=urejanje" title="' . $lang['srv_preview_comments'] . '"><div class="fa-stack"><span class="faicon comments fa-stack-1x icon-blue user_access_locked" title="' . $lang['srv_preview_comments'] . '">';
echo '</span></div></a>';
echo '</div>';
echo '</li>';
}
if (($admin_type <= $survey_comment && $survey_comment != '') || $sas->testiranje_komentarji_komentarji_na_anketo(false) > 0) {
echo '<li>';
echo '<div id="quick_comments_link" class="newCss">';
$this->survey_icon_add_comment();
echo '</div>';
echo '</li>';
}
}
// ikonco za jezik prikazujemo po potrebi
if ($row['multilang'] == 1) {
$p = new Prevajanje($this->anketa);
global $lang1;
echo '<li>';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=prevajanje" class="srv_ico" title="' . $lang['lang'] . ': ' . $lang['lang_short'] . ' | ' . $lang1['lang_short'] . $lang_more . '">';
echo '<span class="faicon language"></span>';
echo '</a>';
echo '</li>';
}
elseif (UserSetting::getInstance()->getUserSetting('showLanguageShortcut')) {
// Ikona za vklop jezika, če je v globalnih nastavitvah vklopljena opcija
echo '<li>';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=prevajanje" class="srv_ico" title="' . $lang['lang'] . '">';
echo '<span class="faicon language gray"></span>';
echo '</a>';
echo '</li>';
}
// Ikonca ce je izklopljeno prilagajanje za mobitel (mobile friendly)
$mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly');
if ($mobile_friendly == 0) {
echo '<li>';
echo '<a href="index.php?anketa=' . $this->anketa . '&a=mobile_settings" class="srv_ico" title="' . $lang['srv_settings_mobile_friendly_off'] . '">';
echo '<span class="faicon mobile_off"></span>';
echo '</a>';
echo '</li>';
}
echo '</ol>';
}
echo '</div>'; # class="right_items"
echo '</div>'; # id="firstNavigation"
@ -1474,6 +1466,8 @@ class SurveyAdmin
# link arhivi
if (!$this->isAnketar) {
echo '<div class="separator"></div>';
echo '<ul class="secondNavigationArchive">';
echo '<li class="'.($get == A_ARHIVI || $get == A_TRACKING ? ' active' : '').'">';
@ -1522,6 +1516,8 @@ class SurveyAdmin
# link arhivi
if ((int)$testdata > 0) {
echo '<div class="separator"></div>';
echo '<ul class="secondNavigationArchive">';
echo '<li class="'.($get == A_ARHIVI || $get == A_TRACKING ? ' active' : '').'">';
@ -1562,6 +1558,8 @@ class SurveyAdmin
# link arhivi
echo '<div class="separator"></div>';
echo '<ul class="secondNavigationArchive">';
echo '<li class="'.($get == A_ARHIVI || $get == A_TRACKING || $_GET['m'] == 'view_archive' ? ' active' : '').'">';
@ -1656,6 +1654,8 @@ class SurveyAdmin
# link arhivi
echo '<div class="separator"></div>';
echo '<ul class="secondNavigationArchive">';
echo '<li class="'.($_GET['m'] == M_ANALYSIS_ARCHIVE ? ' active' : '').'">';
@ -1706,6 +1706,7 @@ class SurveyAdmin
# link arhivi
if ($d->checkDostopSub('edit')) {
echo '<div class="separator"></div>';
echo '<ul class="secondNavigationArchive">';
@ -6706,8 +6707,8 @@ class SurveyAdmin
// Predogled in testiranje (ikona monitor)
echo '<div class="anketa_header_preview">';
echo '<span class="tooltip borderLeft monitor" style="padding-left:7px;">';
echo ' <a href="' . $link . '&preview=on' . $preview_options . '" target="_blank"><span class="faicon monitor" style="margin-right:7px;"></span></a> ';
echo '<span class="tooltip monitor">';
echo ' <a href="' . $link . '&preview=on' . $preview_options . '" target="_blank"><span class="faicon monitor"></span></a> ';
echo '<span id="tooltip_preview_content" class="expanded-tooltip bottom light">';
echo '<b>' . $lang['srv_monitor_toolbox_title'] . '</b>';

2915
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

8
resources/sass/admin_new/basic/icons/icons.scss
View File

@ -18,19 +18,19 @@ a.faicon{
}
//VELIKOSTI
&.large {
&.large::before {
font-size: 32px !important;
}
&.medium {
&.medium::before {
font-size: 24px !important;
}
&.normal {
&.normal::before {
font-size: 16px !important;
}
&.small {
&.small::before {
font-size: 10px !important;
}

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

@ -11,115 +11,128 @@ and open the template in the editor.
/* NAPREDNI MODULI */
span.module_icon{
padding: 0 6px;
display: flex;
align-items: center;
height: 25px;
padding: 0 8px;
color: white;
font-weight: 700;
font-weight: 600;
font-size: 16px;
background-color: transparent;
border: 1px $white solid;
}
span.module_icon.maza::before{
content: "MAZA";
}
span.module_icon.wpn::before{
content: "WPN";
}
span.module_icon.panel::before{
content: "Panel";
}
span.module_icon.telephone::before{
content: "TEL";
}
span.module_icon.slideshow::before{
content: "SS";
}
span.module_icon.evalvation::before{
content: "EVAL";
}
span.module_icon.vnos::before{
content: "V";
}
span.module_icon.social::before{
content: "SN";
}
span.module_icon.quiz::before{
content: "Q";
}
span.module_icon.voting::before{
content: "VOTE";
}
span.module_icon.advanced_paradata::before{
content: "AP";
}
span.module_icon.chat::before{
content: "C";
}
span.module_icon.degrees_1ka::before{
content: "360";
}
span.module_icon.mju::before{
content: "H";
}
span.module_icon.sa-hierarhija::before{
content: "SA";
}
span.module_icon.degrees::before{
content: "360";
}
span.module_icon.borza::before{
content: "Borza";
}
span.module_icon.evoli::before{
content: "Evoli";
}
span.module_icon.evoli_teammeter::before{
content: "Evoli TM";
}
span.module_icon.evoli_quality_climate::before{
content: "Evoli QC";
}
span.module_icon.evoli_teamship_meter::before{
content: "Evoli TSM";
}
span.module_icon.evoli_organizational_employeeship_meter::before{
content: "Evoli OEM";
}
span.module_icon.evoli_employmeter::before{
content: "Evoli EM";
}
span.module_icon.excell_matrix::before{
content: "EM";
}
span.module_icon.mfdps::before{
content: "MFDPS";
}
span.module_icon.mju::before{
content: "MJU";
}
span.module_icon.gdpr{
color: $gray;
background-color: $blue;
border: 1px $white solid;
&:hover{
color: $white;
text-decoration: none !important;
&::before{
line-height: 25px;
}
&.maza::before{
content: "MAZA";
}
&.wpn::before{
content: "WPN";
}
&.panel::before{
content: "Panel";
}
&.telephone::before{
content: "TEL";
}
&.slideshow::before{
content: "SS";
}
&.evalvation::before{
content: "EVAL";
}
&.vnos::before{
content: "V";
}
&.social::before{
content: "SN";
}
&.quiz::before{
content: "Q";
}
&.voting::before{
content: "VOTE";
}
&.advanced_paradata::before{
content: "AP";
}
&.chat::before{
content: "C";
}
&.degrees_1ka::before{
content: "360";
}
&.mju::before{
content: "H";
}
&.sa-hierarhija::before{
content: "SA";
}
}
span.module_icon.gdpr.active{
color: white;
background-color: $blue;
border: 1px $white solid;
&:hover{
color: white;
&.degrees::before{
content: "360";
}
&.borza::before{
content: "Borza";
}
&.evoli::before{
content: "Evoli";
}
&.evoli_teammeter::before{
content: "Evoli TM";
}
&.evoli_quality_climate::before{
content: "Evoli QC";
}
&.evoli_teamship_meter::before{
content: "Evoli TSM";
}
&.evoli_organizational_employeeship_meter::before{
content: "Evoli OEM";
}
&.evoli_employmeter::before{
content: "Evoli EM";
}
&.excell_matrix::before{
content: "EM";
}
&.mfdps::before{
content: "MFDPS";
}
&.mju::before{
content: "MJU";
}
&.gdpr{
color: $gray;
background-color: $blue;
border: 1px $white solid;
&:hover{
color: $white;
}
&.active{
color: white;
background-color: $blue;
border: 1px $white solid;
&:hover{
color: white;
border: 1px $white solid;
}
}
&::before{
content: "GDPR";
}
}
}
span.module_icon.gdpr::before{
content: "GDPR";
}

4
resources/sass/admin_new/basic/icons/standard.scss
View File

@ -177,19 +177,15 @@ span.faicon.logout::before{
}
span.faicon.monitor::before{
font-size: 18px;
content: "\f108";
}
span.faicon.users::before{
font-size: 18px;
content: "\f500";
}
span.faicon.lock_open::before{
font-size: 18px;
content: "\f3c1";
}
span.faicon.lock_close::before{
font-size: 18px;
content: "\f023";
}

1
resources/sass/admin_new/basic/icons/toolbox.scss
View File

@ -12,7 +12,6 @@ and open the template in the editor.
span.faicon.wheel_32::before{
content: "\f013";
font-size: 20px;
}
span.faicon.radio_32::before{

1
resources/sass/admin_new/basic/layout.scss
View File

@ -23,6 +23,7 @@ body{
#main{
padding: 64px 0;
min-height: calc(100vh - 410px);
.fullwidth{
max-width: 100%;

3
resources/sass/admin_new/components/components.scss
View File

@ -11,4 +11,5 @@
// Functional components
@import "form/form";
@import "table/table";
@import "popup/popup";
@import "popup/popup";
@import "hover/hover";

181
resources/sass/admin_new/components/header/navigation.scss
View File

@ -13,18 +13,24 @@ header{
#firstNavigation {
display: flex;
justify-content: space-between;
height: 50px;
height: 58px;
padding-top: 10px;
margin-left: 32px;
margin: 0 32px;
font-size: 16px;
font-weight: 400;
text-align: center;
.right_icons{
display: flex;
}
ol{
display: flex;
align-items: center;
padding: 0;
margin: 0;
@ -34,24 +40,93 @@ header{
list-style-type: none;
}
&.navigation_buttons_list li{
padding: 14px 32px;
a {
color: $white;
text-decoration: none;
}
&.navigation_buttons_list{
padding-top: 10px;
&.active_on{
background-color: $white;
li{
padding: 14px 32px;
a {
color: $blue;
color: $white;
text-decoration: none;
}
}
#mojeAnketeLink {
&.active_on{
background-color: $white;
a {
color: $blue;
}
}
#mojeAnketeLink {
}
}
}
// Ikone za komentarje na desni
&.quick_settings{
li{
margin-left: 16px;
a span::before{
color: white;
}
}
#quick_comments_link.newCss {
font-size: 12px;
a {
margin-right: 0px !important;
color: $white !important;
font-weight: 600;
&:hover {
color: $white !important;
}
span.comments_blue_off {
margin-top: 4px !important;
}
span.comments_orange_off {
margin-top: 4px !important;
}
span.comments_blue_on {
margin-top: -1px !important;
}
span.comments_orange_on {
margin-top: -1px !important;
}
}
}
span.sprites.comments_blue_on {
color: $white;
font-size: 11px;
font-weight: bold;
line-height: 12px;
text-align: center;
}
span.sprites.comments_orange_on {
color: $white;
font-size: 11px;
font-weight: bold;
line-height: 12px;
text-align: center;
}
}
// Vklopljeni moduli na desni
&.navigation_modules{
li{
margin-left: 16px;
}
a:hover{
text-decoration: none;
}
}
}
@ -59,57 +134,23 @@ header{
}
#quick_comments_link.newCss {
font-size: 12px;
margin-top: 3px !important;
margin-right: 5px !important;
a {
margin-right: 0px !important;
color: $blue !important;
font-weight: 600;
&:hover {
color: $yellow !important;
}
span.comments_blue_off {
margin-top: 4px !important;
}
span.comments_orange_off {
margin-top: 4px !important;
}
span.comments_blue_on {
margin-top: -1px !important;
}
span.comments_orange_on {
margin-top: -1px !important;
}
}
}
span.sprites.comments_blue_on {
color: $comment_number_text;
font-size: 11px;
font-weight: bold;
line-height: 12px;
text-align: center;
}
span.sprites.comments_orange_on {
color: $comment_number_text;
font-size: 11px;
font-weight: bold;
line-height: 12px;
text-align: center;
}
#secondNavigation {
display: flex;
align-items: center;
height: 41px;
border-bottom: 1px solid $gray;
.separator{
width: 1px;
height: 25px;
margin: 0 16px;
border-left: 1px $very-dark-gray2 solid;
}
ul.secondNavigation,
ul.secondNavigationArchive{
display: flex;
@ -118,6 +159,10 @@ header{
margin: 0 0 0 32px;
padding: 0;
&.secondNavigationArchive{
margin-left: 0;
}
li{
list-style-image: none;
list-style-position: outside;
@ -146,6 +191,22 @@ header{
}
}
}
#secondNavigation_links{
display: flex;
align-items: center;
position: absolute;
right: 32px;
a{
margin-left: 16px;
span::before{
font-size: 20px !important;
}
}
}
}

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

@ -1,9 +1,6 @@
$anketa_title: $gray;
$anketa_url_disabled: $gray;
$anketa_url_enabled: $blue;
$mail_unread: #ffffff;
$user_dropdown_text: #4d4d4d;
$header_background: #ffffff;
header #top_line{
display: flex;
@ -51,6 +48,8 @@ header #top_line{
// Help, preview ikone
.anketa_header_help{
display: flex;
align-items: center;
margin-left: 37px;
}
@ -64,6 +63,7 @@ header #top_line{
.anketa_header_url{
margin-left: 32px;
color: $very-dark-gray;
a{
font-size: 16px;
@ -82,10 +82,6 @@ header #top_line{
width: 50px;
height: 20px;
color: white;
font-size: 12px;
font-weight: 400;
.switch_anketa_content {
position: absolute;
cursor: pointer;
@ -94,6 +90,11 @@ header #top_line{
right: 0;
bottom: 0;
padding-top: 1px;
color: white;
font-size: 12px;
font-weight: 400;
line-height: 16px;
background-color: $blue;
border-radius: 20px;
@ -102,8 +103,8 @@ header #top_line{
position: absolute;
content: "";
height: 15px;
width: 15px;
height: 18px;
width: 18px;
bottom: 1px;
background-color: white;
@ -113,30 +114,30 @@ header #top_line{
.switch_anketa.anketa_on{
.switch_anketa_content{
padding-left: 9px;
padding-left: 24px;
background-color: $blue;
}
.switch_anketa_content:before{
right: 2px;
left: 1px;
}
&:hover{
.switch_anketa_content{
background-color: $yellow;
background-color: $dark-blue;
}
}
}
.switch_anketa.anketa_off{
.switch_anketa_content{
padding-left: 19px;
background-color: $blue;
padding-left: 6px;
background-color: $very-dark-gray2;
}
.switch_anketa_content:before{
left: 2px;
right: 1px;
}
&:hover{
.switch_anketa_content{
background-color: $blue;
background-color: $very-dark-gray;
}
}
}
@ -148,6 +149,8 @@ header #top_line{
}
.anketa_header_quick_settings{
display: flex;
align-items: center;
margin-left: 32px;
}
}
@ -155,40 +158,43 @@ header #top_line{
// Nastavitve zgoraj desno (search, uporabnik...)
#enka_nav {
display: flex;
align-items: center;
position: absolute;
right: 32px;
#search_holder {
display: inline-block;
vertical-align: middle;
}
#help_holder {
display: inline-block;
vertical-align: middle;
margin-left: 12px;
}
#fieldwork_holder {
display: inline-block;
vertical-align: middle;
margin-left: 12px;
}
#notification_holder {
display: inline-block;
vertical-align: middle;
margin-left: 12px;
div{
margin-left: 24px;
}
input#searchSurvey {
display: none;
width: 150px;
padding: 3px 0 3px 5px;
margin-top: -8px;
border: 1px solid $blue;
#search_holder {
form{
display: flex;
align-items: center;
}
input#searchSurvey {
display: none;
width: 150px;
padding: 3px 0 3px 5px;
margin: -3px 0 0 5px;
border: 1px solid $blue;
}
}
#help_holder {
}
#fieldwork_holder {
}
#notification_holder {
}
}
span.sprites.mail_unread {
color: $mail_unread;
color: $white;
font-size: 11px;
font-weight: bold;
line-height: 23px;
@ -200,41 +206,56 @@ header #top_line{
width: auto;
margin-left: 15px;
vertical-align: middle;
.xtraname {
display: flex;
align-items: center;
cursor: pointer;
display: inline-block;
width: auto;
font-weight: 500;
color: $blue;
&:hover{
color: $yellow;
color: $dark-blue;
}
span{
margin-left: 8px;
line-height: 20px;
}
}
#xtradivSettings {
display: none;
position: absolute;
z-index: 99999;
right: 8px;
top: 35px;
padding: 5px 10px;
width: 120px;
text-align: left;
background-color: $header_background;
background-color: $white;
border: 1px $blue solid;
-webkit-box-shadow: 0 5px 15px 0 rgba(0,0,0,0.4);
box-shadow: 0 5px 15px 0 rgba(0,0,0,0.4);
-moz-box-shadow: 0 5px 15px 0 rgba(0,0,0,0.4);
span.xtraSetting {
clear: both;
float: left;
padding: 6px 0;
a.xtra {
display: inline;
vertical-align: middle;
font-size: 13px;
color: $user_dropdown_text;
color: $black;
&:hover {
color: $yellow;
@ -252,6 +273,7 @@ header #top_line{
}
}
}
/*tooltips on survey*/

0
resources/sass/admin_new/components/hover/hover.scss Normal file
View File