diff --git a/my-workspace/projects/sae-lib/chatbot/bot-talks/bot-talks.scss b/my-workspace/projects/sae-lib/chatbot/bot-talks/bot-talks.scss index 6e93876..b9d36ed 100644 --- a/my-workspace/projects/sae-lib/chatbot/bot-talks/bot-talks.scss +++ b/my-workspace/projects/sae-lib/chatbot/bot-talks/bot-talks.scss @@ -89,6 +89,7 @@ width: 32px; height: 32px; border-radius: 8px; + margin-right: 10px; } app-copy button.copy { diff --git a/my-workspace/projects/sae-lib/filters/filters-group/filters-group.scss b/my-workspace/projects/sae-lib/filters/filters-group/filters-group.scss index 8c67de4..878c4b3 100644 --- a/my-workspace/projects/sae-lib/filters/filters-group/filters-group.scss +++ b/my-workspace/projects/sae-lib/filters/filters-group/filters-group.scss @@ -67,7 +67,7 @@ .chips-listing { display: flex; position: absolute; - top: 560px; + top: 595px; margin-top: 16px; border-radius: 4px; background: variables.$csc-filters-box-color; diff --git a/my-workspace/projects/sae-lib/inputs/multi-selector/multi-selector.scss b/my-workspace/projects/sae-lib/inputs/multi-selector/multi-selector.scss index 7122f87..9e890f1 100644 --- a/my-workspace/projects/sae-lib/inputs/multi-selector/multi-selector.scss +++ b/my-workspace/projects/sae-lib/inputs/multi-selector/multi-selector.scss @@ -199,8 +199,16 @@ .placeholder, .fake-input { border: solid 1px grey; - padding: 16px; - border-radius: 6px; + border-radius: 8px; + background-color: white; + padding: 10px 40px; + width: 100%; + height: 42px; + overflow: hidden; + color: var(--color-text-secondary, #525668); + text-overflow: ellipsis; + font-size: var(--Font-Base, 14px); + .is-disabled & { color: grey; diff --git a/sae-csc/public/chatbot.png b/sae-csc/public/chatbot.png new file mode 100644 index 0000000..22cf408 Binary files /dev/null and b/sae-csc/public/chatbot.png differ diff --git a/sae-csc/src/app/pages/main/main.scss b/sae-csc/src/app/pages/main/main.scss index 2156f67..9880836 100644 --- a/sae-csc/src/app/pages/main/main.scss +++ b/sae-csc/src/app/pages/main/main.scss @@ -9,11 +9,18 @@ font-size: 16px; line-height: 140%; + color: #000; + font-family: Barlow; + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: 140%; /* 22.4px */ + } sae-bot-talks { - top: -50px; - left: 67px; + top: -68px; + left: 10px; position: relative; } } @@ -34,6 +41,8 @@ #translation_request { + margin-bottom: 80px; + .helper { display: flex; flex-direction: row; diff --git a/sae-csc/src/app/pages/similar-cases/similar-cases.html b/sae-csc/src/app/pages/similar-cases/similar-cases.html index d2eacfc..4dc5a0b 100644 --- a/sae-csc/src/app/pages/similar-cases/similar-cases.html +++ b/sae-csc/src/app/pages/similar-cases/similar-cases.html @@ -59,7 +59,7 @@
-
+
+
+ - - - - - - - - - +
} diff --git a/sae-csc/src/app/shared/translate-texts/translate-texts.html b/sae-csc/src/app/shared/translate-texts/translate-texts.html index 28dd7bf..5c712ff 100644 --- a/sae-csc/src/app/shared/translate-texts/translate-texts.html +++ b/sae-csc/src/app/shared/translate-texts/translate-texts.html @@ -1,20 +1,23 @@
- + +
@if (!fileIsUploaded || !appState.fromText.length || !fromTextFocused) { - - - - + + + } + } diff --git a/sae-csc/src/app/shared/translate-texts/translate-texts.ts b/sae-csc/src/app/shared/translate-texts/translate-texts.ts index a5885fc..22a3494 100644 --- a/sae-csc/src/app/shared/translate-texts/translate-texts.ts +++ b/sae-csc/src/app/shared/translate-texts/translate-texts.ts @@ -12,6 +12,7 @@ import {ActionTypes, StateInterface} from './../../redux/reducers'; }) export class TranslateTexts { public disabled: boolean = false; + public showFileUploadButton: boolean = true; public researchLaunched: boolean = false; public fromText: string = ''; public toText: string = 'résumé ici' diff --git a/sae-csc/src/styles/app/styles/pages/_main.scss b/sae-csc/src/styles/app/styles/pages/_main.scss index 5742e46..3464494 100644 --- a/sae-csc/src/styles/app/styles/pages/_main.scss +++ b/sae-csc/src/styles/app/styles/pages/_main.scss @@ -52,7 +52,7 @@ body { position: fixed; bottom: 0; width: 100%; - padding: 16px 64px 16px 1181px; + padding: 16px 64px; justify-content: flex-end; align-items: center; background: white; @@ -61,5 +61,11 @@ body { box-shadow: 0 -10px 20px 0 rgba(30, 31, 34, 0.05); + .container-fixed { + margin: 0 auto; + width: 1330px; + text-align: right; + } + } diff --git a/sae-csc/src/styles/app/styles/pages/_similar-cases.scss b/sae-csc/src/styles/app/styles/pages/_similar-cases.scss index b7d8c40..a9c3d5a 100644 --- a/sae-csc/src/styles/app/styles/pages/_similar-cases.scss +++ b/sae-csc/src/styles/app/styles/pages/_similar-cases.scss @@ -49,7 +49,4 @@ } } - .bot-avatar { - background: transparent url('/public/chatbot.png') center center no-repeat; - } } diff --git a/sae-csc/src/styles/main.scss b/sae-csc/src/styles/main.scss index 1ab68fd..661a0ab 100644 --- a/sae-csc/src/styles/main.scss +++ b/sae-csc/src/styles/main.scss @@ -1,4 +1,9 @@ +@use "app/styles/pages/main.scss"; +@use "app/styles/pages/similar-cases.scss"; +@use "app/styles/pages/admin.scss"; -@use "app/styles/pages/main.scss"; -@use "app/styles/pages/similar-cases.scss"; -@use "app/styles/pages/admin.scss"; +.bot-avatar { + background: transparent url('public/chatbot.png') center center no-repeat !important; + background-size: contain; + +}