From de38aae8d5fae806f7a11117d7ef78d8803c2296 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Sat, 15 Aug 2026 09:00:25 +0000 Subject: [PATCH] Apply client design feedback on the parking copy, icons and barber layout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Four items from the salon, all three languages where applicable. Massage section icon - The icon above Om oss (and above Behandlinger, Priser and Åpningstider - it is the same image in all four) was beauty's makeup icon, copied in as a placeholder before massage had any assets of its own. Replaced with the herbal-compress icon tinted to the massage sage, mirroring how beauty's is tinted to its rose. beauty/ollo_rose.png is untouched; the copy under assets/img/massage/ is removed, and the one dead template rule that still pointed at it (.box-heading:before, which renders on no page) repointed. Parking copy, barber + beauty + massage, no/en/hu - Dropped the "park free of charge during the treatments" clause from the owner bio and replaced it with the new two-space wording. - Replaced the note under Åpningstider. The Norwegian original was misspelled differently in each vertical ("kundeprarking" on barber, "kunderparking" on beauty); both are gone. - massage picks both up automatically: its owner block is extracted from beauty-form-.php at generation time, and the hours note comes from the generator. Barber treatments grid: level the six icons - .service-text reserves padding-bottom for the 80px floated icon but has no height, so every block sizes to its own text. Measured on the live page the left column ran 155/155px against the right column's 185/206px, because its titles wrap to two lines - so the icons drifted further apart with each row (0, 30, 81px). - Trimmed the reserved padding and gave every block the same floor, so all six are identical and the rows line up. 195px clears the tallest block and leaves room for a three-line title at the narrow end of the desktop range. Desktop only: below 981px the columns stack full width, where a floor would only add dead space. - beauty drifts 20px and massage 0px, so both are left alone. Co-Authored-By: Claude Opus 5 --- .../views/pages/includes/barber-form-en.php | 6 ++-- .../views/pages/includes/barber-form-hu.php | 4 +-- .../views/pages/includes/barber-form-no.php | 4 +-- .../views/pages/includes/beauty-form-en.php | 6 ++-- .../views/pages/includes/beauty-form-hu.php | 7 +++-- .../views/pages/includes/beauty-form-no.php | 6 ++-- .../views/pages/includes/massage-form-en.php | 14 +++++----- .../views/pages/includes/massage-form-hu.php | 15 +++++----- .../views/pages/includes/massage-form-no.php | 14 +++++----- assets/css/barber.css | 26 +++++++++++++++++- assets/css/massage.css | 2 +- assets/img/massage/ollo_rose.png | Bin 3614 -> 0 bytes assets/img/massage/section-icon.png | Bin 0 -> 2829 bytes 13 files changed, 65 insertions(+), 39 deletions(-) delete mode 100755 assets/img/massage/ollo_rose.png create mode 100644 assets/img/massage/section-icon.png diff --git a/application/views/pages/includes/barber-form-en.php b/application/views/pages/includes/barber-form-en.php index a1f2aae..7ffb6b2 100755 --- a/application/views/pages/includes/barber-form-en.php +++ b/application/views/pages/includes/barber-form-en.php @@ -49,8 +49,8 @@

With nearly 10 years of experience in the beauty industry, including many years of international experience, I thought it was time to open my own studio here in - Trondheim at Innheredsveien 92, where guests can park free of charge during - the treatments. + Trondheim at Innheredsveien 92. We have two private parking spaces that our + guests can use free of charge during their treatment, subject to availability.

It is an extra pleasure for me that I managed to find a traditional place where @@ -260,7 +260,7 @@

Working Hours

-

Free customer parking during treatments

+

2 free customer parking spaces – subject to availability

