Yarik / artbox-shop

Commit a07298208329c421e736d40cb5b9c168b6ae6edf

Authored by Yarik
2 parents 54b558dc 5e838104

Merge remote-tracking branch 'origin/master'

Showing 5 changed files with 28 additions and 46 deletions   Show diff stats
Inline Side-by-side
composer.lock
  Show/Hide comments   View file @a072982
... ... @@ -82,7 +82,10 @@
82 82 },
83 83 "type": "bower-asset-library",
84 84 "extra": {
85   - "bower-asset-main": "./dist/amcharts/amcharts.js"
  85 + "bower-asset-main": "./dist/amcharts/amcharts.js",
  86 + "branch-alias": {
  87 + "dev-master": "3.18.5-dev"
  88 + }
86 89 },
87 90 "time": "2016-01-04 17:22:55"
88 91 },
... ... @@ -102,7 +105,10 @@
102 105 },
103 106 "type": "bower-asset-library",
104 107 "extra": {
105   - "bower-asset-main": "./dist/amcharts/amcharts.js"
  108 + "bower-asset-main": "./dist/amcharts/amcharts.js",
  109 + "branch-alias": {
  110 + "dev-master": "3.13.0-dev"
  111 + }
106 112 },
107 113 "time": "2015-01-28 07:40:20"
108 114 },
... ... @@ -332,16 +338,16 @@
332 338 },
333 339 {
334 340 "name": "bower-asset/jquery.inputmask",
335   - "version": "3.3.6",
  341 + "version": "3.3.7",
336 342 "source": {
337 343 "type": "git",
338 344 "url": "https://github.com/RobinHerbots/Inputmask.git",
339   - "reference": "e42852f4afa01a80815394a5b2f9ce504c1a8d0b"
  345 + "reference": "9835731cb78cac749734d94a1cb5bd70da4d3b10"
340 346 },
341 347 "dist": {
342 348 "type": "zip",
343   - "url": "https://api.github.com/repos/RobinHerbots/Inputmask/zipball/e42852f4afa01a80815394a5b2f9ce504c1a8d0b",
344   - "reference": "e42852f4afa01a80815394a5b2f9ce504c1a8d0b",
  349 + "url": "https://api.github.com/repos/RobinHerbots/Inputmask/zipball/9835731cb78cac749734d94a1cb5bd70da4d3b10",
  350 + "reference": "9835731cb78cac749734d94a1cb5bd70da4d3b10",
345 351 "shasum": ""
346 352 },
347 353 "require": {
... ...
frontend/views/site/contact.php
  Show/Hide comments   View file @a072982
... ... @@ -35,12 +35,8 @@ JS;
35 35 <div class="col-md-12">
36 36 <section>
37 37 <div class="heading">
38   - <h2>We are here to help you</h2>
  38 + <h2>Мы здесь чтобы помочь вам</h2>
39 39 </div>
40   -
41   - <p class="lead">Are you curious about something? Do you have some kind of problem with our products? As am hastily invited settled at limited civilly fortune me. Really spring in extent an by. Judge but built gay party world. Of so am
42   - he remember although required. Bachelor unpacked be advanced at. Confined in declared marianne is vicinity.</p>
43   - <p>Please feel free to contact us, our customer service center is working for you 24/7.</p>
44 40 </section>
45 41 </div>
46 42 </div>
... ... @@ -85,8 +81,7 @@ JS;
85 81 <div class="icon">
86 82 <i class="fa fa-phone"></i>
87 83 </div>
88   - <h3> Call center </h3>
89   - <p class="text-muted"> This number is toll free if calling from Great Britain otherwise we advise you to use the electronic form of communication .</p>
  84 + <h3>Телефон</h3>
90 85 <p>
91 86 <?php
92 87 echo Html::a(Html::tag('strong', $settings->phone), 'tel:' . $settings->phone);
... ... @@ -108,8 +103,7 @@ JS;
108 103 <div class="icon">
109 104 <i class="fa fa-envelope"></i>
110 105 </div>
111   - <h3> Electronic support </h3>
112   - <p class="text-muted"> Please feel free to write an email to us or to use our electronic ticketing system .</p>
  106 + <h3>Электронная почта</h3>
113 107 <ul class="list-style-none">
114 108 <li>
115 109 <?php
... ...
frontend/views/site/index.php
  Show/Hide comments   View file @a072982
... ... @@ -49,32 +49,7 @@ _________________________________________________________ --&gt;
49 49  
50 50 <div class="homepage owl-carousel">
51 51 <div class="item">
52   - <div class="row">
53   - <div class="col-sm-5">
54   - <h1>Акции
55   - <br>и скидки</h1>
56   - <p>На ноутбуки
57   - <br>и компьютеры
58   - </p>
59   - </div>
60   - <div class="col-sm-7">
61   - <img class="img-responsive" src="/img/template-homepage.png" alt="">
62   - </div>
63   - </div>
64   - </div>
65   - <div class="item">
66   - <div class="row">
67   - <div class="col-sm-5">
68   - <h1>Акции
69   - <br>и скидки</h1>
70   - <p>На ноутбуки
71   - <br>и компьютеры
72   - </p>
73   - </div>
74   - <div class="col-sm-7">
75   - <img class="img-responsive" src="/img/template-homepage.png" alt="">
76   - </div>
77   - </div>
  52 + <img src="/img/acdc-main-banner.png">
78 53 </div>
79 54 </div>
80 55 <!-- /.project owl-slider -->
... ... @@ -297,10 +272,6 @@ _________________________________________________________ --&gt;
297 272 <div class="heading text-center">
298 273 <h2>Полезные статьи</h2>
299 274 </div>
300   -
301   - <p class="lead">Идейные соображения высшего порядка, а также постоянное информационно-пропагандистское обеспечение нашей деятельности требуют от нас анализа позиций, занимаемых участниками в отношении поставленных задач. Не следует, однако забывать, что консультация с широким активом влечет за собой процесс внедрения и модернизации позиций, занимаемых участниками в отношении поставленных задач.
302   - <span class="accent">Почитайте наш блог!</span>
303   - </p>
304 275  
305 276 <!-- *** BLOG HOMEPAGE ***
306 277 _________________________________________________________ -->
... ...
frontend/web/css/style.css
  Show/Hide comments   View file @a072982
... ... @@ -4912,4 +4912,15 @@ button.price-apply:hover{
4912 4912 min-width: 75px;
4913 4913 border-radius: 15px;
4914 4914 margin: 20px 0 0;
4915   -}
4916 4915 \ No newline at end of file
  4916 +}
  4917 +.home-carousel .owl-carousel {
  4918 + padding: 0px 0px;
  4919 + overflow: hidden;
  4920 + border-radius: 5px;
  4921 +}
  4922 +.home-carousel .owl-carousel .item img{
  4923 + border-radius: 3px;
  4924 + width: 100%;
  4925 +}
  4926 +
  4927 +.box-simple ul.list-style-none {padding: 0;}
4917 4928 \ No newline at end of file
... ...
frontend/web/img/acdc-main-banner.png 0 → 100644
View file @a072982

147 KB