diff --git a/src/vniigaz-v2/component/layout/footer/footer.component.html b/src/vniigaz-v2/component/layout/footer/footer.component.html index 529b7f4..e295400 100644 --- a/src/vniigaz-v2/component/layout/footer/footer.component.html +++ b/src/vniigaz-v2/component/layout/footer/footer.component.html @@ -33,10 +33,10 @@
diff --git a/src/vniigaz-v2/component/layout/footer/footer.component.ts b/src/vniigaz-v2/component/layout/footer/footer.component.ts index 2d5fadf..84dbd26 100644 --- a/src/vniigaz-v2/component/layout/footer/footer.component.ts +++ b/src/vniigaz-v2/component/layout/footer/footer.component.ts @@ -7,6 +7,9 @@ import {AuthenticationService} from "@app/_services"; styleUrls: ['footer.component.scss'] }) export class FooterComponent { + + public year = new Date().getFullYear(); + constructor(public authService: AuthenticationService) { } @@ -21,4 +24,6 @@ export class FooterComponent { this.authService.popup('login'); } + + } diff --git a/src/vniigaz-v2/component/layout/header/header.component.html b/src/vniigaz-v2/component/layout/header/header.component.html index 93931e1..d39da19 100644 --- a/src/vniigaz-v2/component/layout/header/header.component.html +++ b/src/vniigaz-v2/component/layout/header/header.component.html @@ -12,7 +12,7 @@
- АИС СЦ ВНИИГАЗ + Личный кабинет (АИС СЦ)
diff --git a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.html b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.html index f0a9715..dbab32e 100644 --- a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.html +++ b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.html @@ -2,8 +2,13 @@
-

{{name}}

-

Учреждено в 1998

+

{{name}}

+

+ Сертификация
+ продукции, работ и услуг

+

+ Учреждено в 1998 +

diff --git a/src/vniigaz-v2/css/_grid.scss b/src/vniigaz-v2/css/_grid.scss index 574c206..7715e87 100644 --- a/src/vniigaz-v2/css/_grid.scss +++ b/src/vniigaz-v2/css/_grid.scss @@ -41,30 +41,44 @@ jumbotron{ position: absolute; } .jumbotron-content-center{ - align-self: center; display: flex; flex-direction: column; - align-items: center; max-width: 100%; h1{ margin: 0; padding: $ps 0; max-width: 100%; } - h4{ - text-decoration: underline; - font-size: 24px; - font-weight: 400; - color: #fff; - font-family: PT Sans; + } + } + &.rootpage-jumbotron{ + .jumbotron-content{ + header-user-bar{ + top: 100px !important; + } + .jumbotron-content-center{ + align-self: center; + align-items: center; + + h1{ + font-size: 80px; + line-height: 95px; + } + h4{ + text-decoration: underline; + font-size: 25px; + font-weight: 400; + font-family: PT Sans; + margin-top: 16px; + a{ + color: #fff; + text-decoration: underline; + } + } } } - } - &.rootpage-jumbotron{ - header-user-bar{ - top: 100px !important - } + } } .jumbotron-edit-field{ @@ -85,6 +99,15 @@ jumbotron{ +@media screen and (max-width: 480px) { + jumbotron .jumbotron-bg.rootpage-jumbotron .jumbotron-content .jumbotron-content-center h1{ + font-size: 50px; + line-height: 60px; + } +} + + + .content-sapce{ flex-grow: 1; .content-grid{ diff --git a/src/vniigaz-v2/css/_main-menu.scss b/src/vniigaz-v2/css/_main-menu.scss index 4ac3e99..98cd6b4 100644 --- a/src/vniigaz-v2/css/_main-menu.scss +++ b/src/vniigaz-v2/css/_main-menu.scss @@ -251,7 +251,7 @@ right-content{ width: 400px; margin-left: 40px; border-radius: 8px; - background: var(#FFF); + background: #FFF; box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.27); padding: 20px; pages-menu{ @@ -287,7 +287,7 @@ right-content{ width: 360px; margin-left: 40px; border-radius: 8px; - background: var(#FFF); + background: #FFF; box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.27); padding: 20px; pages-menu{ @@ -335,6 +335,9 @@ right-content{ max-width: 100%; width: 1360px; z-index: 1; + .locale img{ + border: none; + } pages-menu{ a{ color: #FFF; diff --git a/src/vniigaz-v2/css/_tabs.scss b/src/vniigaz-v2/css/_tabs.scss index be4dbe4..f1d32d4 100644 --- a/src/vniigaz-v2/css/_tabs.scss +++ b/src/vniigaz-v2/css/_tabs.scss @@ -29,8 +29,7 @@ white-space: nowrap; } &:last-child { - span { - } + } &.active { color: #ffffff;