diff --git a/application/views/pages/includes/barber-form-hu.php b/application/views/pages/includes/barber-form-hu.php index 230a278..05cd6fe 100755 --- a/application/views/pages/includes/barber-form-hu.php +++ b/application/views/pages/includes/barber-form-hu.php @@ -37,7 +37,7 @@ Hiszem, hogy a szépség, a divat és a trend nem nemhez kötött, így nálunk lehetőség van arra, hogy mindenki egy helyen szépülhessen nemtől függetlenül. A Barber, Beauty és Masszázs részlegeink között pedig megtalálhatjátok a számotokra megfelelő szolgáltatásokat.

- Közel 10 éves szépségipari, és közte több éves nemzetközi tapasztalattal elérkezettnek láttam az időt, hogy megnyissam saját stúdiómat itt Trondheimben, az Innheredsveien 92 szám alatt, ahol a vendégeknek lehetősége van ingyenes parkolásra is a kezelések időtartama alatt. + Közel 10 éves szépségipari, és közte több éves nemzetközi tapasztalattal elérkezettnek láttam az időt, hogy megnyissam saját stúdiómat itt Trondheimben, az Innheredsveien 92 szám alatt. Két privát parkolóhellyel rendelkezünk, amelyeket vendégeink a kezelés ideje alatt ingyenesen használhatnak, amennyiben van szabad hely.

Extra öröm számomra, hogy egy olyan tradicionális helyet sikerült találnom, ahol az 50-es években már szépségszalon működött, ennek köszönhetően a hagyományt, modern környezetben lehetőségem van tovább vinni. @@ -237,7 +237,7 @@

Nyitvatartási idő

-

Ingyenes parkolás a szolgáltatások ideje alatt

+

2 ingyenes vendégparkoló – szabad hely esetén

diff --git a/application/views/pages/includes/barber-form-no.php b/application/views/pages/includes/barber-form-no.php index 1c5cf5f..15d6780 100755 --- a/application/views/pages/includes/barber-form-no.php +++ b/application/views/pages/includes/barber-form-no.php @@ -38,7 +38,7 @@ Jeg mener at skjønnhet, mote og trend ikke er kjønnsspesifikke, og hos oss har derfor alle mulighet til å bli vakrere på ett sted, uavhengig av kjønn. Hos Studio Beve Barber, Studio Beve Beauty og Studio Beve Massasje kan dere finne de tjenestene som er riktige for dere.

- Med nesten 10 års erfaring fra skjønnhetsindustrien, inkludert mange års internasjonal erfaring, tenkte jeg det var på tide å åpne mitt eget studio her i Trondheim i Innheredsveien 92, hvor gjestene har mulighet til å parkere gratis under behandlingene. + Med nesten 10 års erfaring fra skjønnhetsindustrien, inkludert mange års internasjonal erfaring, tenkte jeg det var på tide å åpne mitt eget studio her i Trondheim i Innheredsveien 92. Vi har to private parkeringsplasser som våre gjester kan benytte gratis under behandlingen, dersom det er ledig kapasitet.

Det er en ekstra glede for meg at jeg klarte å finne et tradisjonelt sted hvor det allerede var en skjønnhetssalong på 50-tallet. Derfor har jeg nå muligheten til å videreføre denne tradisjonen i et moderne miljø. @@ -236,7 +236,7 @@

Åpningstider

-

Gratis kundeprarking under behandlingen

+

2 gratis kundeparkeringsplasser – ved ledig kapasitet

diff --git a/application/views/pages/includes/beauty-form-en.php b/application/views/pages/includes/beauty-form-en.php index e54437e..69f90e5 100755 --- a/application/views/pages/includes/beauty-form-en.php +++ b/application/views/pages/includes/beauty-form-en.php @@ -47,8 +47,8 @@

With nearly 10 years of experience in the beauty industry, including many years of international experience, I thought it was time to open my own studio here in - Trondheim at Innheredsveien 92, where guests can park free of charge during - the treatments. + Trondheim at Innheredsveien 92. We have two private parking spaces that our + guests can use free of charge during their treatment, subject to availability.

It is an extra pleasure for me that I managed to find a traditional place where @@ -266,7 +266,7 @@

Working Hours

-

Free customer parking during treatments

+

2 free customer parking spaces – subject to availability

