From a9534bd3a30c1b250ca4fb64d14c3eb4bfe7a57a Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Thu, 31 Aug 2023 15:50:13 +0300 Subject: [PATCH] News --- .gitignore | 2 ++ .../image/form-field-image.component.scss | 1 + .../single/field-image-single.component.html | 7 +++-- .../publications/list/list.component.html | 2 +- .../publications/list/list.component.scss | 27 ++++++++++++------- .../images/icons/add_cirle_hover_24dp.svg | 3 +++ src/environments/environment.ts | 2 +- 7 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 src/assets/images/icons/add_cirle_hover_24dp.svg diff --git a/.gitignore b/.gitignore index b646978..e0bbc26 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ testem.log # System Files .DS_Store Thumbs.db + +/src/environments/environment.ts diff --git a/src/app/_modules/form-fields/types/image/form-field-image.component.scss b/src/app/_modules/form-fields/types/image/form-field-image.component.scss index aeaedbd..047f0ec 100644 --- a/src/app/_modules/form-fields/types/image/form-field-image.component.scss +++ b/src/app/_modules/form-fields/types/image/form-field-image.component.scss @@ -6,6 +6,7 @@ border: var(--blue-1) dashed 1px; border-radius: 4px; overflow: hidden; + font-size: 20px; &.hover { background-color: #e0e0e0; } diff --git a/src/app/_modules/form-fields/types/image/single/field-image-single.component.html b/src/app/_modules/form-fields/types/image/single/field-image-single.component.html index fc88ad0..e3716be 100644 --- a/src/app/_modules/form-fields/types/image/single/field-image-single.component.html +++ b/src/app/_modules/form-fields/types/image/single/field-image-single.component.html @@ -1,6 +1,9 @@
-

Перетащите сюда или выберите файл в формате JPEG или PNG общим объемом не более 10 Мбайт.

+

Перетащите сюда или + выберите файл + +

Загружается файл {{upload.file?.name}}
@@ -9,6 +12,6 @@
- +
diff --git a/src/app/_modules/publications/list/list.component.html b/src/app/_modules/publications/list/list.component.html index 662e729..d57dbe4 100644 --- a/src/app/_modules/publications/list/list.component.html +++ b/src/app/_modules/publications/list/list.component.html @@ -1,6 +1,6 @@
-
+
Добавить публикацию
diff --git a/src/app/_modules/publications/list/list.component.scss b/src/app/_modules/publications/list/list.component.scss index e5a8b34..5814262 100644 --- a/src/app/_modules/publications/list/list.component.scss +++ b/src/app/_modules/publications/list/list.component.scss @@ -6,20 +6,27 @@ margin: 24px 0; width: 100%; .toggle { - height: 2px; - background-color: #CFD1D4; - width: 100%; - position: relative; - margin-bottom: 24px; + .button { - top: -11px; - left: calc(50% - 12px); - position: absolute; + display: inline-block; + font-size: 20px; + color: var(--blue-1); + vertical-align: 4px; + padding-left: 8px; + &:hover{ + color: var(--blue-2); + } + }; + &::before{ + content: ""; + display: inline-block; width: 24px; height: 24px; - background: url("~src/assets/images/icons/add_24dp.svg") no-repeat center #ffffff; - cursor: pointer; + background: url('~src/assets/images/icons/add_cirle_24dp.svg') center no-repeat; } + &:hover::before{ + background: url('~src/assets/images/icons/add_cirle_hover_24dp.svg') center no-repeat; + } } } } diff --git a/src/assets/images/icons/add_cirle_hover_24dp.svg b/src/assets/images/icons/add_cirle_hover_24dp.svg new file mode 100644 index 0000000..e1ef099 --- /dev/null +++ b/src/assets/images/icons/add_cirle_hover_24dp.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/environments/environment.ts b/src/environments/environment.ts index c8fa2b3..9f8d59d 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: 'SmnyQ492ZRhPX4tQKCg9VHyXK6dP1qrawnFhy8aM', + clientSecret: 'tsfYTWRzbK1okzbN1jX0JeGkMu3c42H6hJF3NhBv', }; /*