improve navigation active color; fix calendar dropdown initialization
This commit is contained in:
parent
f98dcb656f
commit
439fb12b6e
@ -12,7 +12,6 @@ import { LoginComponent } from './pages/login/login.component';
|
|||||||
import { ProfileComponent } from './pages/profile/profile.component';
|
import { ProfileComponent } from './pages/profile/profile.component';
|
||||||
import { JwtInterceptor, ErrorInterceptor } from './_helpers';
|
import { JwtInterceptor, ErrorInterceptor } from './_helpers';
|
||||||
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
|
||||||
import { fakeBackendProvider } from './_helpers';
|
|
||||||
import {ReactiveFormsModule} from "@angular/forms";
|
import {ReactiveFormsModule} from "@angular/forms";
|
||||||
import { EventsComponent } from './pages/events/events.component';
|
import { EventsComponent } from './pages/events/events.component';
|
||||||
import { FitEventTypesComponent } from './components/fit-event-types/fit-event-types.component';
|
import { FitEventTypesComponent } from './components/fit-event-types/fit-event-types.component';
|
||||||
|
|||||||
@ -13,7 +13,7 @@ export class FitNavigationComponent implements OnInit {
|
|||||||
items: MenuItem[] = [
|
items: MenuItem[] = [
|
||||||
{
|
{
|
||||||
route: '/home',
|
route: '/home',
|
||||||
label: 'Órarend',
|
label: 'Naptár',
|
||||||
roles: ['*']
|
roles: ['*']
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
|
|||||||
@ -51,7 +51,6 @@ export class MonthCalendarComponent implements OnInit {
|
|||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.initialized = false ;
|
this.initialized = false ;
|
||||||
console.info("init", this.timeTableFilter);
|
|
||||||
moment.locale('hu');
|
moment.locale('hu');
|
||||||
this.formTimeTable.patchValue({
|
this.formTimeTable.patchValue({
|
||||||
"idTrainer": this._timeTableFilter.idTrainer,
|
"idTrainer": this._timeTableFilter.idTrainer,
|
||||||
@ -63,6 +62,14 @@ export class MonthCalendarComponent implements OnInit {
|
|||||||
@Input()
|
@Input()
|
||||||
set timeTableFilter(timeTableFilter: TimeTableFilter){
|
set timeTableFilter(timeTableFilter: TimeTableFilter){
|
||||||
this._timeTableFilter = timeTableFilter;
|
this._timeTableFilter = timeTableFilter;
|
||||||
|
let idTrainer = timeTableFilter?.idTrainer == null ? "-1" : timeTableFilter?.idTrainer;
|
||||||
|
let idEventType = timeTableFilter?.idEventType == null ? "-1" : timeTableFilter?.idEventType;
|
||||||
|
console.info("run time table filter", timeTableFilter, idTrainer,idEventType);
|
||||||
|
|
||||||
|
this.formTimeTable.patchValue({
|
||||||
|
"idTrainer": idTrainer,
|
||||||
|
"idEventType": idEventType
|
||||||
|
})
|
||||||
this.loadData();
|
this.loadData();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,6 +133,7 @@ export class MonthCalendarComponent implements OnInit {
|
|||||||
return filteredDays;
|
return filteredDays;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private loadData(){
|
private loadData(){
|
||||||
if ( !this._eventsAvailableResponse ){
|
if ( !this._eventsAvailableResponse ){
|
||||||
return ;
|
return ;
|
||||||
|
|||||||
@ -56,6 +56,7 @@ $btn-border-radius: $border-radius-0;
|
|||||||
@import "styles/bootstrap-custom";
|
@import "styles/bootstrap-custom";
|
||||||
@import "styles/fonts";
|
@import "styles/fonts";
|
||||||
@import "styles/event.themes";
|
@import "styles/event.themes";
|
||||||
|
@import "styles/fit-navbar.theme";
|
||||||
html{
|
html{
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -37,7 +37,7 @@ $event-themes: (
|
|||||||
|
|
||||||
@each $name, $color in $event-themes {
|
@each $name, $color in $event-themes {
|
||||||
|
|
||||||
@debug "event theme - divider offset:";
|
//@debug "event theme - divider offset:";
|
||||||
|
|
||||||
.event-theme-normal-#{$name} {
|
.event-theme-normal-#{$name} {
|
||||||
.event-bar{
|
.event-bar{
|
||||||
|
|||||||
22
customer/app/src/styles/fit-navbar.theme.scss
Normal file
22
customer/app/src/styles/fit-navbar.theme.scss
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
$navbar-color: $primary;
|
||||||
|
.fit-navbar .navbar-nav > .nav-item > .nav-link:hover, .fit-navbar .navbar-nav > .nav-item > .nav-link:focus {
|
||||||
|
color: $navbar-color !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fit-navbar .navbar-nav > .nav-item.active > a {
|
||||||
|
color: $navbar-color !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fit-navbar .navbar-nav > .nav-item.active > a:after {
|
||||||
|
opacity: 1;
|
||||||
|
background: $navbar-color !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fit-navbar .navbar-nav > .nav-item.active > a {
|
||||||
|
color: $navbar-color !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fit-navbar .navbar-nav > .nav-item.active > a:after {
|
||||||
|
opacity: 1;
|
||||||
|
background: $navbar-color !important;
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user