diff --git a/application/views/pages/includes/beauty-form-hu.php b/application/views/pages/includes/beauty-form-hu.php index c6a8171..66dd3b8 100755 --- a/application/views/pages/includes/beauty-form-hu.php +++ b/application/views/pages/includes/beauty-form-hu.php @@ -45,8 +45,9 @@

Közel 10 éves szépségipari, és közte több éves nemzetközi tapasztalattal elérkezettnek láttam az időt, hogy megnyissam saját stúdiómat itt - Trondheimben, az Innheredsveien 92 szám alatt, ahol a vendégeknek lehetősége - van ingyenes parkolásra is a kezelések időtartama alatt. + Trondheimben, az Innheredsveien 92 szám alatt. Két privát parkolóhellyel + rendelkezünk, amelyeket vendégeink a kezelés ideje alatt ingyenesen + használhatnak, amennyiben van szabad hely.

Extra öröm számomra, hogy egy olyan tradicionális helyet sikerült találnom, @@ -286,7 +287,7 @@

Nyitvatartási idő

-

Ingyenes parkolás a szolgáltatások ideje alatt

+

2 ingyenes vendégparkoló – szabad hely esetén

diff --git a/application/views/pages/includes/beauty-form-no.php b/application/views/pages/includes/beauty-form-no.php index ebf8363..512b37c 100755 --- a/application/views/pages/includes/beauty-form-no.php +++ b/application/views/pages/includes/beauty-form-no.php @@ -46,8 +46,8 @@

Med nesten 10 års erfaring fra skjønnhetsindustrien, inkludert mange års internasjonal erfaring, tenkte jeg det var på tide å åpne mitt eget studio her i - Trondheim i Innheredsveien 92, hvor gjestene har mulighet til å parkere gratis - under behandlingene. + Trondheim i Innheredsveien 92. Vi har to private parkeringsplasser som våre + gjester kan benytte gratis under behandlingen, dersom det er ledig kapasitet.

Det er en ekstra glede for meg at jeg klarte å finne et tradisjonelt sted hvor det @@ -286,7 +286,7 @@

Åpningstider

-

Gratis kunderparking under behandlingen

+

2 gratis kundeparkeringsplasser – ved ledig kapasitet

diff --git a/application/views/pages/includes/massage-form-en.php b/application/views/pages/includes/massage-form-en.php index 87d7e9a..902ca14 100644 --- a/application/views/pages/includes/massage-form-en.php +++ b/application/views/pages/includes/massage-form-en.php @@ -34,7 +34,7 @@
- +

About us

@@ -64,8 +64,8 @@

With nearly 10 years of experience in the beauty industry, including many years of international experience, I thought it was time to open my own studio here in - Trondheim at Innheredsveien 92, where guests can park free of charge during - the treatments. + Trondheim at Innheredsveien 92. We have two private parking spaces that our + guests can use free of charge during their treatment, subject to availability.

It is an extra pleasure for me that I managed to find a traditional place where @@ -112,7 +112,7 @@

- +

Treatments

@@ -189,7 +189,7 @@
- +

Prices

The stated treatment time is hands-on treatment time. The appointment reserved for you is slightly longer, allowing time to change and to pay.

@@ -258,9 +258,9 @@
- +

Opening Hours

-

Free customer parking during your treatment

+

2 free customer parking spaces – subject to availability

diff --git a/application/views/pages/includes/massage-form-hu.php b/application/views/pages/includes/massage-form-hu.php index 3c537c2..3d3aaaa 100644 --- a/application/views/pages/includes/massage-form-hu.php +++ b/application/views/pages/includes/massage-form-hu.php @@ -34,7 +34,7 @@
- +

Rólunk

@@ -62,8 +62,9 @@

