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/assets/css/buttons.scss b/src/assets/css/buttons.scss
index 95bb5d3..0267267 100644
--- a/src/assets/css/buttons.scss
+++ b/src/assets/css/buttons.scss
@@ -50,7 +50,7 @@ button, .btn, a.btn {
}
}
- &.clear{
+ &.clear,&.icon{
padding: 0;
justify-content: center;
align-items: center;
@@ -68,13 +68,27 @@ button, .btn, a.btn {
letter-spacing: 100%;
}
- &.trash::after {
- content: "";
- width: 24px;
- height: 24px;
- background: url('~src/assets/images/icons/trash_grey_24dp.svg') center no-repeat;
-
+ &.trash,&.add-child,&.edit,&.delete{
+
+ width: 24px;
+ height: 24px;
+ background: center no-repeat;
+
}
+
+ &.trash {
+ background-image: url('~src/assets/images/icons/trash_grey_24dp.svg');
+ }
+ &.add-child {
+ background-image: url('~src/assets/images/icons/add_web_page_24dp.svg');
+ }
+ &.edit {
+ background-image: url('~src/assets/images/icons/edit_24dp.svg');
+ }
+ &.close {
+ background-image: url('~src/assets/images/icons/close_24dp.svg');
+ }
+
}
// .inline-menu.default {
diff --git a/src/assets/css/main-menu.scss b/src/assets/css/main-menu.scss
index 1a07c65..0db37b1 100644
--- a/src/assets/css/main-menu.scss
+++ b/src/assets/css/main-menu.scss
@@ -46,7 +46,7 @@
a {
color: #FFF;
- display: block;
+ display: flex;
flex-grow: 1;
flex-shrink: 1;
flex-basis: calc(100% - 24px);
@@ -93,7 +93,7 @@
pages-menu-item {
a {
- height: 100%;
+ // height: 100%;
transition: all 0.3s;
&:not(:hover).active{
diff --git a/src/assets/images/icons/add_web_page_24dp.svg b/src/assets/images/icons/add_web_page_24dp.svg
new file mode 100644
index 0000000..e4119eb
--- /dev/null
+++ b/src/assets/images/icons/add_web_page_24dp.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/assets/images/icons/edit_24dp.svg b/src/assets/images/icons/edit_24dp.svg
index 623b3cd..062e151 100644
--- a/src/assets/images/icons/edit_24dp.svg
+++ b/src/assets/images/icons/edit_24dp.svg
@@ -1,5 +1,3 @@