may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2022-10-10 12:29:19 +02:00
commit b941eced6d
5 changed files with 51 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
frontend/drupal9/web/themes/custom/pro1ka/css/style.css
View File

@ -1449,7 +1449,7 @@ input.error-field {
to { to {
width: 20px; } } width: 20px; } }
#nakupovanje-1ka { #nakupovanje-1ka {
width: 1000px; width: 1040px;
margin: 0 auto; } margin: 0 auto; }
.accordion-toggle { .accordion-toggle {
@ -1519,28 +1519,39 @@ input.error-field {
background: white; background: white;
margin-bottom: 3rem; } margin-bottom: 3rem; }
.nakup-1ka .leva { .nakup-1ka .leva {
width: 50%; width: 45%;
border-right: 1px #d1d1d1 solid; border-right: 1px #d1d1d1 solid;
padding-right: 40px; } padding-right: 40px; }
.nakup-1ka .leva .month-pick { .nakup-1ka .leva .month-pick {
width: 100%; } width: 100%; }
.nakup-1ka .leva .sklop .checkbox-field { .nakup-1ka .leva .sklop .checkbox-field {
padding: 0; } padding-left: 20px; }
.nakup-1ka .desna { .nakup-1ka .desna {
width: 50%; width: 55%;
padding-left: 40px; padding-left: 40px;
display: flex; display: flex;
flex-direction: row; } flex-direction: row;
padding-top: 104px; }
.nakup-1ka .desna .ddesna { .nakup-1ka .desna .ddesna {
padding-top: 50px; padding-top: 50px;
margin-left: auto; margin-left: auto;
padding-top: 104px; } padding-top: 33px; }
.nakup-1ka .desna .ddesna .cena-z-ddv-text { .nakup-1ka .desna .ddesna .cena-z-ddv-text {
font-size: 18px; }
.nakup-1ka .desna .dleva {
width: 54%; }
.nakup-1ka .desna .dleva h4 {
font-size: 16px; } font-size: 16px; }
.nakup-1ka .desna .dleva {
width: 60%; }
.nakup-1ka .desna .dleva .text-small {
font-size: 16px;
color: #1e88e5;
margin-bottom: 16px; }
.nakup-1ka .desna .dleva h3 {
margin-bottom: 16px; }
.nakup-1ka .desna .dleva h4 {
font-size: 16px;
margin: 0; }
.nakup-1ka .desna .dleva h4.margintb {
margin-top: 20px;
margin-bottom: 16px; }
.nakup-1ka .section-main { .nakup-1ka .section-main {
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
@ -1689,8 +1700,8 @@ input.error-field {
font-weight: 600; font-weight: 600;
margin-bottom: 0; } margin-bottom: 0; }
.nakup-1ka #skupaj-placilo .text-small { .nakup-1ka #skupaj-placilo .text-small {
font-size: 14px; font-style: italic;
color: #1e88e5; } font-size: 14px; }
.nakup-1ka .col._narocilo { .nakup-1ka .col._narocilo {
padding-top: 2rem; } padding-top: 2rem; }
.nakup-1ka .col._narocilo .col { .nakup-1ka .col._narocilo .col {
@ -1753,7 +1764,6 @@ input.error-field {
padding-top: 0px; } padding-top: 0px; }
@media (max-width: 1050px) { @media (max-width: 1050px) {
.nakup-1ka .izbira .paket,
.nakup-1ka .izbira .paket.vrsta-placila, .nakup-1ka .izbira .paket.vrsta-placila,
.nakup-1ka .izbira .mesec { .nakup-1ka .izbira .mesec {
width: 259px; } width: 259px; }
@ -1765,7 +1775,6 @@ input.error-field {
.paketi p.compare-descr { .paketi p.compare-descr {
min-height: 39%; } min-height: 39%; }
.nakup-1ka .izbira .paket,
.nakup-1ka .izbira .paket.vrsta-placila, .nakup-1ka .izbira .paket.vrsta-placila,
.nakup-1ka .izbira .mesec { .nakup-1ka .izbira .mesec {
width: 100%; width: 100%;
@ -1777,7 +1786,6 @@ input.error-field {
.nakup-1ka .col { .nakup-1ka .col {
padding-right: 0; padding-right: 0;
padding-left: 0; } padding-left: 0; }
.nakup-1ka .izbira .paket,
.nakup-1ka .izbira .paket.vrsta-placila, .nakup-1ka .izbira .paket.vrsta-placila,
.nakup-1ka .izbira .mesec { .nakup-1ka .izbira .mesec {
max-width: 100%; max-width: 100%;

2
frontend/drupal9/web/themes/custom/pro1ka/js/nakupovanje.js
View File

@ -226,8 +226,6 @@ function prikaziPoljeEracun(){
var accordion = document.getElementsByClassName("accordion"); var accordion = document.getElementsByClassName("accordion");
var acci; var acci;
console.log(accordion);
for (acci = 0; acci < accordion.length; acci++) { for (acci = 0; acci < accordion.length; acci++) {
let head = accordion[acci].getElementsByClassName("accordion-head")[0]; let head = accordion[acci].getElementsByClassName("accordion-head")[0];
let body = accordion[acci].getElementsByClassName("accordion-toggle")[0]; let body = accordion[acci].getElementsByClassName("accordion-toggle")[0];

37
frontend/drupal9/web/themes/custom/pro1ka/sass/components/_nakup.scss
View File

@ -11,7 +11,7 @@
} }
#nakupovanje-1ka{ #nakupovanje-1ka{
width: 1000px; width: 1040px;
margin: 0 auto; margin: 0 auto;
} }
@ -121,7 +121,7 @@
margin-bottom: 3rem; margin-bottom: 3rem;
.leva{ .leva{
width: 50%; width: 45%;
border-right: 1px #d1d1d1 solid; border-right: 1px #d1d1d1 solid;
padding-right: 40px; padding-right: 40px;
@ -131,32 +131,49 @@
.sklop{ .sklop{
.checkbox-field{ .checkbox-field{
padding: 0; padding-left: 20px;
} }
} }
} }
.desna{ .desna{
width: 50%; width: 55%;
padding-left: 40px; padding-left: 40px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
padding-top: 104px;
.ddesna{ .ddesna{
//width: 50%; //width: 50%;
padding-top: 50px; padding-top: 50px;
margin-left: auto; margin-left: auto;
padding-top: 104px; padding-top: 33px;
.cena-z-ddv-text{ .cena-z-ddv-text{
font-size: 18px; font-size: 16px;
} }
} }
.dleva{ .dleva{
width: 54%; width: 60%;
.text-small {
font-size: 16px;
color: $modra;
margin-bottom: 16px;
}
h3{
margin-bottom: 16px;
}
h4{ h4{
font-size: 16px; font-size: 16px;
margin: 0;
&.margintb{
margin-top: 20px;
margin-bottom: 16px;
}
} }
} }
} }
@ -396,9 +413,8 @@
} }
.text-small { .text-small {
//font-style: italic; font-style: italic;
font-size: 14px; font-size: 14px;
color: $modra;
} }
} }
@ -510,7 +526,6 @@
@media (max-width: 1050px) { @media (max-width: 1050px) {
.nakup-1ka { .nakup-1ka {
.izbira { .izbira {
.paket,
.paket.vrsta-placila, .paket.vrsta-placila,
.mesec { .mesec {
width: 259px; width: 259px;
@ -538,7 +553,6 @@
.nakup-1ka { .nakup-1ka {
.izbira { .izbira {
.paket,
.paket.vrsta-placila, .paket.vrsta-placila,
.mesec { .mesec {
width: 100%; width: 100%;
@ -563,7 +577,6 @@
} }
.izbira { .izbira {
.paket,
.paket.vrsta-placila, .paket.vrsta-placila,
.mesec { .mesec {
max-width: 100%; max-width: 100%;

3
frontend/drupal9/web/themes/custom/pro1ka/templates/page--nakup-paketa.html.twig
View File

@ -143,7 +143,8 @@
<select name="podjetje_drzava" class="input-field w-input" id="polje-drzava" required="required"> <select name="podjetje_drzava" class="input-field w-input" id="polje-drzava" required="required">
<option disabled="disabled"> <option disabled="disabled">
- -
{{ prevod['nakup_select_disabled_drzava'] }}- {{ prevod['nakup_select_disabled_drzava'] }}
-
</option> </option>
{% for country in country_list %} {% for country in country_list %}
<option value="{{ country }}" {% if language.id == 'sl' and country == 'Slovenija' %} selected="selected" {% endif %}>{{ country }}</option> <option value="{{ country }}" {% if language.id == 'sl' and country == 'Slovenija' %} selected="selected" {% endif %}>{{ country }}</option>

2
frontend/drupal9/web/themes/custom/pro1ka/templates/parts/desni-pregled-narocila.html.twig
View File

@ -6,7 +6,7 @@
<div> <div>
<span class="prikazTrajanjeSt">/</span> <span class="prikazTrajanjeMesec" data-text="mesecev"></span> <span class="prikazTrajanjeSt">/</span> <span class="prikazTrajanjeMesec" data-text="mesecev"></span>
</div> </div>
<h4>Način plačila: <span class="prikazNacinPlacila"></span></h4> <h4 class="margintb">Način plačila: <span class="prikazNacinPlacila"></span></h4>
{% if language.id == 'sl' %} {% if language.id == 'sl' %}
<div class="text-small">Naročnina se zaračuna v enkratnem znesku</div> <div class="text-small">Naročnina se zaračuna v enkratnem znesku</div>
<div class="text-small">DDV je vključen v ceno</div> <div class="text-small">DDV je vključen v ceno</div>