Közel 10 éves szépségipari, és közte több éves nemzetközi tapasztalattal elérkezettnek láttam az időt, hogy megnyissam saját stúdiómat itt - Trondheimben, az Innheredsveien 92 szám alatt, ahol a vendégeknek lehetősége - van ingyenes parkolásra is a kezelések időtartama alatt. + Trondheimben, az Innheredsveien 92 szám alatt. Két privát parkolóhellyel + rendelkezünk, amelyeket vendégeink a kezelés ideje alatt ingyenesen + használhatnak, amennyiben van szabad hely.

Extra öröm számomra, hogy egy olyan tradicionális helyet sikerült találnom, @@ -110,7 +111,7 @@

- +

Szolgáltatások

@@ -187,7 +188,7 @@
- +

Árlista

A feltüntetett kezelési idő a tényleges masszázsidőt jelenti. A lefoglalt időpont ennél valamivel hosszabb, hogy legyen idő az át­öltözésre és a fizetésre.

@@ -256,9 +257,9 @@
- +

Nyitvatartás

-

Ingyenes vendégparkolás a kezelés ideje alatt

+

2 ingyenes vendégparkoló – szabad hely esetén

diff --git a/application/views/pages/includes/massage-form-no.php b/application/views/pages/includes/massage-form-no.php index a784ef5..19fc040 100644 --- a/application/views/pages/includes/massage-form-no.php +++ b/application/views/pages/includes/massage-form-no.php @@ -34,7 +34,7 @@
- +

Om oss

@@ -64,8 +64,8 @@

Med nesten 10 års erfaring fra skjønnhetsindustrien, inkludert mange års internasjonal erfaring, tenkte jeg det var på tide å åpne mitt eget studio her i - Trondheim i Innheredsveien 92, hvor gjestene har mulighet til å parkere gratis - under behandlingene. + Trondheim i Innheredsveien 92. Vi har to private parkeringsplasser som våre + gjester kan benytte gratis under behandlingen, dersom det er ledig kapasitet.

Det er en ekstra glede for meg at jeg klarte å finne et tradisjonelt sted hvor det @@ -112,7 +112,7 @@

- +

Behandlinger

@@ -189,7 +189,7 @@
- +

Priser

Oppgitt behandlingstid er ren behandlingstid. Timen som reserveres er noe lengre, slik at det er tid til av- og påkledning og betaling.

@@ -258,9 +258,9 @@
- +

Åpningstider

-

Gratis kunderparking under behandlingen

+

2 gratis kundeparkeringsplasser – ved ledig kapasitet

