diff --git a/src/app/_modules/auth/login/login.component.html b/src/app/_modules/auth/login/login.component.html
index 482cb7b..2a114a0 100644
--- a/src/app/_modules/auth/login/login.component.html
+++ b/src/app/_modules/auth/login/login.component.html
@@ -24,7 +24,7 @@
diff --git a/src/app/_modules/form-fields/types/document/form-field-document.component.scss b/src/app/_modules/form-fields/types/document/form-field-document.component.scss
index ce62dc3..48eab06 100644
--- a/src/app/_modules/form-fields/types/document/form-field-document.component.scss
+++ b/src/app/_modules/form-fields/types/document/form-field-document.component.scss
@@ -55,7 +55,7 @@
.values {
.item {
- background: transparent url('~src/assets/images/icons/document_pdf_60dp.svg') 0 0 no-repeat;
+ background: transparent url('~src/assets/images/icons/document/document_pdf_60dp.svg') 0 0 no-repeat;
min-height: 60px;
padding-left: 72px;
font-size: 20px;
diff --git a/src/app/_modules/layout/footer/footer.component.scss b/src/app/_modules/layout/footer/footer.component.scss
index f4ea69b..28c7dde 100644
--- a/src/app/_modules/layout/footer/footer.component.scss
+++ b/src/app/_modules/layout/footer/footer.component.scss
@@ -1,5 +1,5 @@
.footer {
- margin-top: 120px;
+
width: 100%;
padding: 40px 100px;
background-color: var(--blue-3);
diff --git a/src/app/_modules/pages/menu/pages-menu.component.html b/src/app/_modules/pages/menu/pages-menu.component.html
index c63bd18..9fbcbac 100644
--- a/src/app/_modules/pages/menu/pages-menu.component.html
+++ b/src/app/_modules/pages/menu/pages-menu.component.html
@@ -1,2 +1,2 @@
-
diff --git a/src/app/_modules/pages/menu/pages-menu.component.ts b/src/app/_modules/pages/menu/pages-menu.component.ts
index 4300487..ef7e594 100644
--- a/src/app/_modules/pages/menu/pages-menu.component.ts
+++ b/src/app/_modules/pages/menu/pages-menu.component.ts
@@ -22,8 +22,11 @@ export class PagesMenuComponent {
close() {
- this.hidden = true;
- setTimeout(() => {this.hidden = false;}, 1);
+ this.hidden = !this.hidden;
+ // setTimeout(() => {this.hidden = false;}, 100);
+ }
+ leave(){
+ this.hidden = false;
}
itemSelect(event:any){
diff --git a/src/app/_modules/pages/page/page.component.scss b/src/app/_modules/pages/page/page.component.scss
index c9e5f00..e915755 100644
--- a/src/app/_modules/pages/page/page.component.scss
+++ b/src/app/_modules/pages/page/page.component.scss
@@ -1,8 +1,11 @@
.content {
+ background-color: #F6F6F6;
+ padding-bottom: 120px;
.row {
display: block;
width: 100%;
border-bottom: 1px solid #C0C0C0;
+ background-color: #FFF;
.page-header {
display: flex;
flex-direction: column;
@@ -31,7 +34,7 @@
font-size: 76px;
font-style: normal;
font-weight: 700;
- line-height: 60px; /* 100% */
+ line-height:100%;
letter-spacing: 0.76px;
color: white;
}
@@ -62,6 +65,7 @@
display: flex;
justify-content: end;
padding: 16px 0;
+
}
@media screen and (max-width: 1264px) {
diff --git a/src/app/_modules/pages/sections/add/add-section.component.scss b/src/app/_modules/pages/sections/add/add-section.component.scss
index 1d61c26..ea1d828 100644
--- a/src/app/_modules/pages/sections/add/add-section.component.scss
+++ b/src/app/_modules/pages/sections/add/add-section.component.scss
@@ -17,7 +17,7 @@
display: inline-block;
width: 24px;
height: 24px;
- background: var(--white) url("~src/assets/images/icons/add_cirle_24dp.svg") no-repeat center;
+ background: url("~src/assets/images/icons/add_cirle_24dp.svg") no-repeat center;
content: '';
z-index: 0;
bottom: -2px;
@@ -29,7 +29,7 @@
background-image: url("~src/assets/images/icons/add_cirle_active_24dp.svg");
}
&:after{
- background-image: url("~src/assets/images/icons//arrow_drop_down_active_24dp.svg");
+ background-image: url("~src/assets/images/icons/arrow_drop_down_active_24dp.svg");
};
color: var(--blue-3);
}
@@ -39,7 +39,7 @@
}
&:after{
transform: rotate(180deg);
- background-image: url("~src/assets/images/icons//arrow_drop_down_active_24dp.svg");
+ background-image: url("~src/assets/images/icons/arrow_drop_down_active_24dp.svg");
};
color: var(--blue-3);
}
@@ -47,7 +47,7 @@
display: inline-block;
width: 24px;
height: 24px;
- background: var(--white) url("~src/assets/images/icons/arrow_drop_down_24dp.svg") no-repeat center;
+ background: url("~src/assets/images/icons/arrow_drop_down_24dp.svg") no-repeat center;
content: '';
z-index: 0;
bottom: -2px;
diff --git a/src/app/_modules/pages/sections/types/basic/document/document-section.component.scss b/src/app/_modules/pages/sections/types/basic/document/document-section.component.scss
index ab7943e..0aed01e 100644
--- a/src/app/_modules/pages/sections/types/basic/document/document-section.component.scss
+++ b/src/app/_modules/pages/sections/types/basic/document/document-section.component.scss
@@ -1,9 +1,12 @@
:host {
display: block;
- background: url('~src/assets/images/icons/document_pdf_60dp.svg') top left no-repeat;
+ background: url('~src/assets/images/icons/document/document_pdf_60dp.svg') top left no-repeat;
padding-left: 62px;
min-height: 60px;
}
a{
font-size: 20px;
+}
+.description{
+ color: #6C6C6C;
}
\ No newline at end of file
diff --git a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html
index 2456035..5890e18 100644
--- a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html
+++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html
@@ -10,7 +10,10 @@
diff --git a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss
index 7be1d8f..9fc93ed 100644
--- a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss
+++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss
@@ -36,13 +36,18 @@
}
.image {
- img {
+ img{
width: 273px;
object-fit: cover;
height: 204px;
border-radius: 12px;
+ border: 1px solid rgba(45, 45, 45, 0.27);
+ }
+ a {
+ img {
border: 2px solid var(--blue-4);
cursor: pointer;
+ }
}
}
.name {
diff --git a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss
index 16eeb20..0407386 100644
--- a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss
+++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss
@@ -19,7 +19,7 @@
}
.doc{
display: block;
- background: url('~src/assets/images/icons/document_pdf_60dp.svg') top left no-repeat;
+ background: url('~src/assets/images/icons/document/document_pdf_60dp.svg') top left no-repeat;
padding-left: 62px;
min-height: 60px;
}
diff --git a/src/app/_modules/pages/sidebars/item/page-sidebar.component.scss b/src/app/_modules/pages/sidebars/item/page-sidebar.component.scss
index da8a492..1bc1da7 100644
--- a/src/app/_modules/pages/sidebars/item/page-sidebar.component.scss
+++ b/src/app/_modules/pages/sidebars/item/page-sidebar.component.scss
@@ -33,7 +33,7 @@
height: 20px;
margin-right: 8px;
flex-shrink: 0;
- background: transparent url("~src/assets/images/icons/document_20dp.svg") center no-repeat;
+ background: transparent url("~src/assets/images/icons/document/document_20dp.svg") center no-repeat;
content: '';
}
}
diff --git a/src/assets/css/basics.scss b/src/assets/css/basics.scss
index 0239850..6214bde 100644
--- a/src/assets/css/basics.scss
+++ b/src/assets/css/basics.scss
@@ -97,7 +97,7 @@ a {
height: 20px;
margin-right: 8px;
flex-shrink: 0;
- background: transparent url('~src/assets/images/icons/document_20.svg') 50% 50% no-repeat;
+ background: transparent url('~src/assets/images/icons/document/document_20.svg') 50% 50% no-repeat;
content: '';
}
}
diff --git a/src/assets/css/documents-lists.scss b/src/assets/css/documents-lists.scss
index 380fa8e..953a2c2 100644
--- a/src/assets/css/documents-lists.scss
+++ b/src/assets/css/documents-lists.scss
@@ -1,5 +1,5 @@
.documents.list.default {
- background: transparent url('~src/assets/images/icons/document_pdf_60dp.svg') 0 0 no-repeat;
+ background: transparent url('~src/assets/images/icons/document/document_pdf_60dp.svg') 0 0 no-repeat;
min-height: 60px;
padding-left: 72px;
font-size: 20px;
diff --git a/src/assets/css/main-menu.scss b/src/assets/css/main-menu.scss
index 995a67d..cf8d50a 100644
--- a/src/assets/css/main-menu.scss
+++ b/src/assets/css/main-menu.scss
@@ -121,9 +121,11 @@
}
}
}
- .grid-menu>pages-menu>pages-menu-item>a.active:not(:hover)>span {
+ .grid-menu>pages-menu>pages-menu-item>a.active:not(:hover)>span,
+ .grid-menu>pages-menu>pages-menu-item.hidden>a.active>span {
padding-top: 2px;
border-bottom: 2px solid var(--blue-1) ;
+ color: var(--blue-1);
}
// level 1
@@ -147,7 +149,7 @@
text-align: center;
padding: 0 20px;
margin: 0 -4px;
- &:hover {
+ &:hover:not(.hidden) {
background-color: #004077;
a{
color: #FFF;
@@ -166,11 +168,11 @@
line-height: 32px;
- &:hover {
- text-decoration: none;
- color: white;
- background: #004077;
- }
+ // &:hover {
+ // text-decoration: none;
+ // color: white;
+ // background: #004077;
+ // }
}
&>:hover {
diff --git a/src/assets/images/icons/document_20.svg b/src/assets/images/icons/document/document_20.svg
similarity index 100%
rename from src/assets/images/icons/document_20.svg
rename to src/assets/images/icons/document/document_20.svg
diff --git a/src/assets/images/icons/document_20dp.svg b/src/assets/images/icons/document/document_20dp.svg
similarity index 100%
rename from src/assets/images/icons/document_20dp.svg
rename to src/assets/images/icons/document/document_20dp.svg
diff --git a/src/assets/images/icons/document_pdf_60dp.svg b/src/assets/images/icons/document/document_pdf_60dp.svg
similarity index 100%
rename from src/assets/images/icons/document_pdf_60dp.svg
rename to src/assets/images/icons/document/document_pdf_60dp.svg