diff --git a/src/app/_modules/administration/page/administration-page.component.html b/src/app/_modules/administration/page/administration-page.component.html index bed2527..5b7fe4b 100644 --- a/src/app/_modules/administration/page/administration-page.component.html +++ b/src/app/_modules/administration/page/administration-page.component.html @@ -3,9 +3,9 @@

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

-
+
diff --git a/src/app/_modules/advisories/tree/advisories-tree.component.scss b/src/app/_modules/advisories/tree/advisories-tree.component.scss index 628ced4..ba009fb 100644 --- a/src/app/_modules/advisories/tree/advisories-tree.component.scss +++ b/src/app/_modules/advisories/tree/advisories-tree.component.scss @@ -32,11 +32,17 @@ flex-shrink: 0; cursor: pointer; &:before { - display: block; - width: 40px; + display: inline-block; + width: 24px; height: 24px; - background: transparent url("~src/assets/images/icons/circle_plus_24.svg") 50% 50% no-repeat; - content: ""; + background: var(--white) url("~src/assets/images/icons/arrow_drop_down_24dp.svg") no-repeat center; + content: ''; + z-index: 0; + bottom: -2px; + position: absolute; + right: -28px; + transform: rotate(0deg); + transition: transform .3s; } } .mid { @@ -116,7 +122,7 @@ } .items { display: none; - padding-left: 56px; + padding-left: 50px; } &.active { >.bar { 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 e61de5c..1be297f 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 @@ -7,7 +7,7 @@
diff --git a/src/app/_modules/pages/tree/item/pages-tree-item.component.html b/src/app/_modules/pages/tree/item/pages-tree-item.component.html index aa35fa0..16e29d3 100644 --- a/src/app/_modules/pages/tree/item/pages-tree-item.component.html +++ b/src/app/_modules/pages/tree/item/pages-tree-item.component.html @@ -9,16 +9,16 @@

{{page.name}}

-

{{page.type?.title}}

+
diff --git a/src/app/_modules/pages/tree/pages-tree.component.scss b/src/app/_modules/pages/tree/pages-tree.component.scss index d2e26cf..6b36c40 100644 --- a/src/app/_modules/pages/tree/pages-tree.component.scss +++ b/src/app/_modules/pages/tree/pages-tree.component.scss @@ -11,9 +11,12 @@ height: 24px; cursor: pointer; .toggle { + border:none; width: 100%; height: 100%; - background: transparent url("~src/assets/images/icons/circle_plus_24.svg") 50% 50% no-repeat; + background: transparent url("~src/assets/images/icons/expand_less_20.svg") 50% 50% no-repeat; + transform: rotate(90deg); + transition: transform .3s; } } .mid { @@ -33,7 +36,19 @@ height: 40px; margin-right: 16px; border-radius: 100px; - background-color: #F9B417; + background-color: #0070BA; + color: #ffffff; + span{ + display: none; + + } + &::before { + content: ""; + display: block; + background: transparent url("~src/assets/images/icons/web_page_24dp.svg")no-repeat; + width: 24px; + height: 24px; + } img { width: 100%; height: 100%; @@ -46,7 +61,6 @@ p { margin: 0; a { - font-weight: bold; color: var(--grey-7); } &.sub { @@ -82,13 +96,13 @@ } .items { display: none; - padding-left: 56px; + padding-left: 50px; } &.active { >.bar { .left { .toggle { - background-image: url('~src/assets/images/icons/circle_minus_24.svg'); + transform: rotate(180deg); } } } diff --git a/src/assets/css/buttons.scss b/src/assets/css/buttons.scss index ef63099..7246d24 100644 --- a/src/assets/css/buttons.scss +++ b/src/assets/css/buttons.scss @@ -68,7 +68,7 @@ button, .btn, a.btn { letter-spacing: 100%; } - &.trash,&.add-child,&.edit,&.delete,&.close-blue{ + &.trash,&.add-child,&.edit,&.delete,&.close-blue,&.move{ width: 24px; height: 24px; @@ -91,6 +91,12 @@ button, .btn, a.btn { &.close-blue { background-image: url('~src/assets/images/icons/close_blue_24dp.svg'); }; + &.move { + background-image: url('~src/assets/images/icons/drag-n-drop_24.svg'); + }; + + + } diff --git a/src/assets/images/icons/drag-n-drop_24.svg b/src/assets/images/icons/drag-n-drop_24.svg index a36b5e6..0fc6322 100644 --- a/src/assets/images/icons/drag-n-drop_24.svg +++ b/src/assets/images/icons/drag-n-drop_24.svg @@ -1,3 +1,3 @@ - + diff --git a/src/assets/images/icons/web_page_24dp.svg b/src/assets/images/icons/web_page_24dp.svg new file mode 100644 index 0000000..c368005 --- /dev/null +++ b/src/assets/images/icons/web_page_24dp.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 11eea98..77d8956 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { production: false, apiUrl: 'http://api.vniigazv2.lc', clientId: 2, - clientSecret: 'LzHjVVQU5Y3c1xVkIl6BJRhYdCkxE6bNgZL2nqfv', + clientSecret: 'ibcsrXeGLmzmilvgKw53otrIB8RdrhXsheW3aaWd', }; /*