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

Merge branch 'dev'

Übergeordnete 823599d3 ce5435ee
No related branches found
Tags 1.0.0
1 Merge Request!25Update 'next-3.x' with latest changes from 'main'
Leerzeichenänderungen ausblenden
Inline Nebeneinander
bin/css/form.css
+ 6
− 1
Zeige Datei @ 6df92248
......@@ -32,9 +32,9 @@ select {
-o-transition: all 0.2s ease;
-webkit-transition: all 0.2s ease;
transition: all 0.2s ease;
color: inherit;
}
textarea {
line-height: 1.6em;
padding-bottom: 10px;
......@@ -104,6 +104,11 @@ input[type="search"] {
div.qui-select {
height: 40px;
line-height: 40px;
display: flex;
}
div.qui-select .icon {
height: inherit;
}
div.qui-select .text {
......
bin/css/frontend-users.css
+ 4
− 34
Zeige Datei @ 6df92248
......@@ -49,12 +49,6 @@
/*****************/
/* category menu */
/*****************/
.quiqqer-frontendUsers-controls-profile-categoryContent h2 {
font-weight: normal;
line-height: 40px;
margin-bottom: 0;
}
.quiqqer-fupc-category {
margin-bottom: 2em;
}
......@@ -142,10 +136,9 @@
line-height: 40px;
}
.quiqqer-frontendUsers-userdata-section, .quiqqer-frontendUsers-userdata-address, .quiqqer-frontendUsers-userdata-address-additional {
max-width: 100% !important;
}
/***********/
/* address */
/***********/
.quiqqer-frontend-users-address header,
.quiqqer-frontendUsers-userdata-section header {
padding: 20px 0;
......@@ -156,11 +149,6 @@
padding-bottom: 0;
}
.quiqqer-frontend-users-address-edit select,
.quiqqer-frontend-users-address-edit .qui-select {
width: 50% !important;
}
.quiqqer-frontend-users-address-edit .qui-select,
.quiqqer-frontend-users-address-edit .qui-select .drop-icon {
height: 40px;
......@@ -184,16 +172,6 @@
margin-right: 10px;
}
.quiqqer-frontendUsers-controls-profile-categoryContent [type="submit"] {
margin: 0 auto 20px;
max-width: 100%;
width: 200px;
}
.quiqqer-frontendUsers-userdata-invoiceaddress [type="submit"] {
width: 100px !important;
}
.quiqqer-frontend-users-address-list-entry {
border: 1px solid #ddd;
background: #fff;
......@@ -244,10 +222,6 @@
border-radius: 0.25rem;
}
.quiqqer-frontendUsers-userdata-label {
line-height: 40px;
}
@media screen and (max-width: 767px) {
.cologne-main .quiqqer-frontendUsers-controls-profile-control label {
margin-bottom: 10px;
......@@ -366,8 +340,4 @@
.quiqqer-fu-registrationSignUp-registration .quiqqer-fu-registrationSignUp-terms button[name="decline"]:hover {
opacity: 1 !important;
background: #f5f5f5;
}
/******************/
/* delete account */
/******************/
\ No newline at end of file
}
\ No newline at end of file
bin/css/order.css
+ 3
− 244
Zeige Datei @ 6df92248
/** Order Process
=================================================== */
.quiqqer-order-ordering .quiqqer-order-ordering-timeline {
border-bottom: none;
}
.quiqqer-order-ordering-timeline a {
color: inherit;
}
......@@ -12,28 +8,6 @@
padding: 0;
}
.cologne-main .message-error {
padding: 20px;
}
.quiqqer-order-ordering-buttons-next {
cursor: pointer;
}
.quiqqer-order-ordering-timeline li {
cursor: pointer;
}
@media screen and (max-width: 767px) {
.quiqqer-order-ordering .quiqqer-order-ordering-timeline li {
width: 140px !important;
}
.quiqqer-order-ordering-timeline .quiqqer-order-ordering-timeline-container li .title {
font-size: 11px;
}
}
/****************/
/* step: basket */
/****************/
......@@ -60,7 +34,6 @@ th.quiqqer-order-basket-articles-header-pos {
border-left: 1px solid #ddd;
text-align: left;
width: 60px;
}
th.quiqqer-order-basket-articles-header-quantity {
......@@ -81,9 +54,8 @@ th.quiqqer-order-basket-articles-header-price {
width: 50px;
}
.quiqqer-order-basket-articles-header {
font-size: 12px;
font-size: 0.875rem;
line-height: 30px;
}
......@@ -110,11 +82,9 @@ th.quiqqer-order-basket-articles-header-price {
.quiqqer-order-basket-articles-article-quantity button {
display: inline-block;
height: 30px;
line-height: 20px;
margin-right: 0.5em;
}
.quiqqer-order-basket-articles-unitPrice {
width: 200px;
}
......@@ -213,11 +183,6 @@ td.quiqqer-order-basket-articles-article-remove button:hover {
display: none;
}
.content-template .quiqqer-order-ordering {
display: inline-block;
margin-bottom: 20px;
}
.quiqqer-order-basket-total-subSum-text,
.quiqqer-order-basket-total-subSum-value {
border-bottom: 1px solid #999999;
......@@ -273,75 +238,24 @@ input.quiqqer-coupons-couponcodeinput-input:active {
}
.quiqqer-order-basket-articles-article-productno {
color: #adadad;
color: var(--text-muted);
font-size: 12px;
}
/***********************/
/* step: customer data */
/***********************/
.quiqqer-order-customerData-container {
display: flex;
}
.quiqqer-order-customerData {
margin-right: 20px;
}
.quiqqer-order-customerData-container .quiqqer-order-customerData,
.quiqqer-order-customerData-container .quiqqer-order-customerData-comment {
width: calc(50% - 20px);
}
.quiqqer-order-customerData-edit .quiqqer-order-customerData-edit-salutation {
margin-top: 0;
}
.quiqqer-order-ordering-step .quiqqer-order-customerData-comment {
align-self: flex-start;
background: #f8f8f8;
border: 1px solid #ddd;
margin-left: 20px;
margin-top: 0;
padding: 1rem;
}
.quiqqer-order-customerData header h1 button {
margin-left: 1rem;
}
.quiqqer-order-customerData header h1 button > .fa {
margin: 0;
}
.quiqqer-order-customerData .quiqqer-order-customerData-display {
margin-top: 2rem;
max-width: initial;
padding-right: 0;
}
.quiqqer-order-customerData-display-customerNo,
.quiqqer-order-customerData-display-eMail,
.quiqqer-order-customerData-display-tel {
display: flex;
margin-bottom: 5px;
}
.quiqqer-order-customerData-display-customerNo span:first-child,
.quiqqer-order-customerData-display-eMail span:first-child,
.quiqqer-order-customerData-display-tel span:first-child {
opacity: 0.75;
width: 160px;
}
.quiqqer-order-customerData-display .quiqqer-order-customerData-display-address {
margin-top: 2rem;
}
.quiqqer-order-customerData-edit {
margin-top: 2rem;
}
@media screen and (max-width: 767px) {
.quiqqer-order-customerData-container {
display: block;
......@@ -362,130 +276,9 @@ input.quiqqer-coupons-couponcodeinput-input:active {
}
}
/******************/
/* step: shipping */
/******************/
.quiqqer-order-step-shipping-list .quiqqer-order-step-shipping-list-entry {
border-bottom: none;
}
.quiqqer-order-step-shipping-list .quiqqer-order-step-shipping-list-entry:hover {
background: #f8f8f8 !important;
}
.quiqqer-order-step-shipping-list .quiqqer-order-step-shipping-list-entry:hover {
background: rgba(0, 0, 0, 0.1);
}
.quiqqer-order-step-shipping-list-entry-price {
display: flex;
white-space: nowrap;
}
@media (max-width: 768px) {
.quiqqer-order-step-shipping-list .quiqqer-order-step-shipping-list-entry {
display: flex !important;
flex-wrap: wrap;
margin-bottom: 20px;
padding-bottom: 20px;
border-bottom: 1px solid #ddd;
}
.quiqqer-order-step-shipping-list-entry:last-child {
margin-bottom: 0;
}
.quiqqer-order-step-shipping-list .quiqqer-order-step-shipping-list-entry.selected {
background: none;
}
.quiqqer-order-step-shipping-list .quiqqer-order-step-shipping-list-entry-select {
display: flex !important;
flex: initial;
width: 40px;
}
.quiqqer-order-step-shipping-list-entry-select input[type="radio"] {
margin: 0;
}
.quiqqer-order-step-shipping-list .quiqqer-order-step-shipping-list-entry-icon {
padding: 0 !important;
width: calc(100% - 80px) !important;
}
.quiqqer-order-step-shipping-list-entry-text,
.quiqqer-order-step-shipping-list-entry-price {
padding: 10px 10px 10px 40px;
}
.quiqqer-order-step-shipping-list-entry-text,
.quiqqer-order-step-shipping-list-entry-price {
margin-left: 40px;
}
}
/******************/
/* step: payments */
/******************/
.quiqqer-order-step-payments-list .quiqqer-order-step-payments-list-entry {
border-bottom: none;
}
.quiqqer-order-step-payments-list .quiqqer-order-step-payments-list-entry:hover .quiqqer-order-step-payments-list-entry-select {
background: none;
}
.quiqqer-order-step-payments-list-entry-select input[type="radio"] {
margin: 0;
}
.quiqqer-order-step-payments-list-entry:hover {
background: #f8f8f8 !important;
}
@media screen and (max-width: 767px) {
.quiqqer-order-step-payments-list .quiqqer-order-step-payments-list-entry {
display: flex !important;
flex-wrap: wrap;
border-bottom: 1px solid #ddd;
padding-bottom: 20px;
}
.quiqqer-order-step-payments-list-entry .quiqqer-order-step-payments-list-entry-text {
padding: 10px 0 0;
}
.quiqqer-order-step-payments-list-entry .quiqqer-order-step-payments-list-entry-icon {
padding: 0 !important;
}
.quiqqer-order-step-payments-list-entry.selected {
background: none !important;
}
.quiqqer-order-step-payments-list-entry .quiqqer-order-step-payments-list-entry-select {
align-items: center;
display: flex !important;
justify-content: center;
width: 40px;
}
.quiqqer-order-step-payments-list-entry .quiqqer-order-step-payments-list-entry-icon,
.quiqqer-order-step-payments-list-entry .quiqqer-order-step-payments-list-entry-text {
width: calc(100% - 40px) !important;
}
.quiqqer-order-step-payments-list-entry .quiqqer-order-step-payments-list-entry-text {
margin-left: 40px;
}
}
/******************/
/* step: checkout */
/******************/
.quiqqer-order-step-checkout-invoiceAddress .postal-country {
float: left;
}
......@@ -497,17 +290,7 @@ input.quiqqer-coupons-couponcodeinput-input:active {
float: left;
}
/** article content
=========================================== */
.quiqqer-order-basket-articles-article-data ul {
margin-left: 20px;
}
@media (max-width: 768px) {
.quiqqer-order-step-basket {
display: block;
}
.quiqqer-order-ordering header h1 {
font-size: 2em;
}
......@@ -561,14 +344,6 @@ input.quiqqer-coupons-couponcodeinput-input:active {
width: 100%;
}
.quiqqer-order-ordering-buttons {
margin-bottom: 10px;
}
.quiqqer-order-ordering-buttons-previous {
margin-bottom: 20px;
}
.quiqqer-order-ordering-buttons-backToShop {
display: none;
}
......@@ -614,27 +389,11 @@ input.quiqqer-coupons-couponcodeinput-input:active {
display: block;
padding: 5px 10px;
}
.quiqqer-order-next-mobile {
margin-bottom: 20px;
margin-top: 20px;
}
}
.quiqqer-order-customerData-edit [name="businessType"] {
line-height: 40px;
padding: 0 8px;
width: 60% !important;
}
/******************/
/* step: checkout */
/******************/
.quiqqer-order-step-checkout-attention {
margin-bottom: 20px;
}
.quiqqer-order-step-checkout .quiqqer-order-step-checkout-invoiceAddress,
.quiqqer-order-step-checkout .quiqqer-order-step-checkout-deliveryAddress,
.quiqqer-order-step-checkout .quiqqer-order-step-checkout-payments {
......
bin/css/user-orders.css
+ 6
− 2
Zeige Datei @ 6df92248
......@@ -32,8 +32,12 @@ section.quiqqer-order-profile-orders-order {
display: block;
}
.quiqqer-order-profile-orders-order-header-addressInvoice address {
top: 48px !important;
/**
1. avoid !important and increase the specificity (not good)
2. set address position at the bottom line 100% height + 10px padding of "header"
*/
.quiqqer-order-profile-orders-order-header-addressInvoice address:is(address) { /* 1 */
top: calc(100% + 10px); /* 2 */
}
.quiqqer-order-profile-orders-order-header-addressInvoice span {
......
bin/javascript/init.js
+ 22
− 8
Zeige Datei @ 6df92248
......@@ -109,10 +109,6 @@ window.addEvent('domready', function () {
var UserButtonLoader = UserButton.getElement('.cologne-header-control-user-loader');
window.addEvent('load', function () {
document.getElement('.cologne-header-menu').setStyle('overflow', 'visible');
});
/**
* Login
*/
......@@ -193,7 +189,13 @@ window.addEvent('domready', function () {
}
if (SearchBtn && SearchInput) {
var clickEvent = function () {
const ActionSearchBtn = document.getElement('.quiqqer-products-search-suggest-form-button');
if (!ActionSearchBtn) {
return;
}
let clickEvent = function () {
new Fx.Scroll(window, {
onComplete: function () {
SearchInput.focus();
......@@ -202,8 +204,11 @@ window.addEvent('domready', function () {
};
if (QUI.getWindowSize().x < 767) {
// https://dev.quiqqer.com/quiqqer/template-cologne/-/issues/104
ActionSearchBtn.removeAttribute('type');
clickEvent = function () {
document.getElement('.quiqqer-products-search-suggest-form-button').click();
ActionSearchBtn.click();
};
}
......@@ -552,11 +557,20 @@ window.addEvent('domready', function () {
return;
}
var OpenCategoryBtn = document.getElement('.shop-category-menu-button'),
let OpenCategoryBtn = document.getElement('.shop-category-menu-button'),
MenuElm = document.getElement('[data-qui="package/quiqqer/menu/bin/SlideOut"]');
if (!MenuElm) {
MenuElm = document.getElement('[data-qui="package/quiqqer/menu/bin/SlideoutAdvanced"]');
}
if (!MenuElm) {
console.debug('Neither SlideOut nor SlideoutAdvanced found.');
return;
}
if (!OpenCategoryBtn) {
console.error('Open Category Button ".shop-category-menu-button" not found.');
console.debug('Open Category Button ".shop-category-menu-button" not found.');
return;
}
......
quiqqer/products/src/QUI/ERP/Products/Controls/Search/Suggest.html gelöscht 100644 → 0
+ 0
− 17
Zeige Datei @ 823599d3
<form class="quiqqer-products-search-suggest-form" action="{url site=$Search rewritten=true}" method="GET">
<input type="search"
name="search"
value=""
autocomplete="off"
placeholder="{locale group='quiqqer/products' var='control.search.suggest.placeholder'}"
class="quiqqer-products-search-suggest-form-input hide-on-mobile"
aria-label="{locale group='quiqqer/template-cologne' var='template.button.search'}"
/>
<span class="fa fa-search input-search-icon hide-on-desktop"></span>
<button class="quiqqer-products-search-suggest-form-button button--callToAction" type="button"
title="{locale group='quiqqer/template-cologne' var='template.button.search'}">
<span class="fa fa-search quiqqer-products-search-suggest-form-button-icon"></span>
</button>
</form>
\ 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