diff --git a/src/app/_modules/administration/page/administration-page.component.html b/src/app/_modules/administration/page/administration-page.component.html index 550f198..bed2527 100644 --- a/src/app/_modules/administration/page/administration-page.component.html +++ b/src/app/_modules/administration/page/administration-page.component.html @@ -1,9 +1,12 @@ -
-

Панель управления

+
+
+

Панель управления

+
+
-
+
diff --git a/src/app/_modules/administration/page/administration-page.component.scss b/src/app/_modules/administration/page/administration-page.component.scss index f02274e..4cb21b8 100644 --- a/src/app/_modules/administration/page/administration-page.component.scss +++ b/src/app/_modules/administration/page/administration-page.component.scss @@ -1,5 +1,21 @@ -.container { - h1 { - margin-top: 40px; +.line{ + display: inline-block; + border-bottom: 12px solid var(--blue-0); + margin-top: 24px; + margin-bottom: 40px; + h1{ + display: inline; + padding-right: 40px; + vertical-align: 2px; + font-family: PT Sans Narrow; + font-size: 76px; + font-style: normal; + font-weight: 700; + line-height: 60px; /* 100% */ + letter-spacing: 0.76px; + color: #2D2D2D; } } +:host{ + font-size: 20px; +} \ No newline at end of file diff --git a/src/app/_modules/advisories/tree/advisories-tree.component.html b/src/app/_modules/advisories/tree/advisories-tree.component.html index 738b1ba..a7d62eb 100644 --- a/src/app/_modules/advisories/tree/advisories-tree.component.html +++ b/src/app/_modules/advisories/tree/advisories-tree.component.html @@ -1,3 +1,4 @@ +
diff --git a/src/app/_modules/advisories/tree/advisories-tree.component.scss b/src/app/_modules/advisories/tree/advisories-tree.component.scss index 795a644..628ced4 100644 --- a/src/app/_modules/advisories/tree/advisories-tree.component.scss +++ b/src/app/_modules/advisories/tree/advisories-tree.component.scss @@ -93,24 +93,24 @@ flex-shrink: 0; button { margin-left: 24px; - &.edit { - background-image: url('~src/assets/images/icons/edit_24dp.svg'); - } - &.add-company { - background-image: url('~src/assets/images/icons/note_add_20.svg'); - } - &.add-person { - background-image: url('~src/assets/images/icons/note_add_20.svg'); - } - &.add-group { - background-image: url('~src/assets/images/icons/add_folder_24.svg'); - } - &.add-child { - background-image: url('~src/assets/images/icons/add_library_dark_24.svg'); - } - &.delete { - background-image: url('~src/assets/images/icons/close_24dp.svg'); - } + // &.edit { + // background-image: url('~src/assets/images/icons/edit_24dp.svg'); + // } + // &.add-company { + // background-image: url('~src/assets/images/icons/note_add_20.svg'); + // } + // &.add-person { + // background-image: url('~src/assets/images/icons/note_add_20.svg'); + // } + // &.add-group { + // background-image: url('~src/assets/images/icons/add_folder_24.svg'); + // } + // &.add-child { + // background-image: url('~src/assets/images/icons/add_library_dark_24.svg'); + // } + // &.delete { + // background-image: url('~src/assets/images/icons/close_24dp.svg'); + // } } } } diff --git a/src/app/_modules/layout/header/header.component.scss b/src/app/_modules/layout/header/header.component.scss index 89d1692..c48b60c 100644 --- a/src/app/_modules/layout/header/header.component.scss +++ b/src/app/_modules/layout/header/header.component.scss @@ -86,6 +86,7 @@ margin: 12px 24px 12px 40px; background-image: url('~src/assets/images/logo_vniigaz_1163x816.svg'); background-size: contain; + flex-shrink: 0; ; } .grid-menu{ @@ -114,6 +115,9 @@ flex-grow: 1; flex-shrink: 1; margin-right: 40px; + button{ + white-space: nowrap; + } } } } diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html index 3741055..e61de5c 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html @@ -6,7 +6,7 @@