Project-Pro/masimmo.pl
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add new SVG icons and update contact information layout in templates

Browse Source
This commit is contained in:
Jacek Pyziak
2025-01-26 18:31:40 +01:00
parent eed8f13365
commit ec7e2511ad
14 changed files with 252 additions and 12772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.vscode/ftp-kr.sync.cache.json vendored
View File

@@ -1745,20 +1745,20 @@
},
"custom.css": {
"type": "-",
"size": 63016,
"lmtime": 1737403833173,
"size": 65139,
"lmtime": 1737408715665,
"modified": false
},
"custom.css.map": {
"type": "-",
"size": 94150,
"lmtime": 1737403833173,
"size": 97932,
"lmtime": 1737408715665,
"modified": false
},
"custom.scss": {
"type": "-",
"size": 69629,
"lmtime": 1737403832675,
"size": 72208,
"lmtime": 1737408715161,
"modified": false
},
"dce0916af972e3040aa191f74b17dd46.woff2": {

3
.vscode/settings.json vendored
View File

@@ -12,7 +12,8 @@
"liveSassCompile.settings.autoprefix": "defaults",
"liveSassCompile.settings.watchOnLaunch": true,
"liveSassCompile.settings.includeItems": [
"/themes/classic/assets/css/custom.scss"
"/themes/classic/assets/css/custom.scss",
"/themes/classic/assets/css/theme.scss"
],
"git.ignoreLimitWarning": true
}

1
modules/psgdpr/views/templates/hook/displayGDPRConsent.tpl
View File

@@ -21,7 +21,6 @@
<span class="custom-checkbox">
<label class="psgdpr_consent_message">
<input id="psgdpr_consent_checkbox_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}" name="psgdpr_consent_checkbox" type="checkbox" value="1" class="psgdpr_consent_checkboxes_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">
<span><i class="material-icons rtl-no-flip checkbox-checked psgdpr_consent_icon"></i></span>
<span>{$psgdpr_consent_message nofilter}</span>{* html data *}
</label>
</span>

2
themes/classic/assets/css/custom.css
View File

File diff suppressed because one or more lines are too long

2
themes/classic/assets/css/custom.css.map
View File

File diff suppressed because one or more lines are too long

119
themes/classic/assets/css/custom.scss
View File

@@ -3337,4 +3337,123 @@ body#authentication {
color: #FFF !important;
}
}
}
#contact {
main {
.container {
>.row:nth-child(2) {
display: grid;
grid-template-columns: 310px 1fr;
gap: 32px;
@media (max-width: 767px) {
grid-template-columns: 1fr;
}
#left-column {
display: block;
width: 100%;
max-width: 100%;
padding: 0;
}
#content-wrapper {
display: block;
width: 100%;
max-width: 100%;
padding: 0;
#content {
padding: 40px;
h3 {
font-size: 32px;
color: #110E0C;
font-family: 'Inter';
font-weight: 600;
margin-bottom: 32px;
}
form {
.psgdpr_consent_message {
display: grid;
grid-template-columns: 20px 1fr;
gap: 5px;
align-items: center;
}
.btn-primary {
width: 277px;
display: flex;
align-items: center;
justify-content: center;
font-size: 14px;
font-family: 'Inter';
text-transform: none;
font-weight: 500;
height: 47px;
&:hover {
background: #462D26;
}
}
label {
color: #110E0C;
font-size: 12px;
font-weight: 500;
font-family: 'Inter';
margin-bottom: 4px;
&[for="file-upload"].btn-default {
background: #462D26;
color: #FFF;
height: 47px;
display: flex;
align-items: center;
justify-content: center;
}
}
input[type="email"],
input[type="text"],
select {
height: 47px;
display: flex;
align-items: center;
justify-content: flex-start;
padding: 0 16px;
font-size: 14px;
color: #110E0C;
font-family: 'Inter';
border: 1px solid #462D2624;
background-color: #f9f7f2;
&:focus {
outline: none;
box-shadow: none;
}
}
textarea {
padding: 0 16px;
font-size: 14px;
color: #110E0C;
font-family: 'Inter';
border: 1px solid #462D2624;
background-color: #f9f7f2;
padding: 10px;
&:focus {
outline: none;
box-shadow: none;
}
}
}
}
}
}
}
}
}

