Skip to content
Code-Schnipsel Gruppen Projekte
Commit fde16c62 erstellt von Michael Danielczok's avatar Michael Danielczok
Dateien durchsuchen

Merge branch 'dev'

Übergeordnete 78e57b79 048ab74c
No related branches found
No related tags found
1 Merge Request!25Update 'next-3.x' with latest changes from 'main'
Leerzeichenänderungen ausblenden
Inline Nebeneinander
ajax/getLangList.php
+ 3
− 3
Zeige Datei @ fde16c62
......@@ -13,8 +13,8 @@
'package_quiqqer_template-cologne_ajax_getLangList',
function ($flagFolderPath) {
$Engine = QUI::getTemplateManager()->getEngine();
$Site = QUI::getRewrite()->getSite();
$Engine = QUI::getTemplateManager()->getEngine();
$Site = QUI::getRewrite()->getSite();
$Project = $Site->getProject();
$langs = $Project->getLanguages();
......@@ -30,7 +30,7 @@ function ($flagFolderPath) {
'path' => $flagFolderPath
]);
return $Engine->fetch(dirname(__FILE__) . '/template/LangList.html');
return QUI\Output::getInstance()->parse($Engine->fetch(dirname(__FILE__) . '/template/LangList.html'));
},
['flagFolderPath']
);
ajax/template/LangList.html
+ 1
− 1
Zeige Datei @ fde16c62
......@@ -12,7 +12,7 @@
<img src="{$path}{$lang}.png"/>
</span>
<span class="lcs-menu-list-entry-link-text ">
{locale group="quiqqer/system" var="language.$lang"}
{locale group="quiqqer/quiqqer" var="language.$lang"}
</span>
</a>
......
bin/css/product-bricks.css
+ 12
− 0
Zeige Datei @ fde16c62
......@@ -22,4 +22,16 @@
.quiqqer-products-control-product-childrenslider-entry .quiqqer-products-control-product-childrenslider-entry-price-regularPrice {
font-size: 1.2rem;
}
/**********************/
/* Manufacture slider */
/**********************/
.quiqqer-bricks-children-slider-container-slide .quiqqer-product-bricks-control-manufactureSlider-entry {
box-shadow: 0 0 10px rgba(0,0,0,0);
transition: 0.2s all;
}
.quiqqer-bricks-children-slider-container-slide .quiqqer-product-bricks-control-manufactureSlider-entry:hover {
box-shadow: 0 0 10px rgba(0,0,0,.1);
}
\ No newline at end of file
bin/css/products.css
+ 32
− 11
Zeige Datei @ fde16c62
......@@ -196,15 +196,23 @@
/** Categories
============================================== */
/* categories: gallery */
.cologne-products-categoryGallery-categories {
/* manufacture list: gallery */
.cologne-products-categoryGallery-categories,
.quiqqer-products-manufacturerList-entries-container-real {
display: grid;
grid-gap: 20px;
grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
margin-bottom: 40px;
width: 100%;
background: #fff;
}
.quiqqer-products-manufacturerList-entries-container-real {
grid-template-columns: repeat(auto-fill, minmax(350px, 1fr));
}
.cologne-products-categoryGallery-category {
.cologne-products-categoryGallery-category,
.cologne-products-manufacturerList-entry {
border: 1px solid #ddd;
box-shadow: 0 0 10px rgba(0, 0, 0, 0);
display: flex;
......@@ -213,15 +221,18 @@
transition: 0.2s all;
}
.cologne-products-categoryGallery-category:hover {
.cologne-products-categoryGallery-category:hover,
.cologne-products-manufacturerList-entry:hover {
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
}
.cologne-products-categoryGallery-category-image {
.cologne-products-categoryGallery-category-image,
.cologne-products-manufacturerList-entry-image {
height: 160px;
}
.cologne-products-categoryGallery-category-image-link {
.cologne-products-categoryGallery-category-image-link,
.cologne-products-manufacturerList-entry-image-link {
color: inherit;
display: block;
font-size: 80px;
......@@ -229,35 +240,45 @@
text-align: center;
}
.cologne-products-categoryGallery-category-image-link-img {
.cologne-products-categoryGallery-category-image-link img,
.cologne-products-manufacturerList-entry-image-link img {
font-size: initial;
max-height: 100%;
}
.cologne-products-categoryGallery-category-content {
.cologne-products-categoryGallery-category-content,
.cologne-products-manufacturerList-entry-content {
display: flex;
flex-direction: column;
flex-grow: 1;
margin-top: 1rem;
}
.cologne-products-categoryGallery-category-content-header {
.cologne-products-categoryGallery-category-content-header,
.cologne-products-manufacturerList-entry-content-header {
text-align: center;
}
.cologne-products-categoryGallery-category-content-header-title {
.cologne-products-categoryGallery-category-content-header-title,
.cologne-products-manufacturerList-entry-content-header-title {
font-size: 1.25rem;
}
.cologne-products-categoryGallery-category-content-short {
.cologne-products-categoryGallery-category-content-short,
.cologne-products-manufacturerList-entry-content-short {
margin-bottom: 1em;
}
.cologne-products-categoryGallery-category-content-buttonContainer {
.cologne-products-categoryGallery-category-content-buttonContainer,
.cologne-products-manufacturerList-entry-content-buttonContainer {
margin-top: auto;
text-align: center;
}
.quiqqer-products-manufacturerList-entries-container {
margin-top: 1rem;
}
/* categories: list */
.quiqqer-products-productList-categories__bottom > .quiqqer-products-productList-categories-header {
border-bottom: 1px solid #ddd;
......
bin/css/style.css
+ 38
− 8
Zeige Datei @ fde16c62
......@@ -143,9 +143,9 @@ small, .font_small, .font-small {
}
img {
height: auto;
max-width: 100%;
width: auto;
height: auto;
}
.html5tooltip-box {
......@@ -746,15 +746,15 @@ a.toTop:before {
left: 0;
position: relative;
top: 0;
transition: 0.25s height;
width: 100%;
z-index: 99;
transition: 0.25s height;
}
.cologne-header-fixed {
box-shadow: 0 0 20px 0 rgba(57, 57, 57, 0.2);
position: fixed;
height: 60px;
position: fixed;
z-index: 100; /* Because of the search dropdown */
}
......@@ -769,17 +769,17 @@ a.toTop:before {
}
.cologne-header-logo-link {
height: 100%;
display: flex;
align-items: center;
display: flex;
height: 100%;
padding: 10px 0;
}
.cologne-header-logo-link picture {
align-items: center;
display: flex;
height: 100%;
width: auto;
display: flex;
align-items: center;
}
.cologne-header-logo-link img {
......@@ -967,6 +967,10 @@ a.toTop:before {
/** Mega Menu
===================================== */
.cologne-header-nav .quiqqer-menu-megaMenu {
position: initial;
}
.quiqqer-menu-megaMenu nav {
align-items: center;
display: flex;
......@@ -1033,10 +1037,11 @@ a.toTop:before {
background: #fff;
border: 1px solid #e1e7ec;
box-shadow: 0 7px 22px -5px rgba(48, 60, 72, 0.2) !important;
left: 50% !important;
line-height: 1.5;
max-width: 100% !important;
min-width: 200px;
text-align: left;
transform: translateX(-50%);
z-index: 100;
}
......@@ -1776,4 +1781,29 @@ table tr:last-child th {
.qui-contextitem-container .qui-contextitem-text {
padding: 5px 0;
}
/***************/
/* Search site */
/***************/
.qui-search-result form {
display: flex;
}
.qui-search-result form input[type="text"] {
flex-grow: 1;
width: 300px;
max-width: 100%;
}
@media screen and (max-width: 767px) {
.qui-search-result form {
flex-direction: column;
}
.qui-search-result form input[type="text"] {
width: initial;
margin-right: 0;
margin-bottom: 1rem;
}
}
\ No newline at end of file
quiqqer/products/src/QUI/ERP/Products/Controls/ManufacturerList/ManufacturerList.Gallery.html 0 → 100644
+ 33
− 0
Zeige Datei @ fde16c62
{foreach $manufacturerUsers as $userId}
<article class="cologne-products-manufacturerList-entry"
data-mid="{$userId}"
>
{assign var=title value=\QUI\ERP\Products\Handler\Manufacturers::getManufacturerTitle($userId)}
{strip}
<div class="cologne-products-manufacturerList-entry-image">
<a href="{\QUI\ERP\Products\Handler\Manufacturers::getManufacturerUrl($userId)}" title="{$title|escape:'html'}"
class="cologne-products-manufacturerList-entry-image-link">
{image image=\QUI\ERP\Products\Handler\Manufacturers::getManufacturerImage($userId) title=$title width=400}
</a>
</div>
<div class="cologne-products-manufacturerList-entry-content">
<header class="cologne-products-manufacturerList-entry-content-header">
<h3 class="cologne-products-manufacturerList-entry-content-header-title">
{$title}
</h3>
</header>
<div class="cologne-products-manufacturerList-entry-content-short"></div>
<div class="cologne-products-manufacturerList-entry-content-buttonContainer">
<a href="{\QUI\ERP\Products\Handler\Manufacturers::getManufacturerUrl($userId)}" title="{$title|escape:'html'}"
class="btn btn-primary btn-outline cologne-products-manufacturerList-entry-content-button">
{locale group='quiqqer/product-bricks' var='brick.control.categoryBox.viewProduct'}
</a>
</div>
</div>
</a>
{/strip}
</article>
{/foreach}
\ No newline at end of file
template/menu/menuPrefix.html
+ 1
− 1
Zeige Datei @ fde16c62
......@@ -8,7 +8,7 @@
{* <!-- Logo --> *}
<div class="cologne-header-logo template-column">
<a href="/" class="cologne-header-logo-link">
<a href="{$Project->get(1)->getUrlRewritten()}" class="cologne-header-logo-link">
{image image=$Logo class="logo" height="100"}
</a>
</div>
\ No newline at end of file
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren

PCSG & QUIQQER support and DEV System - GitLab