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..74b0190 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/footer/footer.component.html b/frontend/src/app/components/footer/footer.component.html index b9fbc43..99b3a78 100644 --- a/frontend/src/app/components/footer/footer.component.html +++ b/frontend/src/app/components/footer/footer.component.html @@ -2,7 +2,7 @@ © 2016 - 2024 All rights reserved - - 2.0-alpha + 2.1 favorite diff --git a/frontend/src/app/components/header/header.component.html b/frontend/src/app/components/header/header.component.html index 46ea23c..17a4b46 100644 --- a/frontend/src/app/components/header/header.component.html +++ b/frontend/src/app/components/header/header.component.html @@ -1,5 +1,10 @@
- @@ -14,7 +19,10 @@
@if (isAuthenticated) { - @@ -30,7 +38,7 @@
} @else { -
Login + Login }
\ No newline at end of file diff --git a/frontend/src/app/components/header/header.component.scss b/frontend/src/app/components/header/header.component.scss index f331cd7..a17213b 100644 --- a/frontend/src/app/components/header/header.component.scss +++ b/frontend/src/app/components/header/header.component.scss @@ -26,25 +26,6 @@ $headerHeight: 3.5em; padding: 0 1em; z-index: 2; - button { - background-color: #3f51b5; - color: white; - border: none; - border-radius: 10em; - transition: background-color .2s ease-in-out; - display: flex; - justify-content: center; - align-items: center; - $buttonSize: 2.5em; - width: $buttonSize; - height: $buttonSize; - - &:hover { - cursor: pointer; - background-color: #5c6bc0; - } - } - a { display: flex; flex-direction: row; @@ -120,45 +101,10 @@ $headerHeight: 3.5em; top: 0; right: 0; z-index: 2; - - a { - display: flex; - justify-content: center; - align-items: center; - min-width: 5em; - color: white; - margin: 0.5em 0.5em; - border-radius: 10em; - text-decoration: none; - padding: 0 .8em; - background-color: #3f51b5; - transition: background-color .2s ease-in-out; - - &:hover { - background-color: #5c6bc0; - } - } - - button { - display: flex; - justify-content: center; - align-items: center; - min-width: 2.5em; - color: white; - margin: 0.5em 0.5em; - border-radius: 10em; - text-decoration: none; - padding: 0; - background-color: #3f51b5; - transition: background-color .2s ease-in-out; - - &:hover { - background-color: #5c6bc0; - } - - mat-icon { - margin: 0; - } + margin-right: .5em; + + a, button { + margin: .5em; } } } 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..abd2006 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,15 @@ -

Add a code block

-
+
Programming language @@ -21,11 +26,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..e21d3e8 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 @@ -6,20 +6,6 @@ position: relative; max-height: 90vh; - .close { - position: absolute; - top: 1em; - right: 1em; - width: 2.5em; - height: 2.5em; - border-radius: 10em; - border: none; - display: flex; - justify-content: center; - align-items: center; - cursor: pointer; - } - header { flex: 1; display: flex; @@ -39,40 +25,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..cb1a5b1 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,10 +1,12 @@ 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"; import { MatInputModule } from "@angular/material/input"; import { MatSelectModule } from '@angular/material/select'; +import { MatTooltip } from "@angular/material/tooltip"; export interface ProgramingLanguage { code: string; @@ -91,7 +93,9 @@ export const PROGRAMMING_LANGUAGES: ProgramingLanguage[] = [ MatFormFieldModule, MatIcon, MatInputModule, + MatRippleModule, MatSelectModule, + MatTooltip, 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..ddbe7ed 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,9 @@ -
@@ -19,10 +24,18 @@ }