12654
themes/classic/assets/css/theme.css
View File

File diff suppressed because one or more lines are too long

2
themes/classic/assets/css/theme.css.map
View File

File diff suppressed because one or more lines are too long

88
themes/classic/assets/css/theme.scss
View File

@@ -13090,60 +13090,48 @@ body#checkout #hook-display-after-carrier>[class^='col'].links .row>[class^='col
margin-bottom: 2rem;
color: #7a7a7a;
word-wrap: break-word;
}
background: #ECE9E2;
padding: 28px;
.contact-rich h4 {
margin-bottom: 2rem;
color: #232323;
text-transform: uppercase;
}
.contact-rich .block {
height: auto;
overflow: hidden;
}
.contact-rich .block .icon {
float: left;
width: 3.5rem;
}
.contact-rich .block .icon i {
font-size: 2rem;
}
.contact-rich .block .data {
width: auto;
overflow: hidden;
font-size: 0.875rem;
color: #232323;
}
.contact-rich .block .data.email {
padding-top: 0.375rem;
}
.contact-rich .block a[href^='mailto:'] {
margin-top: 1rem;
clear: both;
}
@media (min-width: 576px) {
.contact-rich .block a[href^='mailto:'] {
font-size: 0.815rem;
h4 {
margin-bottom: 2rem;
color: #232323;
font-size: 14px;
font-family: 'Inter';
font-weight: 700;
margin-bottom: 24px !important;
}
}
.contact-form {
width: 100%;
padding: 1rem;
color: #7a7a7a;
background: #fff;
}
.block {
height: auto;
overflow: hidden;
padding: 0 !important;
background: transparent !important;
box-shadow: none !important;
display: grid;
grid-template-columns: 16px 1fr;
float: none !important;
gap: 16px;
margin-bottom: 24px !important;
.contact-form h3 {
color: #232323;
text-transform: uppercase;
.icon {
display: flex;
align-items: flex-start;
justify-content: center;
padding-top: 2px;
}
.data {
color: #462D26;
font-size: 14px;
font-weight: 400;
a {
color: #462D26;
font-weight: 600;
}
}
}
}
#products #main .page-header,

10
themes/classic/assets/img/icon-mail.svg Normal file
View File

@@ -0,0 +1,10 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_6369_8098)">
<path d="M14 3H2C1.86739 3 1.74021 3.05268 1.64645 3.14645C1.55268 3.24021 1.5 3.36739 1.5 3.5V12C1.5 12.2652 1.60536 12.5196 1.79289 12.7071C1.98043 12.8946 2.23478 13 2.5 13H13.5C13.7652 13 14.0196 12.8946 14.2071 12.7071C14.3946 12.5196 14.5 12.2652 14.5 12V3.5C14.5 3.36739 14.4473 3.24021 14.3536 3.14645C14.2598 3.05268 14.1326 3 14 3ZM13.5 12H2.5V4.63688L7.66187 9.36875C7.75412 9.45343 7.87478 9.50041 8 9.50041C8.12522 9.50041 8.24588 9.45343 8.33813 9.36875L13.5 4.63688V12Z" fill="#462D26"/>
</g>
<defs>
<clipPath id="clip0_6369_8098">
<rect width="16" height="16" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 752 B

10
themes/classic/assets/img/icon-marker.svg Normal file
View File

