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

fix: update template to be compatible with the quiqqer/frontend-users version 2.4.0 

Related: #117
Übergeordneter 40cf4b1f
No related branches found
No related tags found
2 Merge Requests!25Update 'next-3.x' with latest changes from 'main',!24fix: adjust paths to standard mail templates in quiqqer/core
Pipeline #14822 bestanden mit Phase
in 2 Minuten und 13 Sekunden
Leerzeichenänderungen ausblenden
Inline Nebeneinander
bin/css/buttons.css
+ 2
− 7
Zeige Datei @ 5b31aa12
...@@ -28,16 +28,11 @@ a.qui-button, ...@@ -28,16 +28,11 @@ a.qui-button,
float: none; /* qui-button reset */ float: none; /* qui-button reset */
} }
button > .fa, button > .fa:not(:only-child),
.btn > .fa { .btn > .fa:not(:only-child) {
margin-right: .75rem; margin-right: .75rem;
} }
button.loading > .fa,
.btn.loading > .fa {
margin-right: 0;
}
/*****************************/ /*****************************/
/* button primary & standard */ /* button primary & standard */
/*****************************/ /*****************************/
......
bin/css/frontend-users.css
+ 22
− 154
Zeige Datei @ 5b31aa12
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
/* simple user info */ /* simple user info */
/********************/ /********************/
.quiqqer-fupc-userinfo { .quiqqer-fupc-userinfo {
border: 1px solid #ddd; border: var(--_qui-cologne-theme-border-width) solid var(--_qui-cologne-theme-border-color);
border-radius: 5px; border-radius: 5px;
margin-bottom: 1em; margin-bottom: 1em;
background: #fff; background: #fff;
...@@ -21,67 +21,33 @@ ...@@ -21,67 +21,33 @@
background: url("../images/brushed_alu.png"); background: url("../images/brushed_alu.png");
} }
.quiqqer-frontendUsers-profile-container { /***********/
display: flex; /* Profile */
margin-bottom: 2rem; /***********/
margin-top: 2rem; .quiqqer-frontendUsers-controls-profile {
} --qui-frontend-users-profile__radius: 0;
--qui-frontend-users-profile__sidebar-width: 360px;
.quiqqer-frontendUsers-controls-profile .quiqqer-frontendUsers-controls-profile-categories { --qui-frontend-users-profile__content-maxWidth: 700px;
padding-right: 20px; --qui-frontend-users-profile__sidebar-nav-item-outline--hover: none;
} --qui-frontend-users-profile__sidebar-nav-item-bg-color--hover: transparent;
.quiqqer-frontendUsers-controls-profile .quiqqer-frontendUsers-controls-profile-categoryContent {
padding-left: 20px;
}
@media (max-width: 768px) {
.quiqqer-frontendUsers-controls-profile .quiqqer-frontendUsers-controls-profile-categories {
padding: 0;
width: 100%;
}
.quiqqer-frontendUsers-controls-profile .quiqqer-frontendUsers-controls-profile-categoryContent {
padding-left: 0;
}
} }
/*****************/ /*****************/
/* category menu */ /* category menu */
/*****************/ /*****************/
.quiqqer-fupc-category { .quiqqer-fupc-category {
margin-bottom: 2em; /*margin-bottom: 2em;*/
}
.quiqqer-fupc-category:last-child {
margin-bottom: 0;
} }
.quiqqer-fupc-category-header { .quiqqer-fupc-category-header {
line-height: 30px; line-height: 30px;
} }
.quiqqer-fupc-category .quiqqer-fupc-category-header {
border-bottom: 1px solid #ddd;
cursor: pointer;
font-size: 1.5em;
line-height: 30px;
}
.quiqqer-fu-profile-categories-category-items {
clear: both;
float: left;
width: 100%;
}
.quiqqer-fupc-category-items-item { .quiqqer-fupc-category-items-item {
border: 1px solid #ddd; border-top: var(--_qui-cologne-theme-border-width) solid var(--_qui-cologne-theme-border-color);
border-bottom: none; border-left: var(--_qui-cologne-theme-border-width) solid var(--_qui-cologne-theme-border-color);
border-right: var(--_qui-cologne-theme-border-width) solid var(--_qui-cologne-theme-border-color);
clear: both; clear: both;
color: #333;
display: flex;
float: left;
line-height: 40px;
overflow: hidden; overflow: hidden;
padding: 5px 0; padding: 5px 0;
position: relative; position: relative;
...@@ -89,26 +55,13 @@ ...@@ -89,26 +55,13 @@
width: 100%; width: 100%;
} }
.quiqqer-fupc-category.quiqqer-fupc-category--open .quiqqer-fupc-category-header { .quiqqer-fupc-category-items-item:last-child {
border-bottom: none !important; border-bottom: var(--_qui-cologne-theme-border-width) solid var(--_qui-cologne-theme-border-color);
}
.quiqqer-fupc-category--open .quiqqer-fupc-category-items-item {
background: #fff;
}
.quiqqer-fupc-category .quiqqer-fu-profile-categories-category-items .quiqqer-fupc-category-items-item--active,
.quiqqer-fupc-category .quiqqer-fu-profile-categories-category-items .quiqqer-fupc-category-items-item:hover {
background: #fff;
}
.quiqqer-fupc-category--open .quiqqer-fupc-category-items-item:last-child {
border-bottom: 1px solid #ddd;
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px; border-bottom-right-radius: 5px;
} }
.quiqqer-fupc-category--open .quiqqer-fupc-category-items-item:first-child { .quiqqer-fupc-category-items-item:first-child {
border-top-left-radius: 5px; border-top-left-radius: 5px;
border-top-right-radius: 5px; border-top-right-radius: 5px;
} }
...@@ -122,42 +75,19 @@ ...@@ -122,42 +75,19 @@
width: 0; width: 0;
} }
.quiqqer-fu-profile-categories-category-items .quiqqer-fupc-category-items-item--active, .quiqqer-fupc-category-items-item[data-active]:before,
.quiqqer-fu-profile-categories-category-items .quiqqer-fupc-category-items-item:hover { .quiqqer-fupc-category-items-item:is(:hover, :focus):before {
background: none;
}
.quiqqer-fu-profile-categories-category-items .quiqqer-fupc-category-items-item--active:before,
.quiqqer-fu-profile-categories-category-items .quiqqer-fupc-category-items-item:hover:before {
width: 4px; width: 4px;
} }
.quiqqer-fupc-category-items-item .fa { .quiqqer-fupc-category-items-item .fa {
line-height: 40px; line-height: 40px;
width: 40px;
} }
/***********/ /***********/
/* address */ /* address */
/***********/ /***********/
.quiqqer-frontend-users-address header,
.quiqqer-frontendUsers-userdata-section header {
padding: 20px 0;
}
.quiqqer-frontend-users-address header h2,
.quiqqer-frontendUsers-userdata-section header h2 {
padding-bottom: 0;
}
.quiqqer-frontend-users-address-edit .qui-select,
.quiqqer-frontend-users-address-edit .qui-select .drop-icon {
height: 40px;
}
.quiqqer-frontend-users-address-edit .qui-select .text {
line-height: 40px;
}
.quiqqer-frontendUsers-userdata-invoiceaddress { .quiqqer-frontendUsers-userdata-invoiceaddress {
border-bottom: 1px solid rgba(0, 0, 0, 0.1); border-bottom: 1px solid rgba(0, 0, 0, 0.1);
float: left; float: left;
...@@ -172,72 +102,10 @@ ...@@ -172,72 +102,10 @@
margin-right: 10px; margin-right: 10px;
} }
.quiqqer-frontend-users-address-list-entry {
border: 1px solid #ddd;
background: #fff;
}
.quiqqer-frontendUsers-controls-profile-categoryContent .quiqqer-frontend-users-address-list-entry-buttons button {
width: inherit;
margin-bottom: 0;
}
.cologne-main .quiqqer-frontendUsers-userdata-address h2,
.cologne-main .quiqqer-frontendUsers-userdata-invoiceaddress h2,
.cologne-main .quiqqer-frontendUsers-userdata-invoiceaddress header,
.cologne-main .quiqqer-frontendUsers-controls-profile-changepassword h2,
.cologne-main .quiqqer-frontendUsers-controls-profile-deleteaccount h2 {
margin-top: 0;
padding-top: 0;
}
@media (max-width: 768px) {
.quiqqer-frontendUsers-controls-profile-categories-mobile {
margin-bottom: 2em;
}
.quiqqer-frontend-users-address-list .quiqqer-frontend-users-address-list-entry {
width: 100%;
}
.quiqqer-frontend-users-address-list .quiqqer-frontend-users-address-list-entry:nth-child(even) {
margin-left: 0;
}
.quiqqer-frontend-users-address-list .quiqqer-frontend-users-address-list-entry:nth-child(odd) {
margin-right: 0;
}
}
/* email */
.quiqqer-frontendUsers-userdata-address-additional .quiqqer-frontendUsers-userdata-email input {
float: left;
width: calc(100% - 70px);
margin-right: 10px;
}
.quiqqer-frontendUsers-userdata-email .quiqqer-frontendUsers-userdata-email-edit {
line-height: 40px;
border-width: 1px;
border-radius: 0.25rem;
}
@media screen and (max-width: 767px) {
.cologne-main .quiqqer-frontendUsers-controls-profile-control label {
margin-bottom: 10px;
}
}
/**********/
/* Avatar */
/**********/
.quiqqer-frontendUsers-userAvatar-gravatar {
margin: 1.5rem 0;
}
/******************/ /******************/
/* profile orders */ /* profile orders */
/******************/ /******************/
/* hide top pagination */
.quiqqer-order-profile-orders .quiqqer-order-profile-orders-pagination:first-child { .quiqqer-order-profile-orders .quiqqer-order-profile-orders-pagination:first-child {
display: none; display: none;
} }
...@@ -252,7 +120,7 @@ ...@@ -252,7 +120,7 @@
:where(.loginAndRegister) .quiqqer-fu-login-container { :where(.loginAndRegister) .quiqqer-fu-login-container {
background: #f8f8f8; background: #f8f8f8;
border: 1px solid #ddd; border: var(--_qui-cologne-theme-border-width) solid var(--_qui-cologne-theme-border-color);
max-width: 400px; max-width: 400px;
position: relative; position: relative;
width: 100%; width: 100%;
......
bin/css/style.css
+ 1
− 0
Zeige Datei @ 5b31aa12
...@@ -928,6 +928,7 @@ a.toTop:before { ...@@ -928,6 +928,7 @@ a.toTop:before {
.cologne-main { .cologne-main {
margin-top: 1rem; margin-top: 1rem;
margin-bottom: 1rem;
width: 100%; width: 100%;
} }
......
bin/css/variables.css
+ 3
− 0
Zeige Datei @ 5b31aa12
...@@ -19,6 +19,9 @@ ...@@ -19,6 +19,9 @@
--_qui-cologne-header-height: 100px; --_qui-cologne-header-height: 100px;
--_qui-cologne-theme-border-color: var(--qui-cologne-theme-border-color, #ddd);
--_qui-cologne-theme-border-width: var(--qui-cologne-theme-border-width, 1px);
/* ecoyn / ecommerce */ /* ecoyn / ecommerce */
--_qui-order-basket-articles-image-width: var(--qui-order-basket-articles-image-width, 100px); --_qui-order-basket-articles-image-width: var(--qui-order-basket-articles-image-width, 100px);
--_qui-order-basket-articles-image-height: var(--qui-order-basket-articles-image-height, 100px); --_qui-order-basket-articles-image-height: var(--qui-order-basket-articles-image-height, 100px);
......
quiqqer/frontend-users/src/QUI/FrontendUsers/Controls/Profile.html
+ 78
− 67
Zeige Datei @ 5b31aa12
{if !$Category} {if !$Category}
<p> <div class="quiqqer-frontendUsers-controls-profile__noCategoriesInfo">
{locale group="quiqqer/frontend-users" var="profile.no_categories_available"} <p>
</p> {locale group="quiqqer/frontend-users" var="profile.no_categories_available"}
</p>
</div>
{else} {else}
<div class="quiqqer-frontendUsers-controls-profile__sidebar">
{if $this->getAttribute('menu')}
<div class="quiqqer-frontendUsers-controls-profile-categories">
{if $this->getAttribute('menu')} <div class="quiqqer-fupc-userinfo">
<div class="quiqqer-frontendUsers-controls-profile-categories"> {control control="QUI\TemplateCologne\Controls\SimpleUserInfo" assign=SimpleUserInfo}
{$SimpleUserInfo->create()}
<div class="quiqqer-fupc-userinfo"> </div>
{control control="QUI\TemplateCologne\Controls\SimpleUserInfo" assign=SimpleUserInfo}
{$SimpleUserInfo->create()}
</div>
{foreach $categories as $category} {foreach $categories as $category}
<div class="quiqqer-fupc-category quiqqer-fupc-category--open" <div class="quiqqer-fupc-category"
data-category="{$category.name}" data-category="{$category.name}"
> data-name="nav-category"
<div class="quiqqer-fupc-category-header"> data-open="1"
{$category.title} >
</div> <div class="quiqqer-fupc-category-header" data-name="header">
<div class="quiqqer-fu-profile-categories-category-items"> <span class="quiqqer-fupc-category-header__text">{$category.title}</span>
{foreach $category.items as $setting} <span class="fa-solid fa-angle-right quiqqer-fupc-category-header__icon" data-name="opener"></span>
</div>
<div class="quiqqer-fu-profile-categories-category-items">
{foreach $category.items as $setting}
{assign var=active value=false}
{if $currentCategory == $category.name && $currentSetting == $setting.name}
{assign var=active value=true}
{/if}
<a href="{$Site->getUrlRewritten()}/{$category.name}/{$setting.name}"
class="quiqqer-fupc-category-items-item"
{if $active}data-active{/if}
data-name="nav-category-item"
data-setting="{$setting.name}"
>
{if $setting.icon}
<span class="fa-fw quiqqer-fupc-category-items-item-icon {$setting.icon}"></span>
{/if}
<span>{$setting.title}</span>
</a>
{/foreach}
</div>
</div>
{/foreach}
</div>
{/if}
{assign var=active value=""} {* mobile categories *}
{if $currentCategory == $category.name && $currentSetting == $setting.name} <form action="" method="post" class="quiqqer-frontendUsers-controls-profile-categories-mobile">
{assign var=active value=" quiqqer-fupc-category-items-item--active"} <label class="quiqqer-frontendUsers-controls-profile-categories-mobile-label">
{/if} <select name="profile-categories-mobile">
<a href="{$Site->getUrlRewritten()}/{$category.name}/{$setting.name}" {foreach $categories as $category}
class="quiqqer-fupc-category-items-item{$active}" <optgroup label="{$category.title}">
data-setting="{$setting.name}" {foreach $category.items as $setting}
> {assign var=active value=""}
{if $setting.icon} {if $currentCategory == $category.name && $currentSetting == $setting.name}
<span class="quiqqer-fupc-category-items-item-icon {$setting.icon}"></span> {assign var=active value="selected"}
{/if} {/if}
<span>{$setting.title}</span> <option value="{$category.name}:{$setting.name}" {$active}>
</a> {$setting.title}
{/foreach} </option>
</div> {/foreach}
</optgroup>
{/foreach}
</select>
</label>
</form>
</div> </div>
{/foreach}
</div>
{/if}
<form action="" method="post">
<label class="quiqqer-frontendUsers-controls-profile-categories-mobile">
<select name="profile-categories">
{foreach $categories as $category}
<optgroup label="{$category.title}">
{foreach $category.items as $setting}
{assign var=active value=""}
{if $currentCategory== $category.name}
{assign var=active value=" selected"}
{/if}
<option value="{$category.name}:{$setting.name}"{$active}>
{$setting.title}
</option>
{/foreach}
</optgroup>
{/foreach}
</select>
</label>
</form>
<form class="quiqqer-frontendUsers-controls-profile-categoryContent" <div class="quiqqer-frontendUsers-controls-profile__content">
method="post" <form class="quiqqer-frontendUsers-controls-profile-categoryContent"
action="" data-name="form"
data-category="{$currentCategory}" method="post"
data-setting="{$currentSetting}" action=""
> data-category="{$currentCategory}"
<div class="quiqqer-frontendUsers-controls-profile-categoryContentAnimation"> data-setting="{$currentSetting}"
{$Category->create()} >
<input type="hidden" name="profile-save" value="1"> <div class="quiqqer-frontendUsers-controls-profile-categoryContentAnimation" data-name="content-animated">
{$Category->create()}
<input type="hidden" name="profile-save" value="1">
</div>
</form>
</div> </div>
</form>
{/if} {/if}
\ 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