diff --git a/src/environments/gbu.env.dev.ts b/src/environments/gbu.env.dev.ts index 1949cb4..f2a1004 100644 --- a/src/environments/gbu.env.dev.ts +++ b/src/environments/gbu.env.dev.ts @@ -4,9 +4,9 @@ export const environment = { production: false, - apiUrl: 'http://api.nircms.lc', - clientId: 4, - clientSecret: 'KmGnhqVbEi3wlzkEyXi1JeNg9FtswdOdKQHpOcAu', + apiUrl: 'http://api.gbu.lc', + clientId: 2, + clientSecret: 'tU3LXUexXXXL5MjueJYZEWlZzZnLKD8TnIsnn4rh', project: null, licence: 'POUFLO4YW7SU', defaultLocale: 'ru' diff --git a/src/gbu/component/layout/grid/grid.component.html b/src/gbu/component/layout/grid/grid.component.html index cf0099a..a5bbf47 100644 --- a/src/gbu/component/layout/grid/grid.component.html +++ b/src/gbu/component/layout/grid/grid.component.html @@ -21,7 +21,7 @@ - + diff --git a/src/gbu/component/layout/grid/grid.component.ts b/src/gbu/component/layout/grid/grid.component.ts index e0bef32..c203dcb 100644 --- a/src/gbu/component/layout/grid/grid.component.ts +++ b/src/gbu/component/layout/grid/grid.component.ts @@ -24,6 +24,9 @@ export class GridComponent { private listsService: ListsService, private pagesService: PagesService, private publicationsService: PublicationsService ) { } + get currentPage(){ + return this.pagesService.currentPage + } ngOnInit() { this.pagesService.currentPageSubject.subscribe( diff --git a/src/gbu/css/_admin.scss b/src/gbu/css/_admin.scss index a637388..642ebbe 100644 --- a/src/gbu/css/_admin.scss +++ b/src/gbu/css/_admin.scss @@ -4,6 +4,7 @@ font-style: normal; font-weight: 400; line-height: 24px; + padding: 32px; h2{ color: var(--second-act); margin-bottom: 48px; diff --git a/src/gbu/css/_grid.scss b/src/gbu/css/_grid.scss index 6832759..986ead7 100644 --- a/src/gbu/css/_grid.scss +++ b/src/gbu/css/_grid.scss @@ -20,6 +20,7 @@ jumbotron{ margin-block: 40px 32px; + min-height: 40px; .jumbotron-content{ flex-direction: column; header-user-bar{