@@ -0,0 +1,10 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_6369_8101)">
<path d="M8 1C6.54182 1.00165 5.14383 1.58165 4.11274 2.61274C3.08165 3.64383 2.50165 5.04182 2.5 6.5C2.5 11.2063 7.5 14.7606 7.71313 14.9094C7.7972 14.9683 7.89735 14.9999 8 14.9999C8.10265 14.9999 8.2028 14.9683 8.28687 14.9094C8.5 14.7606 13.5 11.2063 13.5 6.5C13.4983 5.04182 12.9184 3.64383 11.8873 2.61274C10.8562 1.58165 9.45818 1.00165 8 1ZM8 4.5C8.39556 4.5 8.78224 4.6173 9.11114 4.83706C9.44004 5.05682 9.69638 5.36918 9.84776 5.73463C9.99913 6.10009 10.0387 6.50222 9.96157 6.89018C9.8844 7.27814 9.69392 7.63451 9.41421 7.91421C9.13451 8.19392 8.77814 8.3844 8.39018 8.46157C8.00222 8.53874 7.60009 8.49913 7.23463 8.34776C6.86918 8.19638 6.55682 7.94004 6.33706 7.61114C6.1173 7.28224 6 6.89556 6 6.5C6 5.96957 6.21071 5.46086 6.58579 5.08579C6.96086 4.71071 7.46957 4.5 8 4.5Z" fill="#462D26"/>
</g>
<defs>
<clipPath id="clip0_6369_8101">
<rect width="16" height="16" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

10
themes/classic/assets/img/icon-phone.svg Normal file
View File

@@ -0,0 +1,10 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_6369_8095)">
<path d="M10.2744 9.08349C10.3436 9.03742 10.4233 9.00934 10.5061 9.00181C10.5889 8.99428 10.6723 9.00753 10.7488 9.04037L13.6963 10.361C13.7956 10.4034 13.8785 10.4769 13.9326 10.5704C13.9867 10.664 14.009 10.7725 13.9963 10.8797C13.8991 11.6054 13.5418 12.2711 12.9907 12.753C12.4395 13.2349 11.7321 13.5003 11 13.4997C8.74566 13.4997 6.58365 12.6042 4.98959 11.0101C3.39553 9.41609 2.5 7.25408 2.5 4.99974C2.49944 4.26762 2.7648 3.56021 3.24673 3.00908C3.72865 2.45794 4.39435 2.10059 5.12 2.00349C5.22727 1.99075 5.33578 2.01309 5.4293 2.06717C5.52281 2.12125 5.5963 2.20416 5.63875 2.30349L6.95938 5.25349C6.99182 5.32926 7.00504 5.41188 6.99784 5.49398C6.99064 5.57609 6.96326 5.65515 6.91813 5.72412L5.5825 7.31224C5.53512 7.38373 5.50711 7.46629 5.50119 7.55185C5.49528 7.63741 5.51166 7.72304 5.54875 7.80037C6.06563 8.85849 7.15938 9.93912 8.22063 10.451C8.29836 10.4879 8.38439 10.5039 8.47021 10.4975C8.55602 10.491 8.63867 10.4623 8.71 10.4141L10.2744 9.08349Z" fill="#462D26"/>
</g>
<defs>
<clipPath id="clip0_6369_8095">
<rect width="16" height="16" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

73
themes/classic/modules/contactform/views/templates/widget/contactform.tpl
View File

