Merge branch 'master' into 'remote_work'

Master New merge request From Alex:master into Alex:remote_work See merge request !8

Merge branch 'master' into 'remote_work'
Master New merge request From Alex:master into Alex:remote_work See merge request !8
Dima
2 parents 5a11f436 0028c302
Showing 7 changed files with 7 additions and 6 deletions Show diff stats
src/app/frontend/messages/ru.php
src/app/frontend/messages/ua.php
src/app/frontend/views/index.php
www/css/main.min.css
www/images/order2_ru.png
www/images/order2_uk.png
www/test.txt
@@ -164,7 +164,7 @@ return array(
     "sort_alphabetically" => "по алфавиту",
     "new_items" => "Новинки",
 	"truck"=>'<span style="color:#4ea12b;text-transform: uppercase;">БЕСПЛАТНАЯ ДОСТАВКА</span><br />
-				при заказе <span style="color:#f38027;">свыше 500 грн.</span><br />
+				при заказе <span style="color:#f38027;">свыше 700 грн.</span><br />
 				<a href="http://semena.in.ua/dostavka_i_oplata-2/ru/" style="font-weight:normal;">подробнее о доставке</a>',
 	"prof_tips"=>"Советы специалистов",
 	"news-actions"=>"Новости / Акции",
@@ -184,7 +184,7 @@ return array(
 	"new_address_twelve" => 'ст. м. Героїв Дніпра вул. Північна, 6В біля магазину "Сільпо"',
     "new_items" => "Новинки",
 	"truck"=>'<span style="color:#4ea12b;text-transform: uppercase;">Безкоштовна доставка</span><br />
-				при замовленні <span style="color:#f38027;">понад 500 грн.</span><br />
+				при замовленні <span style="color:#f38027;">понад 700 грн.</span><br />
 				<a href="http://semena.in.ua/dostavka_i_oplata-2" style="font-weight:normal;">детальніше про доставку</a>',
 	"prof_tips"=>"Поради професіоналів",
 	"news-actions"=>"Новини / Акції",	
@@ -61,6 +61,7 @@ $page_title = isset( $page_title ) &amp;&amp; !empty( $page_title ) ? $page_title : &#39;&#39;;
             <meta itemprop="telephone" content="+38 (093) 026 86 64">
             <meta itemprop="telephone" content="+38 (067) 464 48 59">
             <meta itemprop="telephone" content="+38 (050) 464 48 59">
+            <meta itemprop="telephone" content="+38 (093) 170 18 29">
             <span itemprop="email">info@hs.kiev.ua</span>
             <div style="display: none" itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
                 <span itemprop="streetAddress">вул. Садова 95</span>
@@ -92,7 +93,7 @@ $page_title = isset( $page_title ) &amp;&amp; !empty( $page_title ) ? $page_title : &#39;&#39;;
                         <span class="small_digits">(067)</span><span> 464-48-59</span>
                     </div>
                     <div class="contact_mob_phones">
-                        <span class="small_digits">(093)</span><span> 026-86-64</span>
+                        <span class="small_digits">(093)</span><span> 170-18-29</span>
                     <div style="float:right;font-size:12px;margin-right:65px;" class="contact_callback_phones">
                         <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>
                     </div>
@@ -397,4 +398,4 @@ $page_title = isset( $page_title ) &amp;&amp; !empty( $page_title ) ? $page_title : &#39;&#39;;
 <?php endif; ?>
 <!--end float block-->
 </body>
-</html>
+</html>
 \ No newline at end of file
@@ -929,7 +929,7 @@ h2.types_logo_320{color:#00a3de;}
 h2.types_logo_543{color:#5b4a42;}
 .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;}
 .delivery-form-par .close-white{content:'';position:absolute;top:0;left:0;width:100%;height:100%;cursor:pointer;}
-.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%;}
+.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);}
 .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;}
 .delivery-form-par .content-popup .text-down{width:100%;max-width:332px;}
 .delivery-form-par .text-down .up-text{color:#42210b;font-size:13.5px;text-align:center;width:100%;padding-top:23px;padding-bottom:8px;}
 testTest
-SSHvgg
 \ No newline at end of file
+SSHvgg