From 2be36b7aa2d778479615e237344193fc500a307d Mon Sep 17 00:00:00 2001 From: Kyrylo Petrov Date: Thu, 20 Mar 2025 16:48:46 +0200 Subject: [PATCH] chore(profile-settings): name tab design # Conflicts: # src/assets/styles/styles.scss --- .../logged-out/home-logged-out.component.html | 14 ++- .../profile-settings.component.html | 105 ++++++++++++++++++ .../profile-settings.component.scss | 36 ++++++ .../profile-settings.component.ts | 16 ++- src/assets/styles/overrides/button.scss | 7 +- src/assets/styles/overrides/tabs.scss | 22 ++++ src/assets/styles/styles.scss | 1 + 7 files changed, 192 insertions(+), 9 deletions(-) create mode 100644 src/assets/styles/overrides/tabs.scss diff --git a/src/app/features/home/logged-out/home-logged-out.component.html b/src/app/features/home/logged-out/home-logged-out.component.html index 94f473a82..d2ca38df9 100644 --- a/src/app/features/home/logged-out/home-logged-out.component.html +++ b/src/app/features/home/logged-out/home-logged-out.component.html @@ -11,12 +11,14 @@

OSF is a free, open platform to support your research and enable collaboration

- +
+ +
+ +
+ + + Name + Social + Employment + Education + + + + +
+

+ Your full name is the name that will be displayed in your profile. + To control the way your name will appear in citations, you can use + the "Auto-fill" button to automatically infer your first name, last + name, etc., or edit the fields directly below. +

+
+
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+ + +
+
+
+
+
+
+

Citation Preview

+
+
+
+

Style:

+

Citation format:

+
+
+

APA

+

Doe, J. T.

+
+
+ +
+
+

Style:

+

Citation format:

+
+
+

MLA

+

Doe, John T.

+
+
+
+
+
+ +
+ +
+ +
+
+
+ + + + employment + + + + education + +
+
+
diff --git a/src/app/features/settings/profile-settings/profile-settings.component.scss b/src/app/features/settings/profile-settings/profile-settings.component.scss index e69de29bb..1d9c6cc93 100644 --- a/src/app/features/settings/profile-settings/profile-settings.component.scss +++ b/src/app/features/settings/profile-settings/profile-settings.component.scss @@ -0,0 +1,36 @@ +@use "assets/styles/variables" as var; + +:host { + .name-container { + border: 1px solid var.$grey-2; + border-radius: 8px; + + h3 { + text-transform: none; + } + + label { + font-weight: 300; + color: var.$dark-blue-1; + } + + .name-input { + width: 100%; + height: 2.77rem; + border: 1px solid var.$grey-2; + border-radius: 8px; + } + + .styles-container { + column-gap: 8.5rem; + + h3 { + font-weight: 400; + } + + .style-wrapper { + row-gap: 0.85rem; + } + } + } +} diff --git a/src/app/features/settings/profile-settings/profile-settings.component.ts b/src/app/features/settings/profile-settings/profile-settings.component.ts index ed4fdece4..da7dcd94b 100644 --- a/src/app/features/settings/profile-settings/profile-settings.component.ts +++ b/src/app/features/settings/profile-settings/profile-settings.component.ts @@ -1,10 +1,22 @@ import { Component } from '@angular/core'; import { SubHeaderComponent } from '@shared/components/sub-header/sub-header.component'; +import { Tab, TabList, TabPanel, TabPanels, Tabs } from 'primeng/tabs'; +import { Button } from 'primeng/button'; @Component({ selector: 'osf-profile-settings', - imports: [SubHeaderComponent], + imports: [ + SubHeaderComponent, + TabList, + Tabs, + Tab, + TabPanel, + TabPanels, + Button, + ], templateUrl: './profile-settings.component.html', styleUrl: './profile-settings.component.scss', }) -export class ProfileSettingsComponent {} +export class ProfileSettingsComponent { + defaultTabValue = 0; +} diff --git a/src/assets/styles/overrides/button.scss b/src/assets/styles/overrides/button.scss index 28e5eca6b..83fd8d071 100644 --- a/src/assets/styles/overrides/button.scss +++ b/src/assets/styles/overrides/button.scss @@ -166,12 +166,17 @@ .wide-button { button { - margin-top: 1.7rem; padding: 0.71rem 2.39rem 0.71rem 2.39rem; line-height: 1.71rem; } } +.wide-m-button { + button { + padding: 0.71rem 3.9rem 0.71rem 3.9rem; + } +} + .learn-more { button { padding: 0.71rem 1.39rem; diff --git a/src/assets/styles/overrides/tabs.scss b/src/assets/styles/overrides/tabs.scss new file mode 100644 index 000000000..e9cbad9a6 --- /dev/null +++ b/src/assets/styles/overrides/tabs.scss @@ -0,0 +1,22 @@ +@use "assets/styles/variables" as var; + +.p-tablist-tab-list { + background: transparent; + border: none; + + .p-tab { + color: var.$dark-blue-1; + border: none; + } + + .p-tab-active { + background: white; + border-top-left-radius: 0.7rem; + border-top-right-radius: 0.7rem; + border-color: transparent; + } + + .p-tablist-active-bar { + display: none; + } +} diff --git a/src/assets/styles/styles.scss b/src/assets/styles/styles.scss index 4366f52c6..783e4b5c3 100644 --- a/src/assets/styles/styles.scss +++ b/src/assets/styles/styles.scss @@ -11,6 +11,7 @@ @use "./overrides/card"; @use "./overrides/carousel"; @use "./overrides/confirmation-dialog"; +@use "./overrides/tabs"; @layer base, primeng, reset;