From 7f99d1120906d0b20e766367b41d8c25fa6fe57b Mon Sep 17 00:00:00 2001 From: Florian THIERRY Date: Mon, 21 Oct 2024 15:15:53 +0200 Subject: [PATCH] Add ripple everywhere. --- .../confirmation-dialog.component.html | 4 +- .../confirmation-dialog.component.scss | 27 ----------- .../confirmation-dialog.component.ts | 3 +- .../components/header/header.component.html | 13 +++-- .../code-block-dialog.component.html | 10 ++-- .../code-block-dialog.component.scss | 34 ------------- .../code-block-dialog.component.ts | 2 + .../picture-selection-dialog.component.html | 14 ++++-- .../picture-selection-dialog.component.ts | 7 ++- .../publication-edition.component.html | 48 +++++++++++++++---- .../publication-edition.component.scss | 42 ++++++---------- .../publication-edition.component.ts | 2 + .../publications-search-bar.component.html | 2 +- .../publications-search-bar.component.scss | 2 +- .../publications-search-bar.component.ts | 7 +-- .../side-menu/side-menu.component.html | 6 ++- .../side-menu/side-menu.component.ts | 11 ++++- .../submit-button.component.html | 3 +- .../submit-button/submit-button.component.ts | 10 ++-- .../src/app/pages/login/login.component.html | 2 +- .../src/app/pages/login/login.component.ts | 9 +++- .../publication/publication.component.html | 2 + .../publication/publication.component.ts | 32 ++++++++----- .../app/pages/signin/signin.component.html | 2 +- .../src/app/pages/signin/signin.component.ts | 9 +++- 25 files changed, 163 insertions(+), 140 deletions(-) diff --git a/frontend/src/app/components/confirmation-dialog/confirmation-dialog.component.html b/frontend/src/app/components/confirmation-dialog/confirmation-dialog.component.html index 0a786dc..5b937df 100644 --- a/frontend/src/app/components/confirmation-dialog/confirmation-dialog.component.html +++ b/frontend/src/app/components/confirmation-dialog/confirmation-dialog.component.html @@ -1,10 +1,10 @@

{{title}}

{{description}}

\ No newline at end of file diff --git a/frontend/src/app/components/confirmation-dialog/confirmation-dialog.component.scss b/frontend/src/app/components/confirmation-dialog/confirmation-dialog.component.scss index 00feaa3..23e6e87 100644 --- a/frontend/src/app/components/confirmation-dialog/confirmation-dialog.component.scss +++ b/frontend/src/app/components/confirmation-dialog/confirmation-dialog.component.scss @@ -8,32 +8,5 @@ display: flex; flex-direction: row; justify-content: space-between; - - button { - padding: .8em 1.2em; - border-radius: 10em; - border: none; - background-color: #3f51b5; - color: white; - transition: background-color .2s ease-in-out; - cursor: pointer; - display: flex; - justify-content: center; - align-items: center; - - &:hover { - background-color: #5b6ed8; - } - - &.secondary { - color: #3f51b5; - background-color: white; - - &:hover { - background-color: #f2f4ff; - cursor: pointer; - } - } - } } } \ No newline at end of file diff --git a/frontend/src/app/components/confirmation-dialog/confirmation-dialog.component.ts b/frontend/src/app/components/confirmation-dialog/confirmation-dialog.component.ts index 7636cef..a3d342b 100644 --- a/frontend/src/app/components/confirmation-dialog/confirmation-dialog.component.ts +++ b/frontend/src/app/components/confirmation-dialog/confirmation-dialog.component.ts @@ -1,4 +1,5 @@ import { Component, inject, Input } from "@angular/core"; +import { MatRippleModule } from "@angular/material/core"; import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog"; export interface ConfirmationDialogData { @@ -11,7 +12,7 @@ export interface ConfirmationDialogData { standalone: true, templateUrl: './confirmation-dialog.component.html', styleUrl: './confirmation-dialog.component.scss', - imports: [] + imports: [MatRippleModule] }) export class ConfirmationDialog { private readonly dialogRef = inject(MatDialogRef); diff --git a/frontend/src/app/components/header/header.component.html b/frontend/src/app/components/header/header.component.html index 46ea23c..4ea9f1b 100644 --- a/frontend/src/app/components/header/header.component.html +++ b/frontend/src/app/components/header/header.component.html @@ -1,5 +1,9 @@ \ No newline at end of file diff --git a/frontend/src/app/components/publication-edition/code-block-dialog/code-block-dialog.component.html b/frontend/src/app/components/publication-edition/code-block-dialog/code-block-dialog.component.html index ec52fba..05bd861 100644 --- a/frontend/src/app/components/publication-edition/code-block-dialog/code-block-dialog.component.html +++ b/frontend/src/app/components/publication-edition/code-block-dialog/code-block-dialog.component.html @@ -1,10 +1,10 @@ -

Add a code block

-
+
Programming language @@ -21,11 +21,11 @@
-
- -
diff --git a/frontend/src/app/components/publication-edition/code-block-dialog/code-block-dialog.component.scss b/frontend/src/app/components/publication-edition/code-block-dialog/code-block-dialog.component.scss index 577224e..30239c5 100644 --- a/frontend/src/app/components/publication-edition/code-block-dialog/code-block-dialog.component.scss +++ b/frontend/src/app/components/publication-edition/code-block-dialog/code-block-dialog.component.scss @@ -39,40 +39,6 @@ } } } - - &.actions { - display: flex; - flex-direction: row-reverse; - justify-content: space-between; - align-items: center; - - button { - padding: .8em 1.2em; - border-radius: 10em; - border: none; - background-color: #3f51b5; - color: white; - transition: background-color .2s ease-in-out; - cursor: pointer; - display: flex; - justify-content: center; - align-items: center; - - &:hover { - background-color: #5b6ed8; - } - - &.secondary { - color: #3f51b5; - background-color: white; - - &:hover { - background-color: #f2f4ff; - cursor: pointer; - } - } - } - } } } } \ No newline at end of file diff --git a/frontend/src/app/components/publication-edition/code-block-dialog/code-block-dialog.component.ts b/frontend/src/app/components/publication-edition/code-block-dialog/code-block-dialog.component.ts index ad877eb..61cec69 100644 --- a/frontend/src/app/components/publication-edition/code-block-dialog/code-block-dialog.component.ts +++ b/frontend/src/app/components/publication-edition/code-block-dialog/code-block-dialog.component.ts @@ -1,5 +1,6 @@ import { Component, inject } from "@angular/core"; import { FormBuilder, FormControl, ReactiveFormsModule, Validators } from "@angular/forms"; +import { MatRippleModule } from "@angular/material/core"; import { MatDialogRef } from "@angular/material/dialog"; import { MatFormFieldModule } from "@angular/material/form-field"; import { MatIcon } from "@angular/material/icon"; @@ -91,6 +92,7 @@ export const PROGRAMMING_LANGUAGES: ProgramingLanguage[] = [ MatFormFieldModule, MatIcon, MatInputModule, + MatRippleModule, MatSelectModule, ReactiveFormsModule, ] diff --git a/frontend/src/app/components/publication-edition/picture-selection-dialog/picture-selection-dialog.component.html b/frontend/src/app/components/publication-edition/picture-selection-dialog/picture-selection-dialog.component.html index 1eabfdc..e9e4d8b 100644 --- a/frontend/src/app/components/publication-edition/picture-selection-dialog/picture-selection-dialog.component.html +++ b/frontend/src/app/components/publication-edition/picture-selection-dialog/picture-selection-dialog.component.html @@ -1,4 +1,4 @@ -
@@ -19,10 +19,18 @@ }