Commit 7251c5ff authored by Andreas Nedbal's avatar Andreas Nedbal

Merge branch 'master' into develop-v9

# Conflicts:
#	Configuration/PageTS/TCEFORM.tsconfig
#	Configuration/TCA/Overrides/tt_content_ce_CaseStudyLogo.php
#	Configuration/TCA/Overrides/tt_content_ce_TextWithTeaser.php
#	Configuration/TypoScript/Includes/Gridelements.typoscript
parents edb26c2d 05cb2b1e
......@@ -8,6 +8,15 @@ stages:
- test
- build
test:typoscript:
stage: test
image: composer:1
before_script:
- composer global require helmich/typo3-typoscript-lint
script:
- /tmp/vendor/bin/typoscript-lint -c typoscript-lint.yml --fail-on-warnings
allow_failure: true
test:php:
stage: test
image: ekreative/php-cs-fixer:2
......
<!---
Please read this!
Before opening a new issue, make sure to search for keywords in the issues
filtered by the "bug" label and verify the issue you're about to submit isn't a duplicate.
--->
### Summary
(Summarize the bug encountered concisely)
### Steps to reproduce
(How one can reproduce the issue - this is very important)
### Example URL
(Add an Url where we can see the issue)
### What is the current *bug* behavior?
(What actually happens)
### What is the expected *correct* behavior?
(What you should see instead)
**Acceptence Criterias**
* [ ] Must be fullfilled
### Relevant logs and/or screenshots
(Paste any relevant logs - please use code blocks (```) to format console output,
logs, and code as it's very hard to read otherwise.)
### Possible fixes
(If you can, link to the line of code that might be responsible for the problem)
/label ~bug
/label ~t3olayout
### Problem to solve
<!--- What problem do we solve? -->
### Further details
<!--- Include use cases, benefits, and/or goals (contributes to our vision?) -->
### Proposal
<!--- How are we going to solve the problem? Try to include the user journey! -->
### What does success look like, and how can we measure that?
<!--- Define both the success metrics and acceptance criteria. Note that success metrics indicate the desired business outcomes, while acceptance criteria indicate when the solution is working correctly. If there is no way to measure success, link to an issue that will implement a way to measure this -->
**Acceptence Criterias**
* [ ] Must be fullfilled
### Links / references
/label ~feature
/label ~t3olayout
### Describe the task
<!--- What problem do we solve? -->
### Further details
<!--- Include use cases, benefits, and/or goals (contributes to our vision?) -->
### What does success look like, and how can we measure that?
<!--- Define both the success metrics and acceptance criteria. Note that success metrics indicate the desired business outcomes, while acceptance criteria indicate when the solution is working correctly. If there is no way to measure success, link to an issue that will implement a way to measure this -->
**Acceptence Criterias**
* [ ] Must be fullfilled
### Links / references
/label ~task
/label ~t3olayout
......@@ -88,7 +88,7 @@
"lines-around-directive": "error",
"max-depth": "off",
"max-len": "off",
"max-lines": "error",
"max-lines": ["error", {"skipBlankLines": true}],
"max-nested-callbacks": "error",
"max-params": "off",
"max-statements": "off",
......
<?xml version="1.0" encoding="UTF-8"?>
<svg width="120px" height="120px" viewBox="0 0 120 120" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 53 (72520) - https://sketchapp.com -->
<title>Shape</title>
<desc>Created with Sketch.</desc>
<g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="member-list/box/no-member-picture" transform="translate(-19.000000, -18.000000)" fill="#515151" fill-rule="nonzero">
<g id="picture" transform="translate(19.000000, 18.000000)">
<g id="user-circle">
<path d="M60,0 C26.8548387,0 0,26.8548387 0,60 C0,93.1451613 26.8548387,120 60,120 C93.1451613,120 120,93.1451613 120,60 C120,26.8548387 93.1451613,0 60,0 Z M60,23.2258065 C71.7580645,23.2258065 81.2903226,32.7580645 81.2903226,44.516129 C81.2903226,56.2741935 71.7580645,65.8064516 60,65.8064516 C48.2419355,65.8064516 38.7096774,56.2741935 38.7096774,44.516129 C38.7096774,32.7580645 48.2419355,23.2258065 60,23.2258065 Z M60,106.451613 C45.7983871,106.451613 33.0725806,100.016129 24.5564516,89.9516129 C29.1048387,81.3870968 38.0080645,75.483871 48.3870968,75.483871 C48.9677419,75.483871 49.5483871,75.5806452 50.1048387,75.75 C53.25,76.766129 56.5403226,77.4193548 60,77.4193548 C63.4596774,77.4193548 66.7741935,76.766129 69.8951613,75.75 C70.4516129,75.5806452 71.0322581,75.483871 71.6129032,75.483871 C81.9919355,75.483871 90.8951613,81.3870968 95.4435484,89.9516129 C86.9274194,100.016129 74.2016129,106.451613 60,106.451613 Z" id="Shape"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
......@@ -58,7 +58,7 @@ FlyOutAjaxLogin.prototype.authenticationRequest = function(event, form) {
};
FlyOutAjaxLogin.prototype.initMenuBar = function() {
const returnUrl = window.location.href;
const returnUrl = encodeURIComponent(window.location.href);
FlyOutAjaxLogin.callAjax('/index.php?eID=FlyOutAjaxLoginController&returnUrl=' + returnUrl, function (response) {
if (response !== null || response !== undefined || response !== '') {
const login = JSON.parse(response);
......@@ -74,7 +74,7 @@ FlyOutAjaxLogin.prototype.initMenuBar = function() {
};
FlyOutAjaxLogin.prototype.initLoginLogoutTemplate = function () {
const returnUrl = window.location.href;
const returnUrl = encodeURIComponent(window.location.href);
FlyOutAjaxLogin.callAjax('/index.php?type=4444&returnUrl=' + returnUrl, function (response) {
if (response !== null || response !== undefined || response !== '') {
const aim = document.querySelector('.js__full-width-dropdown__lvl-down[data-parent-lvl1="' + $('#mainNav').data('login-pid') + '"]');
......
This diff is collapsed.
......@@ -9,7 +9,7 @@
<div class="col-md-5">
<div class="button-container">
<p>
<a class="btn btn-primary mr-3 px-lg-5 py-lg-2" href="https://get.typo3.org/stable">Download</a>
<a class="btn btn-primary mr-3 px-lg-5 py-lg-2" href="https://get.typo3.org/">Download</a>
<a class="btn btn-light px-lg-5 py-lg-2" href="https://typo3.org/typo3-cms/overview/">Get more info</a>
</p>
</div>
......
......@@ -42,3 +42,7 @@ $warning: #ffc800;
$information: #0080ff;
$whiteOpacity: rgba(#fff, 0.3);
// Functions Moved to 2.4 Utilities
//
// Styleguide 1.2
// Forms
//
// Markup: ../../Templates/base/forms.html
//
// all the input buttons get a box shadow per default
//
//
// Styleguide 1.5
.input-group-btn .btn.btn-info,
......@@ -18,6 +23,16 @@
border-color: #f00;
}
.form-check {
.form-check-input {
top: 2px;
@include media-breakpoint-up(xl) {
top: 4px;
}
}
}
.error.help-block {
font-size: 0.85rem;
}
......
// Mixins
//
// Use the @mixin 'hide-on-print' to hide things on print view. It hides implementation details
// (faster/easier readability), prevents visual bugs due of typos and makes it
// easy to get a list of all elements, that are hidden on print view, for future
// reference.
//
// Use the @mixin 'hide-on-print' to hide link targets on print
//
// Styleguide 1.3
@mixin linear-gradient($direction, $color-stops...) {
background: linear-gradient($direction, $color-stops);
@if is-direction($direction) == false {
$color-stops: $direction, $color-stops;
$direction: 180deg;
}
}
/**
* Use this mixin to hide things on print view. It hides implementation details
* (faster/easier readability), prevents visual bugs due of typos and makes it
* easy to get a list of all elements, that are hidden on print view, for future
* reference.
*/
@mixin hide-on-print($important: false) {
@if ($important == true) {
$important: !important;
......
// Typography
// Typography elements
//
// This is a list of default styles t3olayout ships with.
// Feel free to make us of some of our predefined classes as well!
//
// Markup: ../../Templates/base/typography-elements.html
//
// Styleguide 1.4
// Typography classes
//
// .font--monospace - monospace font family
// .font-color--brand-primary - font-color set to primary
// .font-header-menu - same font style as it is used in the header menu
// .blockquote - default blockquote style
// .blockquote-reverse - reverse blockquote style
//
// Markup: ../../Templates/base/typography-classes.html
//
// Styleguide 1.4.1
html {
-webkit-font-smoothing: antialiased;
......
// Card / Action Box
// Card
//
// Name of Content Element in Backend: Action Box
//
// Markup: ../../Templates/components/card.html
//
......
// CE - Accordion
// Accordion REMOVED
//
// Styleguide 4.15
......
// CE - Gallery
// Gallery
//
// Name of Content Element in Backend: Text Media
//
// Image Position: Above, Center <br> Columns: 3 <br> Enlarge on Click: True
//
// Markup: ../../Templates/components/gallery.html
//
// Styleguide 4.14
......
// CE - Textpic
// Textpic
//
// Name of Content Element in Backend: Text Media
//
// This Content Element is one of the most flexible and can be used in many different ways.
// You are able to place the Image on the right, left, above or below the text section.
// You can see a few different implementations in the sections below.
// <br><br>Implementation: Above, Center
//
// Markup: ../../Templates/components/text-pic.html
//
// Styleguide 4.13
......@@ -32,3 +41,13 @@
.ce-right .ce-gallery {
text-align: right;
}
// Textpic (Beside Text, right)
//
// Name of Content Element in Backend: Text Media
//
// Implementation: Image position "Beside Text, right"
//
// Markup: ../../Templates/components/text-pic-50-50.html
//
// Styleguide 4.13.1
// Charts
//
// Markup: ../../Templates/components/charts.html
//
// Styleguide 4.21
.charts-wrapper {
......
// Fancybox
//
// Name of Content Element in Backend: Images
//
// Markup: ../../Templates/components/fancybox.html
//
// Styleguide 4.1
@charset "utf-8";
......
......@@ -10,7 +10,7 @@
.headerce {
position: absolute;
top: 45%;
top: 40%;
color: #fff;
p {
......@@ -31,12 +31,18 @@
background-size: cover;
background-position: 50% 60%;
overflow: hidden;
}
.headerce {
position: absolute;
top: 40%;
color: #fff;
.headerce {
position: absolute;
top: auto;
bottom: 8%;
padding-left: 15px;
padding-right: 15px;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
color: #fff;
width: 100%;
}
}
@media (max-width: 1024px) {
......@@ -47,4 +53,44 @@
.headerce {
top: 5%;
}
.metacategory-image {
.headerce {
top: auto;
bottom: 8px;
}
}
}
@media (max-width: 992px) {
.metacategory-image {
.headerce {
top: auto;
bottom: 35px;
}
}
}
@media (min-width: 576px) {
.headerce {
max-width: 540px;
}
}
@media (min-width: 768px) {
.headerce {
max-width: 720px;
}
}
@media (min-width: 992px) {
.headerce {
max-width: 960px;
}
}
@media (min-width: 1260px) {
.headerce {
max-width: 1200px;
}
}
// Indents
//
// Markup: ../../Templates/components/indent.html
//
// .indent-1 - Level 1 indent
// .indent-2 - Level 2 indent
// .indent-3 - Level 3 indent
//
// Styleguide 4.17
p {
......
// Jumbotron
//
// Name of Content Element in Backend: Jumbotron
//
// New element created in Code Sprint India 2019
//
// Styleguide 4.14
.jumbotron-image-wrap {
position: relative;
width: auto;
height: 400px;
margin-bottom: 30px;
background-size: cover;
background-position: 50% 25%;
overflow: hidden;
.headerce {
top: 54%;
padding-left: 15px;
padding-right: 15px;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
width: 100%;
}
}
.jumbotron-content-wrap {
position: relative;
top: -110px;
.card {
font-size: 1.5rem;
padding: 2rem;
}
.card-text {
.btn {
margin-bottom: 0;
}
}
}
@media (max-width: 1024px) {
.features-header-image {
height: 400px;
}
}
@media (max-width: 992px) {
.jumbotron-image-wrap {
height: 228px;
.headerce p {
font-size: 1rem;
}
.headerce-head {
font-size: 2rem;
}
}
.jumbotron-content-wrap {
top: -60px;
.card {
font-size: 1rem;
padding: 0.5rem;
}
}
}
@media (max-width: 767px) {
.jumbotron-image-wrap {
height: auto;
margin-bottom: 0;
.headerce {
position: relative;
top: auto;
-webkit-transform: translateY(0);
transform: translateY(0);
color: #333;
.headerce-head {
color: #333;
margin-bottom: 0.4rem;
}
p {
margin-bottom: 0;
color: #333;
}
}
}
.jumbotron-content-wrap {
position: relative;
top: auto;
.container {
margin-top: 0;
}
.card {
padding: 0;
}
}
}
// Jump Link Box
//
// Markup: ../../Templates/components/jump-link-box.html
//
// Styleguide 4.19
.jump-link-box {
......
......@@ -30,7 +30,7 @@
}
@include media-breakpoint-up(md) {
flex-basis: 25%;
flex-basis: auto;
}
&_link {
......
// Lists
//
// Markup: ../../Templates/components/lists.html
//
// .highlight - Highlight styling
// .checked - Checked styling
//
// Styleguide 4.16
.text-list {
ul {
margin: 0;
padding: 0;
list-style-type: none;
li {
display: table;
margin-bottom: 0.625rem;
&:before {
content: "x";
display: table-cell;
left: -1rem;
position: relative;
color: $primary;
}
}
li li:before {
font-size: 0.875rem;
}
& ul {
margin-top: 0.625rem;
}
}
}
.keyfacts-list {
ul {
list-style: none;
li {
font-size: calculate_rem(27);
line-height: calculate_rem(34);
&:before {
content: "¶"; //replace with 'Font Awesome 5 Free icon once they're working
color: $primary;
font-size: calculate_rem(24);
margin-right: calculate_rem(11);
}
}
}
}
// Custom List Styles
.list-styled {
@extend .list-unstyled;
......@@ -98,3 +56,67 @@ ul {
}
}
}
// Text List
//
// Markup: ../../Templates/components/text-list.html
//
// Styleguide 4.16.1
.text-list {
ul {
margin: 0;
padding: 0;
list-style-type: none;
li {
display: table;
margin-bottom: 0.625rem;
&:before {
content: "x";
display: table-cell;
left: -1rem;
position: relative;
color: $primary;
}
}
li li:before {
font-size: 0.875rem;
}
& ul {
margin-top: 0.625rem;
}
}
}
// Keyfacts List
//
// Markup: ../../Templates/components/keyfacts-list.html
//
// Styleguide 4.16.2
.keyfacts-list {
ul {
list-style: none;
li {
font-size: calculate_rem(27);
line-height: calculate_rem(34);