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 aab8d5c..353af27 100644 --- a/src/app/_modules/pages/sections/add/add-section.component.scss +++ b/src/app/_modules/pages/sections/add/add-section.component.scss @@ -1,8 +1,8 @@ .add { position: relative; - height: 24px; - margin-bottom: 24px; display: inline-block; + height: 24px; + margin-bottom: 40px; margin-top: 40px; .toggle { @@ -16,15 +16,31 @@ display: inline-block; width: 24px; height: 24px; - background: var(--white) url("~src/assets/images/icons/add_cirle_24.svg") no-repeat center; + background: var(--white) url("~src/assets/images/icons/add_cirle_24dp.svg") no-repeat center; content: ''; z-index: 0; bottom: -2px; position: absolute; left: 0px; } - &.active::after{ - transform: rotate(180deg); + &:hover{ + &:before{ + 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"); + }; + color: var(--blue-3); + } + &.active{ + &:before{ + background-image: url("~src/assets/images/icons/add_cirle_active_24dp.svg"); + } + &:after{ + transform: rotate(180deg); + background-image: url("~src/assets/images/icons//arrow_drop_down_active_24dp.svg"); + }; + color: var(--blue-3); } &:after { display: inline-block; @@ -97,7 +113,7 @@ .sub-row { padding: 12px 16px 12px 32px; border-bottom: #E0E0E0 solid 1px; - color: var(--grey-4); + color: #6C6C6C; cursor: pointer; &:hover { background-color: #f7f7f7; diff --git a/src/app/_modules/pages/sections/types/basic/button/button-section.component.scss b/src/app/_modules/pages/sections/types/basic/button/button-section.component.scss index b941511..e69de29 100644 --- a/src/app/_modules/pages/sections/types/basic/button/button-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/button/button-section.component.scss @@ -1,8 +0,0 @@ -a { - display: inline-block; - margin: 0 16px 16px 0; - padding: 11px 24px; - background-color: #F9B417; - border-radius: 20px; - color: #ffffff; -} diff --git a/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.html b/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.html index 232c32b..c68f65e 100644 --- a/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.html @@ -1,8 +1,13 @@

+

Юридический адрес

+

Фактический адрес

+

Email

{{email}}

+

Телефон

+

Информация

diff --git a/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.scss b/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.scss index c66a983..5dd025a 100644 --- a/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.scss @@ -2,35 +2,18 @@ margin-bottom: 40px; h2 { - color: var(--grey-7); - font-size: 1.5rem; - line-height: 30px; - font-weight: 400; + color: #2D2D2D; + font-family: PT Sans Narrow; + font-size: 24px; + font-style: normal; + font-weight: 700; + line-height: 32px; /* 133.333% */ + letter-spacing: 0.24px; + margin-bottom: 32px; } - p { - display: flex; - &:before { - content: ''; - width: 24px; - height: 24px; - display: block; - margin-right: 8px; - background-repeat: no-repeat; - background-position: center; - } - - &.legal-address:before { - background-image: url("~src/assets/images/icons/location_orange_24dp.svg"); - } - &.local-address:before { - background-image: url("~src/assets/images/icons/mail_orange_24dp.svg"); - } - &.email:before { - background-image: url("~src/assets/images/icons/email_orange_24dp.svg"); - } - &.phone:before { - background-image: url("~src/assets/images/icons/phone_orange_24dp.svg"); - } + p{ + margin-bottom: 24px; } + } diff --git a/src/app/_modules/pages/sections/types/basic/html/html-section.component.scss b/src/app/_modules/pages/sections/types/basic/html/html-section.component.scss index 3bee55d..68e5e37 100644 --- a/src/app/_modules/pages/sections/types/basic/html/html-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/html/html-section.component.scss @@ -11,5 +11,6 @@ color: var(--blue-3); }; } - + + } diff --git a/src/assets/css/basics.scss b/src/assets/css/basics.scss index d993fb8..3e142b3 100644 --- a/src/assets/css/basics.scss +++ b/src/assets/css/basics.scss @@ -96,6 +96,21 @@ span.link { .op-63{ opacity: 0.63; } +html-section ul{ + padding: 0; + >li{ + list-style: none; + &::before{ + display: inline-block; + content: ""; + width: 16px; + height: 2px; + background-color: var(--blue-1); + margin-bottom: 5px; + margin-right: 16px; + } + } +} @media screen and (min-width: 1240px) { diff --git a/src/assets/css/buttons.scss b/src/assets/css/buttons.scss index dd8ebe6..95bb5d3 100644 --- a/src/assets/css/buttons.scss +++ b/src/assets/css/buttons.scss @@ -1,4 +1,4 @@ -button { +button, .btn, a.btn { display: inline-flex; padding: 8px 24px; justify-content: center; diff --git a/src/assets/images/icons/add_circle_24.svg b/src/assets/images/icons/add_cirle_24dp.svg similarity index 100% rename from src/assets/images/icons/add_circle_24.svg rename to src/assets/images/icons/add_cirle_24dp.svg diff --git a/src/assets/images/icons/add_cirle_active_24dp.svg b/src/assets/images/icons/add_cirle_active_24dp.svg new file mode 100644 index 0000000..d4742c3 --- /dev/null +++ b/src/assets/images/icons/add_cirle_active_24dp.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/icons/arrow_drop_down_active_24dp.svg b/src/assets/images/icons/arrow_drop_down_active_24dp.svg new file mode 100644 index 0000000..13d86cf --- /dev/null +++ b/src/assets/images/icons/arrow_drop_down_active_24dp.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/icons/document_pdf_60dp.svg b/src/assets/images/icons/document_pdf_60dp.svg new file mode 100644 index 0000000..16396f1 --- /dev/null +++ b/src/assets/images/icons/document_pdf_60dp.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/styles.scss b/src/styles.scss index d60edc2..70876d5 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -16,9 +16,9 @@ font-family: "PT Sans"; } -li { - //list-style-image: url("~src/assets/images/icons/add_24dp.svg"); -} +// li { +// list-style-image: url("~src/assets/images/icons/add_24dp.svg"); +// } // .btn { // font-weight: 500; @@ -31,7 +31,7 @@ li { .menu { display: flex; .block { - margin: 12px 0; + margin-bottom: 24px; background: #fff; border: 1px solid #C0C0C0; border-radius: 12px;