Skip to content

Commit

Permalink
Merge branch 'main' of github.com:TYPO3incubator/surfcamp-team-jacuzzi
Browse files Browse the repository at this point in the history
  • Loading branch information
@o-ba
o-ba committed Apr 12, 2024
2 parents d38b108 + af8b9bb commit 960759f
Show file tree
Hide file tree
Showing 20 changed files with 1,234 additions and 592 deletions.
2 changes: 2 additions & 0 deletions local_packages/psi/Configuration/Sets/Psi/TsConfig/Page/TCEFORM.tsconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ TCEFORM {
// Header Link
header_link.disabled = 1

subheader.label = LLL:EXT:psi/Resources/Private/Language/locallang_db.xlf:tt_content.topline

frame_class {
disabled = 1
}
Expand Down
64 changes: 49 additions & 15 deletions local_packages/psi/Resources/Private/Language/es.locallang.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,85 @@
<body>
<trans-unit id="tt_content.pi_flexform.felogin_login.s_messages.status_header">
<source>Confidentiality Header</source>
<target>Encabezado de Confidencialidad</target>
</trans-unit>
<trans-unit id="tt_content.pi_flexform.felogin_login.s_messages.status_message">
<source>Confidentiality Message</source>
<target>Mensaje de Confidencialidad</target>
</trans-unit>
<trans-unit id="tt_content.pi_flexform.felogin_login.s_messages.error_header">
<source>Login failure</source>
<target>Error de inicio de sesión</target>
</trans-unit>
<trans-unit id="tt_content.pi_flexform.felogin_login.s_messages.error_message">
<source>An error occurred during login. Most likely you didn't enter the username or password correctly. Be certain that you enter them precisely as they are, including upper/lower case. Another possibility is that cookies might be disabled in your web browser.</source>
<target>Se produjo un error durante el inicio de sesión. Lo más probable es que no haya ingresado el nombre de usuario o la contraseña correctamente. Asegúrese de ingresarlos exactamente como son, incluyendo mayúsculas y minúsculas. Otra posibilidad es que las cookies estén desactivadas en su navegador web.</target>
</trans-unit>

<trans-unit id="fe_users.info.header">
<source>User information</source>
<target>Informaciones Usero</target>
<target>Información de Usuario</target>
</trans-unit>
<trans-unit id="fe_users.personal_info.header">
<source>Personal information</source>
<target>Información Personal</target>
</trans-unit>
<trans-unit id="fe_users.contact.header">
<source>Contact information</source>
<trans-unit id="fe_users.address.header">
<source>Address</source>
<target>Dirección</target>
</trans-unit>
<trans-unit id="fe_users.bio.header">
<source>Short Bio</source>
<trans-unit id="fe_users.profile.header">
<source>Personal Profile</source>
<target>Perfil Personal</target>
</trans-unit>

<trans-unit id="fe_users.profile.label">
<source>Address</source>
<target>Dirección</target>
</trans-unit>
<trans-unit id="fe_users.firstname.label">
<source>First Name:</source>
<source>First Name</source>
<target>Nombre</target>
</trans-unit>
<trans-unit id="fe_users.lastname.label">
<source>Last Name:</source>
<source>Last Name</source>
<target>Apellido</target>
</trans-unit>
<trans-unit id="fe_users.title.label">
<source>Position / Department:</source>
<source>Position / Department</source>
<target>Puesto / Departamento</target>
</trans-unit>
<trans-unit id="fe_users.address.label">
<source>Address:</source>
<source>Address</source>
<target>Dirección</target>
</trans-unit>
<trans-unit id="fe_users.country.label">
<source>Country:</source>
<source>Country</source>
<target>País</target>
</trans-unit>
<trans-unit id="fe_users.city.label">
<source>City:</source>
<source>City</source>
<target>Ciudad</target>
</trans-unit>
<trans-unit id="fe_users.zip.label">
<source>ZIP Code:</source>
<source>ZIP Code</source>
<target>Código Postal</target>
</trans-unit>
<trans-unit id="fe_users.email.label">
<source>Email Address:</source>
<source>Email Address</source>
<target>Correo Electrónico</target>
</trans-unit>
<trans-unit id="fe_users.telephone.label">
<source>Telephone:</source>
<source>Telephone</source>
<target>Teléfono</target>
</trans-unit>
<trans-unit id="fe_users.fax.label">
<source>Fax:</source>
<source>Fax</source>
<target>Fax</target>
</trans-unit>
<trans-unit id="fe_users.bio.label">
<source>Bio</source>
<target>Biografía</target>
</trans-unit>
<trans-unit id="breadcrumb">
<source>You are on page:</source>
Expand Down
43 changes: 29 additions & 14 deletions local_packages/psi/Resources/Private/Language/locallang.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,46 +9,61 @@
<trans-unit id="tt_content.pi_flexform.felogin_login.s_messages.status_message">
<source>Confidentiality Message</source>
</trans-unit>
<trans-unit id="tt_content.pi_flexform.felogin_login.s_messages.error_header">
<source>Login failure</source>
</trans-unit>
<trans-unit id="tt_content.pi_flexform.felogin_login.s_messages.error_message">
<source>An error occurred during login. Most likely you didn't enter the username or password correctly. Be certain that you enter them precisely as they are, including upper/lower case. Another possibility is that cookies might be disabled in your web browser.</source>
</trans-unit>

<trans-unit id="fe_users.info.header">
<source>User information</source>
</trans-unit>
<trans-unit id="fe_users.contact.header">
<source>Contact information</source>
<trans-unit id="fe_users.personal_info.header">
<source>Personal information</source>
</trans-unit>
<trans-unit id="fe_users.address.header">
<source>Address</source>
</trans-unit>
<trans-unit id="fe_users.bio.header">
<source>Short Bio</source>
<trans-unit id="fe_users.profile.header">
<source>Personal Profile</source>
</trans-unit>

<trans-unit id="fe_users.profile.label">
<source>Address</source>
</trans-unit>
<trans-unit id="fe_users.firstname.label">
<source>First Name:</source>
<source>First Name</source>
</trans-unit>
<trans-unit id="fe_users.lastname.label">
<source>Last Name:</source>
<source>Last Name</source>
</trans-unit>
<trans-unit id="fe_users.title.label">
<source>Position / Department:</source>
<source>Position / Department</source>
</trans-unit>
<trans-unit id="fe_users.address.label">
<source>Address:</source>
<source>Address</source>
</trans-unit>
<trans-unit id="fe_users.country.label">
<source>Country:</source>
<source>Country</source>
</trans-unit>
<trans-unit id="fe_users.city.label">
<source>City:</source>
<source>City</source>
</trans-unit>
<trans-unit id="fe_users.zip.label">
<source>ZIP Code:</source>
<source>ZIP Code</source>
</trans-unit>
<trans-unit id="fe_users.email.label">
<source>Email Address:</source>
<source>Email Address</source>
</trans-unit>
<trans-unit id="fe_users.telephone.label">
<source>Telephone:</source>
<source>Telephone</source>
</trans-unit>
<trans-unit id="fe_users.fax.label">
<source>Fax:</source>
<source>Fax</source>
</trans-unit>
<trans-unit id="fe_users.bio.label">
<source>Bio</source>
</trans-unit>
<trans-unit id="breadcrumb">
<source>You are on page:</source>
Expand Down
3 changes: 3 additions & 0 deletions local_packages/psi/Resources/Private/Language/locallang_db.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
<file source-language="en" datatype="plaintext" date="2024-04-08T16:16:32Z" product-name="psi">
<header/>
<body>
<trans-unit id="tt_content.topline">
<source>Topline</source>
</trans-unit>
<trans-unit id="tt_content.ctype.employee_list">
<source>Employee List</source>
</trans-unit>
Expand Down
6 changes: 3 additions & 3 deletions local_packages/psi/Resources/Private/Scss/Base/_globals.scss
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*,
*,
:before,
:after {
padding: 0;
Expand All @@ -12,7 +12,7 @@ html {
}

body {
font-family: $font-family-main;
font-family: $font-family-main, sans-serif;
font-weight: 400;
color: var(--text, #1d0b1e);
position: relative;
Expand Down Expand Up @@ -58,4 +58,4 @@ section {

a {
color: var(--link);
}
}
10 changes: 5 additions & 5 deletions local_packages/psi/Resources/Private/Scss/Base/_grid.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
padding-right: calc(var(--gutter) / 2);

.row {
display: flex;
display: flex;
flex-wrap: wrap;
gap: var(--gutter);
column-gap: var(--gutter);
}

.col {
Expand Down Expand Up @@ -73,14 +73,14 @@
flex-basis: calc((100% - #{map-get($grid-config, gutter)} * 2 ) / #{map-get($grid-config, columns)} * #{$i});
}

}
}
@for $i from 1 through map-get($grid-config, columns) {
.#{$bp}-offset-#{$i}-l {
margin-right: calc(100% / (#{map-get($grid-config, columns)} / #{$i}));
}
.#{$bp}-offset-#{$i}-r {
margin-right: calc(100% / (#{map-get($grid-config, columns)} / #{$i}));
}
}
}
}
}
}
27 changes: 14 additions & 13 deletions local_packages/psi/Resources/Private/Scss/Base/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ $secondary: #99D6B4;
$accent: #79C9B2;
$light: #F4F9F1;
$dark: #090C05;
$white: #FFFFFF;

// utility
// utility
$success: $primary;
$error: #FF5D2D;
$warn: #F4C659;
Expand All @@ -46,13 +47,13 @@ $contrast-accent: #D5C904;
$contrast-light: #F4F9F1;
$contrast-dark: #090C05;

// utility
// utility
$contrast-success: $success;
$contrast-error: $error;
$contrast-warn: $warn;
$contrast-hint: $hint;

// color scheme handling
// color scheme handling
$color-themes: (
// light theme colors
light: (
Expand All @@ -61,18 +62,18 @@ $color-themes: (
accent: $accent,
light: $light,
dark: $dark,
background: #fff,
background: $white,
text: $dark,
text-light: #6F6F6F,
link: $primary,
// utility

// utility
success: $success,
error: $error,
warn: $warn,
hint: $hint,
),
),

contrastMode: (
primary: $contrast-primary,
secondary: $contrast-secondary,
Expand All @@ -82,7 +83,7 @@ $color-themes: (
text-light: $contrast-secondary,
link: var(--primary),

// utility
// utility
success: $contrast-success,
error: $contrast-error,
warn: $contrast-warn,
Expand All @@ -99,7 +100,7 @@ $color-themes: (
// generating base root
:root{
@each $key, $val in $map{
--#{$key}: #{$val};
--#{$key}: #{$val};
}

}
Expand All @@ -121,7 +122,7 @@ $color-themes: (
}

$spacings: (
4,
4,
8,
16
24,
Expand Down Expand Up @@ -150,6 +151,6 @@ $border-radius: (
large: toUnit(12, 'px')
);

$box-shadow-shade: color-mix(in srgb, var(--dark), transparent 70%);
$box-shadow-shade: color-mix(in srgb, var(--dark), transparent 70%);
$box-shadow-small: 0 0 rem(4) 0 $box-shadow-shade;
$box-shadow-medium: 0 0 rem(8) 0 $box-shadow-shade;
$box-shadow-medium: 0 0 rem(8) 0 $box-shadow-shade;
26 changes: 22 additions & 4 deletions local_packages/psi/Resources/Private/Scss/Components/_employee_list.scss
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
.employee {

&__list {
row-gap: var(--gutter);
}

&__item {
display: flex;
flex-direction: row;
padding: 16px;
padding: rem(16) rem(24);
gap: 34px;
background: $secondary;
background: var(--light);
}

&__image {
width: 100%;
height: 72px;
max-width: 72px;
height: rem(72);
max-width: rem(72);
object-fit: cover;
border-radius: 50%;
box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
Expand All @@ -21,6 +26,7 @@
display: flex;
flex-direction: column;
width: 100%;
word-break: break-word;
}

&__title {
Expand All @@ -40,6 +46,18 @@
& + & {
margin-top: 6px;
}

a {
color: var(--primary);
text-decoration: none;
border-bottom: 1px solid var(--primary);

&:hover,
&:focus,
&:active {
border-bottom: 2px dashed;
}
}
}

&__label {
Expand Down
2 changes: 1 addition & 1 deletion local_packages/psi/Resources/Private/Scss/Components/_image.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
}

&__figure {
margin: 0;
margin: 32px 0 0;
}

&__file {
Expand Down
Loading

0 comments on commit 960759f

Please sign in to comment.