@@ -39,32 +39,37 @@
<div class="form-group row">
<div class="col-md-9 col-md-offset-3">
<h3>{l s='Contact us' d='Shop.Theme.Global'}</h3>
<h3>{l s='Skontaktuj się z nami' d='Shop.Theme.Global'}</h3>
</div>
</div>
<div class="form-group row">
<label class="col-md-3 form-control-label" for="id_contact">{l s='Subject' d='Shop.Forms.Labels'}</label>
<div class="col-md-6">
<select name="id_contact" id="id_contact" class="form-control form-control-select">
{foreach from=$contact.contacts item=contact_elt}
<option value="{$contact_elt.id_contact}">{$contact_elt.name}</option>
{/foreach}
</select>
<div class="form-group">
<label class="form-control-label" for="email">{l s='Email address' d='Shop.Forms.Labels'}</label>
<div>
<input id="email" class="form-control" name="from" type="email" value="{$contact.email}" placeholder="{l s='your@email.com' d='Shop.Forms.Help'}">
</div>
</div>
<div class="form-group row">
<label class="col-md-3 form-control-label" for="email">{l s='Email address' d='Shop.Forms.Labels'}</label>
<div class="row">
<div class="col-md-6">
<input
id="email"
class="form-control"
name="from"
type="email"
value="{$contact.email}"
placeholder="{l s='your@email.com' d='Shop.Forms.Help'}"
>
<div class="form-group">
<label class="form-control-label" for="id_contact">{l s='Subject' d='Shop.Forms.Labels'}</label>
<div>
<select name="id_contact" id="id_contact" class="form-control form-control-select">
{foreach from=$contact.contacts item=contact_elt}
<option value="{$contact_elt.id_contact}">{$contact_elt.name}</option>
{/foreach}
</select>
</div>
</div>
</div>
<div class="col-md-6">
{if $contact.allow_file_upload}
<div class="form-group">
<label class="form-control-label" for="file-upload">{l s='Attachment' d='Shop.Forms.Labels'}</label>
<div>
<input id="file-upload" type="file" name="fileUpload" class="filestyle" data-buttonText="{l s='Choose file' d='Shop.Theme.Actions'}">
</div>
</div>
{/if}
</div>
</div>
@@ -85,21 +90,9 @@
</div>
{/if}
{if $contact.allow_file_upload}
<div class="form-group row">
<label class="col-md-3 form-control-label" for="file-upload">{l s='Attachment' d='Shop.Forms.Labels'}</label>
<div class="col-md-6">
<input id="file-upload" type="file" name="fileUpload" class="filestyle" data-buttonText="{l s='Choose file' d='Shop.Theme.Actions'}">
</div>
<span class="col-md-3 form-control-comment">
{l s='optional' d='Shop.Forms.Help'}
</span>
</div>
{/if}
<div class="form-group row">
<label class="col-md-3 form-control-label" for="contactform-message">{l s='Message' d='Shop.Forms.Labels'}</label>
<div class="col-md-9">
<div class="form-group">
<label class="form-control-label" for="contactform-message">{l s='Message' d='Shop.Forms.Labels'}</label>
<div>
<textarea
id="contactform-message"
class="form-control"
@@ -111,16 +104,14 @@
</div>
{if isset($id_module)}
<div class="form-group row">
<div class="offset-md-3">
{hook h='displayGDPRConsent' id_module=$id_module}
</div>
<div class="form-group">
{hook h='displayGDPRConsent' id_module=$id_module}
</div>
{/if}
</section>
<footer class="form-footer text-sm-right">
<footer class="form-footer">
<style>
input[name=url] {
display: none !important;

38
themes/classic/modules/ps_contactinfo/ps_contactinfo-rich.tpl
View File

@@ -24,21 +24,33 @@
*}
<div class="contact-rich">
<h4>{l s='Store information' d='Shop.Theme.Global'}</h4>
<div class="block">
<div class="icon"><i class="material-icons">&#xE55F;</i></div>
<div class="data">{$contact_infos.address.formatted nofilter}</div>
</div>
<h4>{l s='Informacje kontaktowe:' d='Shop.Theme.Global'}</h4>
{if $contact_infos.phone}
<hr/>
<div class="block">
<div class="icon"><i class="material-icons">&#xE0CD;</i></div>
<div class="icon">
<img src="/themes/classic/assets/img/icon-phone.svg">
</div>
<div class="data">
{l s='Call us:' d='Shop.Theme.Global'}<br/>
<a href="tel:{$contact_infos.phone}">{$contact_infos.phone}</a>
</div>
</div>
{/if}
{if $contact_infos.email && $display_email}
<div class="block">
<div class="icon">
<img src="/themes/classic/assets/img/icon-mail.svg">
</div>
<div class="data">
{mailto address=$contact_infos.email encode="javascript"}
</div>
</div>
{/if}
<div class="block">
<div class="icon">
<img src="/themes/classic/assets/img/icon-marker.svg">
</div>
<div class="data">{$contact_infos.address.formatted nofilter}</div>
</div>
{if $contact_infos.fax}
<hr/>
<div class="block">
@@ -49,14 +61,4 @@
</div>
</div>
{/if}
{if $contact_infos.email && $display_email}
<hr/>
<div class="block">
<div class="icon"><i class="material-icons">&#xE158;</i></div>
<div class="data email">
{l s='Email us:' d='Shop.Theme.Global'}<br/>
</div>
{mailto address=$contact_infos.email encode="javascript"}
</div>
{/if}
</div>