Skip to content

Commit

Permalink
[TASK] Merge main into task/game-teaser
Browse files Browse the repository at this point in the history
  • Loading branch information
pixeldesu committed Apr 12, 2024
2 parents 852c4df + b4bdba5 commit 771c94f
Show file tree
Hide file tree
Showing 27 changed files with 610 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ renderables:
label: 'Lorem ipsum dolor sit'
renderables:
-
defaultValue: ''
defaultValue: 'Name *'
type: Text
identifier: text-1
label: Name
properties:
fluidAdditionalAttributes:
minlength: '3'
Expand All @@ -52,10 +51,9 @@ renderables:
-
identifier: NotEmpty
-
defaultValue: ''
defaultValue: 'E-Mail address *'
type: Email
identifier: email-1
label: 'Email address'
properties:
fluidAdditionalAttributes:
required: required
Expand All @@ -65,10 +63,9 @@ renderables:
-
identifier: NotEmpty
-
defaultValue: ''
type: Text
defaultValue: 'Subject *'
type: Textarea
identifier: text-3
label: Subject
properties:
fluidAdditionalAttributes:
minlength: '2'
Expand All @@ -78,7 +75,7 @@ renderables:
-
options:
minimum: '2'
maximum: '60'
maximum: '600'
identifier: StringLength
-
identifier: NotEmpty
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,12 @@ tt_content {
hero =< lib.contentElement
hero {
templateName = Hero

dataProcessing.10 = files
dataProcessing.10 {
as = images
references.fieldName = image
references.table = tt_content
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ page {
parentPageTitle.data = levelfield:-1:title
}

settings {
headerLogo = {$page.headerLogo}
}
dataProcessing {
10 = menu
10 {
Expand Down Expand Up @@ -53,12 +50,21 @@ page {
}
}

shortcutIcon = EXT:football/Resources/Public/Icons/favicon.png

meta {
viewport = width=device-width, initial-scale=1.0, user-scalable=yes
}

headerData {
100 = FLUIDTEMPLATE
100 {
file = EXT:football/Resources/Private/Templates/Partials/Favicon.html
dataProcessing.10 = site
dataProcessing.10 {
as = site
}
}
}

includeCSS {
theme = EXT:football/Resources/Public/Css/index.css
rte = EXT:football/Resources/Public/Css/rte.css
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ page {
apple-mobile-web-app-capable = no
compatible = IE=edge
}
headerLogo = EXT:football/Resources/Public/Images/Logos/logo.svg
}


Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
settings:
general.logo:
label: 'Logo'
description: 'Your logo'
type: string
default: 'EXT:football/Resources/Public/Images/Logos/logo.svg'
general.favicon:
label: 'Favicon'
description: 'Your Favicon'
type: string
default: 'EXT:football/Resources/Public/Icons/favicon.png'
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,11 @@
],
'image' => [
'config' => [
'minitems' => '1',
'minitems' => 1,
'maxitems' => 1,
'appearance' => [
'enabledControls' => ['hide' => false]
]
],
],
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
<source>Search</source>
<target>Suche</target>
</trans-unit>
<trans-unit id="indexedSearch.displayResults">
<source><![CDATA[Found <strong>%s</strong> results]]></source>
<source><![CDATA[<strong>%s</strong> Ergebnisse gefunden]]></source>
</trans-unit>
</body>
</file>
</xliff>
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
<trans-unit id="indexedSearch.placeholder">
<source>Search</source>
</trans-unit>
<trans-unit id="indexedSearch.displayResults">
<source><![CDATA[Found <strong>%s</strong> results]]></source>
</trans-unit>
</body>
</file>
</xliff>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ $color__white: #ffffff;
//PRIMARY COLORS
$color__primary--dark-blue: #002345;
$color__light-gray: #ECECE7;
$color__primary: #FF4D08;
$color__primary: #2D479A;
$color__primary-red: #FF3232;

//TEXT COLORS
$color__text__default: $color__primary--dark-blue;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
body, p, a {
font-family: $font-primary;
}

p {
font-size: toRem(18);
line-height: toRem(30);
font-weight: 300;
}

h2 {
font-family: $font-primary;
font-size: toRem(62);
font-weight: 900;
line-height: toRem(72);
letter-spacing: toRem(1);
color: $color__text__default;
}

h4 {
font-size: toRem(24);
line-height: toRem(36);
font-family: $font-primary;
font-weight: 700;
}

a {
color: $color__primary-red;
text-decoration: none;

&:hover {
border-bottom: 1px solid $color__primary-red;
}
}
50 changes: 50 additions & 0 deletions local_packages/football/Resources/Private/Scss/Elements/_form.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
.pt-navbar {
form {
margin: auto;
padding-top: toRem(60);

@include media-breakpoint-up(md){
max-width: 75%;
}
}
}

.form-check {
padding-left: 0;
margin: toRem(15) 0;
}

.form-check-label, .form-label {
font-family: $font-primary;
color: $color__primary--dark-blue;
}

.form-check-label {
font-size: toRem(12);
font-weight: 300;
span {
padding-left: toRem(12);
}
}

.form-control {
border-radius: 0;
font-size: toRem(15);
font-weight: 300;
}

.required {
display: none;
}

.form-group{
input[type=text], input[type=email] {
min-height: toRem(48);
}
}

textarea {
&.form-control{
min-height: toRem(142);
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@import "cta";
@import "footer-menu";
@import "search";
@import "form";
@import "news";
@import "game";
65 changes: 65 additions & 0 deletions local_packages/football/Resources/Private/Scss/Elements/_news.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
.news {
padding-right: toRem(20);

&--title {
margin-top: toRem(30);
font-size: toRem(24);
font-family: $font-primary;
font-weight: 700;
line-height: toRem(36);
}

&--date {
position: absolute;
width: fit-content;
padding: toRem(2) toRem(20);
margin-top: -34px;
background: $color__primary-red;
color: $color__white;
}

&--image {
height: toRem(275)!important;
width: 100%;
object-fit: cover;
}

&--button {
display: flex;
align-items: center;
width: fit-content;

.icon-arrow {
position: relative;
display: block;
height: toRem(1);
width: toRem(20);
margin-left: toRem(15);
background: $color__primary-red;

&:before, &:after {
content: " ";
position: absolute;
width: 7px;
height: 1px;
background: $color__primary-red ;
}

&:before{
top: toRem(-3);
right: toRem(-1);
transform: rotate(45deg);
}

&:after {
top: toRem(2);
right: toRem(-1);
transform: rotate(-45deg);
}
}
}

&--row {
padding: toRem(40) 0 toRem(60) 0;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
.tx-indexedsearch-form {
width: 25%;
}

.tx-indexedsearch-info-sword {
padding: 16px 0;

.tx-indexedsearch-info-sword-word {
font-weight: bold;
}
}

.tx-indexedsearch-results {
margin-top: 20px;

.tx-indexedsearch-res {
padding: 16px 0;
border-top: 1px solid $color__light-gray;

.tx-indexedsearch-title {
a {
color: #FF3232;
text-decoration: none;
}
}

.tx-indexedsearch-description {
margin-bottom: 0;
}
}
}

.tx-indexedsearch-browsebox {
margin-top: 20px;

ul {
list-style: none;
padding: 0;
display: flex;

li {
display: flex;
width: 30px;
height: 30px;
border: 1px solid $color__light-gray;
margin-right: 15px;

&:hover,
&.active{
border-color: $color__primary--dark-blue;
}

a {
display: flex;
-ms-flex-pack: center;
justify-content: center;
-ms-flex-align: center;
align-items: center;
width: 30px;
height: 30px;
text-decoration: none;
color: $color__text__default;
}

&.tx-indexedsearch-browselist-next{
border: 0;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h3 class="hero--title">{data.header}</h3>
</div>
</div>
</div>
<f:image class="hero--image" src="{data.image}" treatIdAsReference="1"/>
<f:image class="hero--image" image="{images.0}" />
</div>

</html>
Expand Down
Loading

0 comments on commit 771c94f

Please sign in to comment.