diff --git a/assets/css/barber.css b/assets/css/barber.css index f620802..76b14df 100755 --- a/assets/css/barber.css +++ b/assets/css/barber.css @@ -4575,4 +4575,28 @@ input, select, textarea { width: 5px; } - } \ No newline at end of file + } + +/* ------------------------------------------------------------------ * + * Treatments grid: keep the six icons level across the two columns. + * + * .service-text reserves padding-bottom for the 80px floated icon but has no + * height, so every block sizes to its own text. Measured on the live page the + * left column runs 155/155px while the right runs 185/206px - its titles wrap + * to two lines - so the icons drift further apart with each row (0, 30, 81px). + * + * Fix: trim the reserved padding and give every block the same floor, so all + * six are identical and the rows line up. 195px clears the tallest block and + * leaves room for a three-line title at the narrow end of the desktop range. + * + * Desktop only: below 981px .one-third becomes full width and the columns + * stack, where a floor would only add dead space. + * ------------------------------------------------------------------ */ +@media screen and (min-width: 981px) { + + .service-area .one-third .service .service-text { + padding-bottom: 55px; + min-height: 195px; + } + +} diff --git a/assets/css/massage.css b/assets/css/massage.css index 3526303..8a1f273 100644 --- a/assets/css/massage.css +++ b/assets/css/massage.css @@ -3191,7 +3191,7 @@ input, select, textarea { .common-home .box-heading:before, .box.related .box-heading:before { content: ""; - background: url(../../assets/img/massage/ollo_rose.png) no-repeat scroll; + background: url(../../assets/img/massage/section-icon.png) no-repeat scroll; width: 75px; height: 65px; position: absolute; diff --git a/assets/img/massage/ollo_rose.png b/assets/img/massage/ollo_rose.png deleted file mode 100755 index 4b4b99bb592d4c29ba4a31f4b905cf7fefde4641..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3614 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 diff --git a/assets/img/massage/section-icon.png b/assets/img/massage/section-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..afde0d7e9af8eca554191154f43f108184cce11a GIT binary patch literal 2829 zcmeH|`8U)J7r?(+$1Y?a4UMJ2L!yK%lVunqTP92PEkZ(=Yz+;DiR{_ek-bDHYLH!H zZ)9!kJ4r<3@%|g{dCs}_e$Kt;{`5KboEvLwq{qfA$P54gn?6F@^o&+#i2%`_RV{a} z{4+qD5T+;qz(@cw zManpMD6ycWHssow6=|nYXAc;rICJXK&e$uN|eQ z&3*Ap4=Mjs;E2@I24d*Jh_i;#UmvBzxCY_?NncSZaZv^UhH`yvE%UqWRT+o3xY3+l zd8BF{DBaTtz9jF@G@|z|CUw-X}PMW%#wm z2YTbN5w9EgXqDsrd6G63WX|zXOp3bV!OIMDKepOll=zs|GKt^@xMz2xm~62HEsH5{ zZ>JXpO(qNKvuNik3J~|YYev)evS6H;%wZ4A?eIC)F++#$I=N;i&pLS)S0ud_a+zc^ zpK4Mb{1=-KriBa!xv0-`K|vFe{P1`*Z#SHe8Otst$9~8TFQo&7mb;3d2FbZNtF z`A^&d{H(4Ot8nALs9NKvELA+JulQ>SNO`XN~R!~EIkvDg|g z8ZivQ?Z=Kvl>QEcDWxE|J@}#3FE=2#`qi9X<1z)BuP8345LE>tWuWaJTL^+=U!chc zM>?G8=KRGi_hh6hi5e14y|m zjSe-*bnEzoocYTL4T5^vSgw}18+F7F6g>K3;^z|h_#sObW8c6=!FL)$F<-|-Q_!QK ztKW{0-4VL!HHjZHEO&2E1rS-0-mlB^I!1}M0TJbjsN(D+?1%N$dS_xC3o0R{r)#dG z@|Uq{r?7w2n$?2SNX(M~< zo0Tl)>^;1>_oi+zx#5)%K`pbcLRs~bfpA-%3<|59!YOwH|Ig}OfvJs*>USfiE4l9e zp4MGBlMUSDR`bx`pWP->SD0)f7BqPM*j~21!^9GMPsOVL zm)H_qgKFZfea+4vVy+^3x*4cOWg;M*`pn!h4A5%9kzFggj*uY@tP&a>tK{73aI=|nnebh&86D@zBU{9r{eq^gJ1 zjkRkSc65$sCbhj8q)#;WB9$0rTUgwhhR%OwU+2tW za`QzKA|G@6_?g9#sCAYC_d{VGohJklMz@?%ig~!$f_L;O^5RJ<%VLm1R*9emUvzZe zBCNB}Jo|i<;+I0V>lntvy5CRZuG>Mq=D|H>E+R3@YB5v$%nRYS=1W?T0XyywirYUiOb zU^9xo)j@K{^^h-S)(W`VD^_?aZ3lm{sCW)m*3_#n;rCSZe)^`!jNy(@i4cDajkbY! zyWd9VsTJ*`@% zu0lM3mq)z{5u7=eUHI^TDbDnu$kjcemB?mG&lZNG7~-DiWvm%`ZKxmdttr3dlKA<% z3E{^b!p+5HdkrqcvFG3(5?d5XmEceeO>ka(6nxXc?plyM?5*UQuOjkjSgkOj-fW6J pE$|eh5fPHTXd^!sR=Hh&3Y1vG65g1#Hk>^&Kwrm5yBcnf{TIPI9DM)) literal 0 HcmV?d00001