Commit 452c1f2a9da4e65db2c23c49dd774b75f87a3dc9

Authored by Dima
2 parents 5a11f436 0028c302

Merge branch 'master' into 'remote_work'

Master

New merge request
From Alex:master into Alex:remote_work

See merge request !8
src/app/frontend/messages/ru.php
... ... @@ -164,7 +164,7 @@ return array(
164 164 "sort_alphabetically" => "по алфавиту",
165 165 "new_items" => "Новинки",
166 166 "truck"=>'<span style="color:#4ea12b;text-transform: uppercase;">БЕСПЛАТНАЯ ДОСТАВКА</span><br />
167   - при заказе <span style="color:#f38027;">свыше 500 грн.</span><br />
  167 + при заказе <span style="color:#f38027;">свыше 700 грн.</span><br />
168 168 <a href="http://semena.in.ua/dostavka_i_oplata-2/ru/" style="font-weight:normal;">подробнее о доставке</a>',
169 169 "prof_tips"=>"Советы специалистов",
170 170 "news-actions"=>"Новости / Акции",
... ...
src/app/frontend/messages/ua.php
... ... @@ -184,7 +184,7 @@ return array(
184 184 "new_address_twelve" => 'ст. м. Героїв Дніпра вул. Північна, 6В біля магазину "Сільпо"',
185 185 "new_items" => "Новинки",
186 186 "truck"=>'<span style="color:#4ea12b;text-transform: uppercase;">Безкоштовна доставка</span><br />
187   - при замовленні <span style="color:#f38027;">понад 500 грн.</span><br />
  187 + при замовленні <span style="color:#f38027;">понад 700 грн.</span><br />
188 188 <a href="http://semena.in.ua/dostavka_i_oplata-2" style="font-weight:normal;">детальніше про доставку</a>',
189 189 "prof_tips"=>"Поради професіоналів",
190 190 "news-actions"=>"Новини / Акції",
... ...
src/app/frontend/views/index.php
... ... @@ -61,6 +61,7 @@ $page_title = isset( $page_title ) &amp;&amp; !empty( $page_title ) ? $page_title : &#39;&#39;;
61 61 <meta itemprop="telephone" content="+38 (093) 026 86 64">
62 62 <meta itemprop="telephone" content="+38 (067) 464 48 59">
63 63 <meta itemprop="telephone" content="+38 (050) 464 48 59">
  64 + <meta itemprop="telephone" content="+38 (093) 170 18 29">
64 65 <span itemprop="email">info@hs.kiev.ua</span>
65 66 <div style="display: none" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
66 67 <span itemprop="streetAddress">вул. Садова 95</span>
... ... @@ -92,7 +93,7 @@ $page_title = isset( $page_title ) &amp;&amp; !empty( $page_title ) ? $page_title : &#39;&#39;;
92 93 <span class="small_digits">(067)</span><span> 464-48-59</span>
93 94 </div>
94 95 <div class="contact_mob_phones">
95   - <span class="small_digits">(093)</span><span> 026-86-64</span>
  96 + <span class="small_digits">(093)</span><span> 170-18-29</span>
96 97 <div style="float:right;font-size:12px;margin-right:65px;" class="contact_callback_phones">
97 98 <a href="<?= $this->seoUrl->setUrl('/callback') ?>" class="callback" title="<?= $t->_("Feedback")?>" id="ajax_simple" data-options="width: 940, height: 400" target="<?= $this->seoUrl->setUrl( $this->url->get([ 'for' => 'callback' ])) ?>" data-type="ajax"><?= $t->_("Feedback")?></a>
98 99 </div>
... ... @@ -397,4 +398,4 @@ $page_title = isset( $page_title ) &amp;&amp; !empty( $page_title ) ? $page_title : &#39;&#39;;
397 398 <?php endif; ?>
398 399 <!--end float block-->
399 400 </body>
400   -</html>
  401 +</html>
401 402 \ No newline at end of file
... ...
www/css/main.min.css
... ... @@ -929,7 +929,7 @@ h2.types_logo_320{color:#00a3de;}
929 929 h2.types_logo_543{color:#5b4a42;}
930 930 .delivery-form-par{position:fixed;z-index:99991;top:0;background-color:rgba(255, 255, 255, 0.75);width:100%;height:100%;display:none;transition:0.3s;}
931 931 .delivery-form-par .close-white{content:'';position:absolute;top:0;left:0;width:100%;height:100%;cursor:pointer;}
932   -.delivery-form-par .popup-main-delivery{width:843px;height:400px;background-image:url("../images/right_deliver.png");background-size: contain;background-position:right center;background-repeat:no-repeat;background-color:#fdfaf1;position:absolute;font-family:'Lato-Medium';left:calc(50% - 421.5px);top:15%;}
  932 +.delivery-form-par .popup-main-delivery{width:843px;height:400px;background-image:url("../images/right_deliver.png");background-size: contain;background-position:right center;background-repeat:no-repeat;background-color:#fdfaf1;position:absolute;font-family:'Lato-Medium';left:calc(50% - 421.5px);top:15%;box-shadow: 0px 0px 50px rgba(0, 0, 0, 0.4);}
933 933 .delivery-form-par .content-popup .text-up{width:100%;max-width:332px;border-bottom:1px solid #6cb33f;color:#42210b;text-align:center;font-size:18px;padding-top:19px;line-height:22px;padding-bottom:4px;}
934 934 .delivery-form-par .content-popup .text-down{width:100%;max-width:332px;}
935 935 .delivery-form-par .text-down .up-text{color:#42210b;font-size:13.5px;text-align:center;width:100%;padding-top:23px;padding-bottom:8px;}
... ...
www/images/order2_ru.png

261 KB | W: | H:

465 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
www/images/order2_uk.png

259 KB | W: | H:

465 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
www/test.txt
1 1 testTest
2   -SSHvgg
3 2 \ No newline at end of file
  3 +SSHvgg
... ...